-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 NotDashEscaped: You need GnuPG to verify this message This is a patch file against 0.9.7. Please check the signature of this patch file: zcat somepath/gnupg-0.9.8.diff.gz | gpg --verify Change to directory gnupg-0.9.7 (or however you renamed it) and give this command: zcat somepath/gnupg-0.9.8.diff.gz | patch -p1 It is a good idea to rename your current directory to gnupg-0.9.8 now. Prereq: 0.9.7 diff -urN gnupg-0.9.7/VERSION gnupg-0.9.8/VERSION --- gnupg-0.9.7/VERSION Sun May 23 19:59:21 1999 +++ gnupg-0.9.8/VERSION Sat Jun 26 12:02:53 1999 @@ -1 +1 @@ -0.9.7 +0.9.8 diff -urN gnupg-0.9.7/AUTHORS gnupg-0.9.8/AUTHORS --- gnupg-0.9.7/AUTHORS Sat Mar 20 10:32:52 1999 +++ gnupg-0.9.8/AUTHORS Fri Jun 11 09:12:30 1999 @@ -29,6 +29,12 @@ Weak key patches. +GNUPG RИmi Guyomarch 1999-05-25 +Assigns past and future changes. (g10/compress.c, g10/encr-data.c, +g10/free-packet.c, g10/mdfilter.c, g10/plaintext.c, util/iobuf.c) +rguyom@mail.dotcom.fr + + TRANSLATIONS Marco d'Itri 1997-02-22 Disclaimer. [it] md@linux.it @@ -61,10 +67,11 @@ TRANSLATIONS Janusz Aleksander Urbanowicz 1999-01-09 pl.po +alex@bofh.torun.pl -Other notes: +More credits ============ This program uses the zlib compression library written by Jean-loup Gailly and Mark Adler. diff -urN gnupg-0.9.7/BUGS gnupg-0.9.8/BUGS --- gnupg-0.9.7/BUGS Sat May 22 18:10:59 1999 +++ gnupg-0.9.8/BUGS Sat Jun 26 12:02:43 1999 @@ -13,15 +13,6 @@ and after about half a day in the rsync snapshots. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -[ *] #1 - pgp263in works fine even with a source file with CR,LF but GnuPG - and pgp263in has problems if the clearsign has been created by - pgp263ia. The reason for this problem is that pgp2 sometimes - converts CR,LF to CR,CR,LF and to fix for this it hashes both - versions. I was able to reproduce such a problem, that PGP263in - was not able to verify it's own signature. - FIX: 1999-05-19 (Most cases are now handled) - [ *] #3 --list-packets should continue even w/o a passphrase (or in batch mode). Maybe we have to move it to a separate program?? @@ -35,8 +26,8 @@ 4. save 5. key has expiration date from 1. and gpg reports that pubkey and seckey differ. - The for loop the exp.date is set before v3 detection? - [is this bug still alive?] + The for loop the exp.date is set before v3 detection? + [is this bug still alive? - can someone please check it] [ *] #5 /home/jam/.gnupg/pubring.gpg: can't open gdbm file: Can't be writer @@ -51,10 +42,13 @@ --> Solaris fixed. --> IRIX bug still there +[ *] #18 1999-05-27 0.9.7 + rndunix hangs on hp/ux. The problme is related to my_plcose which is + not always called. (I suggest to use EGD instead of rndunix.) -[ **] #17 1999-05-18 0.9.6 - Import does not detect identical user IDs. - FIX: 1999-05-22 +[ **] #19 1999-06-11 + "trustdb transaction too large" with about 500 signatures on a key + FAEBD5FC. -Next #18 +Next #22 diff -urN gnupg-0.9.7/ChangeLog gnupg-0.9.8/ChangeLog --- gnupg-0.9.7/ChangeLog Sun May 23 14:20:28 1999 +++ gnupg-0.9.8/ChangeLog Sat Jun 26 12:16:00 1999 @@ -1,3 +1,31 @@ +Sat Jun 26 12:15:59 CEST 1999 Werner Koch + + + * acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Support for HPUX and IRIX. + * configure.in (HAVE_DL_SHL_LOAD): New for HPUX (Dave Dykstra). + + * VERSION: Now 0.9.8 + +Wed Jun 16 20:16:21 CEST 1999 Werner Koch + + * configure.in: Add test for docbook-to-man + +Tue Jun 15 12:21:08 CEST 1999 Werner Koch + + * acinclude.m4 (GNUPG_SYS_NM_PARSE): Support for {net,free}bsd, + +Thu Jun 10 14:18:23 CEST 1999 Werner Koch + + * configure.in (ZLIB,GDBM): Check both, header and lib. + +Sat Jun 5 15:30:33 CEST 1999 Werner Koch + + * pkclist.c (key_present_in_pk_list): New (Michael). + +Tue May 25 19:50:32 CEST 1999 Werner Koch + + * configure.in (IS_DEVELOPMENT_VERSION): Fixed detection. + Sun May 23 14:20:22 CEST 1999 Werner Koch * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): assume yes when diff -urN gnupg-0.9.7/Makefile.am gnupg-0.9.8/Makefile.am --- gnupg-0.9.7/Makefile.am Wed Apr 7 16:07:12 1999 +++ gnupg-0.9.8/Makefile.am Sat Jun 26 13:01:50 1999 @@ -1,6 +1,12 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks +#if COMPILE_LIBGCRYPT +#gcrypt = gcrypt +#else +gcrypt = +#endif + +SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks ${gcrypt} EXTRA_DIST = VERSION PROJECTS BUGS @@ -30,14 +36,6 @@ cvs-sync: cvs-get cvs-put - -tobold-get: - rsync -Cavuzb --exclude scratch --exclude .deps \ - tobold:gnupg/ . - -tobold-put: - rsync -Cavuzb --exclude scratch --exclude .deps \ - . tobold:gnupg/ .PHONY: cvs-get cvs-put cvs-sync diff -urN gnupg-0.9.7/Makefile.in gnupg-0.9.8/Makefile.in --- gnupg-0.9.7/Makefile.in Sun May 23 20:02:11 1999 +++ gnupg-0.9.8/Makefile.in Sat Jun 26 13:06:55 1999 @@ -10,6 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +#if COMPILE_LIBGCRYPT +#gcrypt = gcrypt +#else + SHELL = @SHELL@ @@ -70,6 +74,7 @@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@ DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ @@ -101,7 +106,10 @@ ZLIBS = @ZLIBS@ l = @l@ -SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks +gcrypt = +#endif + +SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks ${gcrypt} EXTRA_DIST = VERSION PROJECTS BUGS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -407,14 +415,6 @@ . wkoch@sigtrap.guug.de:work/gnupg cvs-sync: cvs-get cvs-put - -tobold-get: - rsync -Cavuzb --exclude scratch --exclude .deps \ - tobold:gnupg/ . - -tobold-put: - rsync -Cavuzb --exclude scratch --exclude .deps \ - . tobold:gnupg/ .PHONY: cvs-get cvs-put cvs-sync diff -urN gnupg-0.9.7/NEWS gnupg-0.9.8/NEWS --- gnupg-0.9.7/NEWS Sun May 23 15:22:42 1999 +++ gnupg-0.9.8/NEWS Sat Jun 26 12:54:38 1999 @@ -1,3 +1,24 @@ +Noteworthy changes in version 0.9.8 +----------------------------------- + + * New subcommand "delsig" in the edit menu. + + * The name of the output file is not anymore the one which is + embedded in the processed message, but the used filename with + the extension stripped. To revert to the old behaviour you can + use the option --use-embedded-filename. + + * Another hack to cope with pgp2 generated detached signatures. + + * latin-2 character set works (--charset=iso-8859-2). + + * New option --with-key-data to list the public key parameters. + New option -N to insert notations and a --set-policy-url. + A couple of other options to allow reseting of options. + + * Better support for HPUX. + + Noteworthy changes in version 0.9.7 ----------------------------------- diff -urN gnupg-0.9.7/README gnupg-0.9.8/README --- gnupg-0.9.7/README Thu May 6 11:28:00 1999 +++ gnupg-0.9.8/README Sat Jun 26 12:14:31 1999 @@ -2,7 +2,7 @@ GnuPG - The GNU Privacy Guard ------------------------------- - Version 0.9.6 + Version 0.9.8 GnuPG is now in Beta test and you should report all bugs to the mailing list (see below). The 0.9.x versions are released mainly @@ -32,8 +32,8 @@ have problems, please subscribe to "gnupg-users@gnupg.org" by sending mail with the subject "subscribe" to "gnupg-users-request@gnupg.org" and ask there. The gnupg.org domain is hosted in Germany to avoid - possible legal problems with gnu.org (technical advices may count - as a violation of ITAR). + possible legal problems (technical advices may count as a violation + of ITAR). See the file COPYING for copyright and warranty information. @@ -45,11 +45,13 @@ patented worldwide) and RSA (which is patented in the United States until Sep 20, 2000). - The default algorithms are now DSA and ElGamal. ElGamal for signing + The default algorithms are DSA and ElGamal. ElGamal for signing is still available, but because of the larger size of such signatures it is deprecated (Please note that the GnuPG implementation of ElGamal signatures is *not* insecure). Symmetric - algorithms are: 3DES, Blowfish, and CAST5 (Twofish will come soon). + algorithms are: 3DES, Blowfish, CAST5 and Twofish (GnuPG does not + yet create Twofish encrypted messages because there no agreement + in the OpenPG WG on how to use it together with a MDC algorithm) Digest algorithms available are MD5, RIPEMD160, SHA1, and TIGER/192. @@ -67,6 +69,10 @@ 3) "make install" 4) You end up with a "gpg" binray in /usr/local/bin. + Note: Because some programs rely on the existence of a + binary named "gpgm"; you should install a symbolic link + from gpgm to gpg: + $ cd /usr/local/bin; ln -s gpg gpgm 5) To avoid swapping out of sensitive data, you can install "gpg" as suid root. If you don't do so, you may want to add the option @@ -429,21 +435,24 @@ See http://www.gnupg.org/mirrors.html for a list of FTP mirrors and use them if possible. - Please direct bug reports to or, better, - post them to the mailing list (this is a - closed list - subscribe before posting, see above (~line 33)). - Please direct questions about GnuPG to the mailing list or + To avoid possible legal problems we have decided, not to use + the normal www.gnu.org webserver. + + Please direct bug reports to or post + them direct to the mailing list . + Please direct questions about GnuPG to the users mailing list or one of the pgp newsgroups and give me more time to improve - GnuPG. Commercial support for GnuPG will be available soon. + GnuPG. Commercial support for GnuPG is also available; please + see the GNU service directory or search other resources. Have fun and remember: Echelon is looking at you kid. -----BEGIN PGP SIGNATURE----- -Version: GnuPG v0.9.5 (GNU/Linux) +Version: GnuPG v0.9.7 (GNU/Linux) Comment: For info see http://www.gnupg.org -iQB1AwUBNzFgoB0Z9MEMmFelAQG1EgL/UlmBc7X9UoSh0ge1FNSNncHQGIX8wHkG -0BHOkcHS9XNxZokgkxoUTSRDFlXxW9auWpYKYeNkkck8S9ExtOJK6FABme6Daof0 -Hfe4E7TA82T73gvsMMlN6wyys3k5gTRt -=FP1e +iQB1AwUBN3SoBh0Z9MEMmFelAQE+9wL/bOTFEPvkO0drlWAu8k2P7udEzwfGlKhE +Iyr6g75FSX4NnDkHB7RjyHYvQUkc8gicxYV8pBWe5c1bMYwrpe1cMvAu+BtUfDQc +oHUbx9ln7CZ2BkEgzT5bjypugwtc6o7g +=uTFn -----END PGP SIGNATURE----- diff -urN gnupg-0.9.7/THANKS gnupg-0.9.8/THANKS --- gnupg-0.9.7/THANKS Mon May 17 20:30:36 1999 +++ gnupg-0.9.8/THANKS Tue Jun 15 10:02:06 1999 @@ -58,6 +58,7 @@ Michael Roth mroth@nessie.de Michael Sobolev mss@despair.transas.com Nicolas Graner Nicolas.Graner@cri.u-psud.fr +NIIBE Yutaka gniibe@chroot.org Niklas Hernaeus Nimrod Zimerman zimerman@forfree.at N J Doye nic@niss.ac.uk diff -urN gnupg-0.9.7/TODO gnupg-0.9.8/TODO --- gnupg-0.9.7/TODO Sun May 23 15:22:02 1999 +++ gnupg-0.9.8/TODO Mon Jun 21 07:32:16 1999 @@ -1,4 +1,6 @@ + * add keylength and type to status output. + * add some status output put for signing and encryption. replace the putc in primegen with some kind of status-fd outputs. @@ -25,6 +27,11 @@ * find a way to allow the import of non-self-signed keys. This is needed for the IN ENCR/SIGN hack. + * convert the given user ID to UTF-8 and add an option to suppress this. + + * A way to disable keys. + + Nice to have ------------ * Let take --help an option to select some topics. @@ -35,7 +42,6 @@ * replace the keyserver stuff either by a call to a specialized utility and SOCKSify this utility. * Do a real fix for bug #7 or document that it is a PGP 5 error. - * clearsig: Keep lineendings while writing the output of a clearsig * preferences of hash algorithms are not yet used. * new menu to delete signatures and list signature in menu * Replace the SIGUSR1 stuff by semaphores to avoid loss of a signal. @@ -50,8 +56,6 @@ * the pubkey encrypt functions should do some sanity checks. * dynload: implement the hint stuff. * "gpg filename.tar.gz.asc" sollte wie mit --verify funktionieren (-sab). - * Den Dateinamen aus der message nicht benutzen, sondern nur - das gpg/asc strippen. * for messages created with "-t", it might make sense to append the verification status of the message to the output (i.e. write something to the --output file and not only to stderr. diff -urN gnupg-0.9.7/acconfig.h gnupg-0.9.8/acconfig.h --- gnupg-0.9.7/acconfig.h Sat Mar 20 10:32:52 1999 +++ gnupg-0.9.8/acconfig.h Sat Jun 26 10:21:35 1999 @@ -70,9 +70,13 @@ /* and the real names of the random devices */ #undef NAME_OF_DEV_RANDOM #undef NAME_OF_DEV_URANDOM +/* Linux has an ioctl */ +#undef HAVE_DEV_RANDOM_IOCTL + #undef USE_DYNAMIC_LINKING #undef HAVE_DL_DLOPEN +#undef HAVE_DL_SHL_LOAD #undef HAVE_DLD_DLD_LINK #undef USE_SHM_COPROCESSING diff -urN gnupg-0.9.7/acinclude.m4 gnupg-0.9.8/acinclude.m4 --- gnupg-0.9.7/acinclude.m4 Sun May 23 13:43:55 1999 +++ gnupg-0.9.8/acinclude.m4 Sat Jun 26 10:14:52 1999 @@ -204,9 +204,14 @@ CFLAGS_RDYNAMIC="-Wl,-dy" ;; - openbsd* | freebsd2* | osf4* ) + hpux* ) + CFLAGS_RDYNAMIC="-Wl,-E" + ;; + + openbsd* | freebsd2* | osf4* | irix* ) CFLAGS_RDYNAMIC="" ;; + * ) CFLAGS_RDYNAMIC="-Wl,-export-dynamic" ;; @@ -404,7 +409,7 @@ aix*) ac_symcode='[BCDTU]' ;; -openbsd* | sunos* | cygwin32* | mingw32*) +freebsd* | netbsd* | openbsd* | sunos* | cygwin32* | mingw32*) ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)' ac_symxfrm='_\1 \1' ;; diff -urN gnupg-0.9.7/aclocal.m4 gnupg-0.9.8/aclocal.m4 --- gnupg-0.9.7/aclocal.m4 Sun May 23 20:00:25 1999 +++ gnupg-0.9.8/aclocal.m4 Sat Jun 26 13:02:16 1999 @@ -212,9 +212,14 @@ CFLAGS_RDYNAMIC="-Wl,-dy" ;; - openbsd* | freebsd2* | osf4* ) + hpux* ) + CFLAGS_RDYNAMIC="-Wl,-E" + ;; + + openbsd* | freebsd2* | osf4* | irix* ) CFLAGS_RDYNAMIC="" ;; + * ) CFLAGS_RDYNAMIC="-Wl,-export-dynamic" ;; @@ -407,7 +412,7 @@ aix*) ac_symcode='[BCDTU]' ;; -openbsd* | sunos* | cygwin32* | mingw32*) +freebsd* | netbsd* | openbsd* | sunos* | cygwin32* | mingw32*) ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)' ac_symxfrm='_\1 \1' ;; @@ -688,6 +693,19 @@ fi AC_SUBST($1)]) +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + # Macro to add for using GNU gettext. # Ulrich Drepper , 1995. # @@ -1071,17 +1089,4 @@ AC_DEFINE(HAVE_LC_MESSAGES) fi fi]) - -# Define a conditional. - -AC_DEFUN(AM_CONDITIONAL, -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi]) diff -urN gnupg-0.9.7/checks/Makefile.in gnupg-0.9.8/checks/Makefile.in --- gnupg-0.9.7/checks/Makefile.in Sun May 23 20:03:01 1999 +++ gnupg-0.9.8/checks/Makefile.in Sat Jun 26 13:07:41 1999 @@ -70,6 +70,7 @@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@ DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ diff -urN gnupg-0.9.7/cipher/ChangeLog gnupg-0.9.8/cipher/ChangeLog --- gnupg-0.9.7/cipher/ChangeLog Sun May 23 14:20:27 1999 +++ gnupg-0.9.8/cipher/ChangeLog Sat Jun 26 12:15:59 1999 @@ -1,3 +1,13 @@ +Sat Jun 26 12:15:59 CEST 1999 Werner Koch + + + * rndegd.c (do_write): s/ssize_t/int/ due to SunOS 4.1 probs. + + * cipher.c (do_cbc_encrypt, do_cbc_decrypt): New. + + * dynload.c (HAVE_DL_SHL_LOAD): Map hpux API to dlopen (Dave Dykstra). + * Makefile.am (install-exec-hook): Removed. + Sun May 23 14:20:22 CEST 1999 Werner Koch * cipher.c (setup_cipher_table): Enable Twofish diff -urN gnupg-0.9.7/cipher/Makefile.am gnupg-0.9.8/cipher/Makefile.am --- gnupg-0.9.7/cipher/Makefile.am Thu May 6 11:33:45 1999 +++ gnupg-0.9.8/cipher/Makefile.am Sat Jun 26 12:48:00 1999 @@ -98,11 +98,3 @@ -install-exec-hook: - @list='$(pkglib_PROGRAMS)'; for p in $$list; do \ - if test -f $(pkglibdir)/$$p; then \ - echo "chmod 644 $(pkglibdir)/$$p"; \ - chmod 644 $(pkglibdir)/$$p; \ - fi; \ - done - diff -urN gnupg-0.9.7/cipher/Makefile.in gnupg-0.9.8/cipher/Makefile.in --- gnupg-0.9.7/cipher/Makefile.in Sun May 23 20:02:31 1999 +++ gnupg-0.9.8/cipher/Makefile.in Sat Jun 26 13:07:13 1999 @@ -70,6 +70,7 @@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@ DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@ GENCAT = @GENCAT@ @@ -398,8 +399,6 @@ installcheck-am: installcheck: installcheck-am install-exec-am: install-pkglibPROGRAMS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-exec: install-exec-am install-data-am: @@ -497,14 +496,6 @@ rndegd: $(srcdir)/rndegd.c $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndegd $(srcdir)/rndegd.c - -install-exec-hook: - @list='$(pkglib_PROGRAMS)'; for p in $$list; do \ - if test -f $(pkglibdir)/$$p; then \ - echo "chmod 644 $(pkglibdir)/$$p"; \ - chmod 644 $(pkglibdir)/$$p; \ - fi; \ - done # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN gnupg-0.9.7/cipher/cipher.c gnupg-0.9.8/cipher/cipher.c --- gnupg-0.9.7/cipher/cipher.c Sun May 23 12:47:37 1999 +++ gnupg-0.9.8/cipher/cipher.c Fri Jun 18 12:52:49 1999 @@ -408,6 +408,49 @@ } } +static void +do_cbc_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nblocks ) +{ + unsigned int n; + byte *ivp; + int i; + size_t blocksize = c->blocksize; + + for(n=0; n < nblocks; n++ ) { + /* fixme: the xor should works on words and not on + * bytes. Maybe it is a good idea to enhance the cipher backend + * API to allow for CBC handling in the backend */ + for(ivp=c->iv,i=0; i < blocksize; i++ ) + outbuf[i] ^= *ivp++; + (*c->encrypt)( &c->context.c, outbuf, outbuf ); + memcpy(c->iv, outbuf, blocksize ); + inbuf += c->blocksize; + outbuf += c->blocksize; + } +} + +static void +do_cbc_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nblocks ) +{ + unsigned int n; + byte *ivp; + int i; + size_t blocksize = c->blocksize; + + for(n=0; n < nblocks; n++ ) { + /* because outbuf and inbuf might be the same, we have + * to save the original ciphertext block. We use lastiv + * for this here because it is not used otherwise */ + memcpy(c->lastiv, inbuf, blocksize ); + (*c->decrypt)( &c->context.c, outbuf, inbuf ); + for(ivp=c->iv,i=0; i < blocksize; i++ ) + outbuf[i] ^= *ivp++; + memcpy(c->iv, c->lastiv, blocksize ); + inbuf += c->blocksize; + outbuf += c->blocksize; + } +} + static void do_cfb_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes ) @@ -524,6 +567,10 @@ assert(!(nbytes%8)); do_ecb_encrypt(c, outbuf, inbuf, nbytes/8 ); break; + case CIPHER_MODE_CBC: + assert(!(nbytes%8)); /* fixme: should be blocksize */ + do_cbc_encrypt(c, outbuf, inbuf, nbytes/8 ); + break; case CIPHER_MODE_CFB: case CIPHER_MODE_PHILS_CFB: do_cfb_encrypt(c, outbuf, inbuf, nbytes ); @@ -549,6 +596,10 @@ case CIPHER_MODE_ECB: assert(!(nbytes%8)); do_ecb_decrypt(c, outbuf, inbuf, nbytes/8 ); + break; + case CIPHER_MODE_CBC: + assert(!(nbytes%8)); /* fixme: should assert on blocksize */ + do_cbc_decrypt(c, outbuf, inbuf, nbytes/8 ); break; case CIPHER_MODE_CFB: case CIPHER_MODE_PHILS_CFB: diff -urN gnupg-0.9.7/cipher/dsa.c gnupg-0.9.8/cipher/dsa.c --- gnupg-0.9.7/cipher/dsa.c Mon May 17 20:18:19 1999 +++ gnupg-0.9.8/cipher/dsa.c Tue Jun 8 11:53:39 1999 @@ -293,7 +293,6 @@ /* u2 = r * w mod q */ mpi_mulm( u2, r, w, pkey->q ); - /* v = g^u1 * y^u2 mod p mod q */ base[0] = pkey->g; exp[0] = u1; base[1] = pkey->y; exp[1] = u2; diff -urN gnupg-0.9.7/cipher/dynload.c gnupg-0.9.8/cipher/dynload.c --- gnupg-0.9.7/cipher/dynload.c Sat May 22 22:25:40 1999 +++ gnupg-0.9.8/cipher/dynload.c Sat Jun 26 10:26:32 1999 @@ -27,6 +27,9 @@ #include #elif defined(HAVE_DLD_DLD_LINK) #include +#elif defined(HAVE_DL_SHL_LOAD) + #include + #include #endif #include "util.h" #include "cipher.h" @@ -44,6 +47,27 @@ #ifndef RTLD_NOW #define RTLD_NOW 1 #endif + +#ifdef HAVE_DL_SHL_LOAD /* HPUX has shl_load instead of dlopen */ +#define HAVE_DL_DLOPEN +#define dlopen(PATHNAME,MODE) \ + ((void *) shl_load(PATHNAME, DYNAMIC_PATH | \ + (((MODE) & RTLD_NOW) ? BIND_IMMEDIATE : BIND_DEFERRED), 0L)) +#define dlclose(HANDLE) shl_unload((shl_t) (HANDLE)) +#define dlerror() (errno == 0 ? NULL : strerror(errno)) + +static void * +dlsym(void *handle, char *name) +{ + void *addr; + if (shl_findsym((shl_t *)&handle,name,(short)TYPE_UNDEFINED,&addr) != 0) { + return NULL; + } + return addr; +} +#endif /*HAVE_DL_SHL_LOAD*/ + + typedef struct ext_list { struct ext_list *next; diff -urN gnupg-0.9.7/cipher/md.c gnupg-0.9.8/cipher/md.c --- gnupg-0.9.7/cipher/md.c Mon May 17 20:18:19 1999 +++ gnupg-0.9.8/cipher/md.c Thu Jun 17 17:33:19 1999 @@ -341,12 +341,16 @@ { struct md_digest_list_s *r; + if( a->finalized ) + return; + if( a->bufcount ) md_write( a, NULL, 0 ); for(r=a->list; r; r = r->next ) { (*r->final)( &r->context.c ); } + a->finalized = 1; } diff -urN gnupg-0.9.7/cipher/pubkey.c gnupg-0.9.8/cipher/pubkey.c --- gnupg-0.9.7/cipher/pubkey.c Mon May 17 20:18:19 1999 +++ gnupg-0.9.8/cipher/pubkey.c Mon Jun 14 08:33:26 1999 @@ -89,6 +89,8 @@ /**************** * Put the static entries into the table. + * This is out constructor function which fill the table + * of algorithms with the one we have statically linked. */ static void setup_pubkey_table(void) diff -urN gnupg-0.9.7/cipher/rndegd.c gnupg-0.9.8/cipher/rndegd.c --- gnupg-0.9.7/cipher/rndegd.c Mon May 17 20:18:19 1999 +++ gnupg-0.9.8/cipher/rndegd.c Sat Jun 26 12:22:52 1999 @@ -50,7 +50,7 @@ do_write( int fd, void *buf, size_t nbytes ) { size_t nleft = nbytes; - ssize_t nwritten; + int nwritten; while( nleft > 0 ) { nwritten = write( fd, buf, nleft); @@ -190,7 +190,7 @@ #ifndef IS_MODULE static #endif -const char * const gnupgext_version = "RNDEGD ($Revision: 1.6 $)"; +const char * const gnupgext_version = "RNDEGD ($Revision: 1.7 $)"; static struct { int class; diff -urN gnupg-0.9.7/cipher/rndlinux.c gnupg-0.9.8/cipher/rndlinux.c --- gnupg-0.9.7/cipher/rndlinux.c Mon May 17 20:18:19 1999 +++ gnupg-0.9.8/cipher/rndlinux.c Tue Jun 1 16:08:46 1999 @@ -33,6 +33,13 @@ #include #include #include +#if 0 + #ifdef HAVE_LINUX_RANDOM_H + #include + #include + #include + #endif +#endif #include "types.h" #include "util.h" #include "ttyio.h" @@ -48,6 +55,19 @@ static int gather_random( void (*add)(const void*, size_t, int), int requester, size_t length, int level ); +#if 0 +#ifdef HAVE_DEV_RANDOM_IOCTL +static ulong +get_entropy_count( int fd ) +{ + ulong count; + + if( ioctl( fd, RNDGETENTCNT, &count ) == -1 ) + g10_log_fatal("ioctl(RNDGETENTCNT) failed: %s\n", strerror(errno) ); + return count; +} +#endif +#endif /**************** * Used to open the Linux and xBSD /dev/random devices @@ -91,6 +111,11 @@ fd = fd_urandom; } + #if 0 + #ifdef HAVE_DEV_RANDOM_IOCTL + g10_log_info("entropy count of %d is %lu\n", fd, get_entropy_count(fd) ); + #endif + #endif while( length ) { fd_set rfds; struct timeval tv; @@ -146,7 +171,7 @@ #ifndef IS_MODULE static #endif -const char * const gnupgext_version = "RNDLINUX ($Revision: 1.8 $)"; +const char * const gnupgext_version = "RNDLINUX ($Revision: 1.9 $)"; static struct { int class; diff -urN gnupg-0.9.7/config.h.in gnupg-0.9.8/config.h.in --- gnupg-0.9.7/config.h.in Sat May 22 22:19:59 1999 +++ gnupg-0.9.8/config.h.in Sat Jun 26 12:58:33 1999 @@ -119,9 +119,12 @@ /* and the real names of the random devices */ #undef NAME_OF_DEV_RANDOM #undef NAME_OF_DEV_URANDOM +/* Linux has an ioctl */ +#undef HAVE_DEV_RANDOM_IOCTL #undef USE_DYNAMIC_LINKING #undef HAVE_DL_DLOPEN +#undef HAVE_DL_SHL_LOAD #undef HAVE_DLD_DLD_LINK #undef USE_SHM_COPROCESSING @@ -242,12 +245,18 @@ /* Define if you have the header file. */ #undef HAVE_ARGZ_H +/* Define if you have the header file. */ +#undef HAVE_GDBM_H + /* Define if you have the header file. */ #undef HAVE_LANGINFO_H /* Define if you have the header file. */ #undef HAVE_LIMITS_H +/* Define if you have the header file. */ +#undef HAVE_LINUX_RANDOM_H + /* Define if you have the header file. */ #undef HAVE_LOCALE_H @@ -280,6 +289,9 @@ /* Define if you have the dl library (-ldl). */ #undef HAVE_LIBDL + +/* Define if you have the dld library (-ldld). */ +#undef HAVE_LIBDLD /* Define if you have the gdbm library (-lgdbm). */ #undef HAVE_LIBGDBM diff -urN gnupg-0.9.7/configure gnupg-0.9.8/configure --- gnupg-0.9.7/configure Sun May 23 20:00:44 1999 +++ gnupg-0.9.8/configure Sat Jun 26 13:02:34 1999 @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.88 +# From configure.in Revision: 1.94 CDPATH= @@ -76,6 +76,10 @@ +# Define a conditional. + + + # Macro to add for using GNU gettext. # Ulrich Drepper , 1995. # @@ -114,10 +118,6 @@ -# Define a conditional. - - - # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -819,6 +819,7 @@ + # Do some error checking and defaulting for the host and target type. # The inputs are: # configure --host=HOST --target=TARGET --build=BUILD NONOPT @@ -846,7 +847,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:850: checking host system type" >&5 +echo "configure:851: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -867,7 +868,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:871: checking target system type" >&5 +echo "configure:872: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -885,7 +886,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:889: checking build system type" >&5 +echo "configure:890: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -927,7 +928,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:931: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:932: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -954,7 +955,7 @@ fi echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:958: checking whether build environment is sane" >&5 +echo "configure:959: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -993,7 +994,7 @@ echo "$ac_t""yes" 1>&6 missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:997: checking for working aclocal" >&5 +echo "configure:998: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1006,7 +1007,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1010: checking for working autoconf" >&5 +echo "configure:1011: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1019,7 +1020,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1023: checking for working automake" >&5 +echo "configure:1024: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1032,7 +1033,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1036: checking for working autoheader" >&5 +echo "configure:1037: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1047,7 +1048,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1051: checking for $ac_word" >&5 +echo "configure:1052: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1077,7 +1078,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1081: checking for $ac_word" >&5 +echo "configure:1082: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1128,7 +1129,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1132: checking for $ac_word" >&5 +echo "configure:1133: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1160,7 +1161,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1164: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1165: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1171,12 +1172,12 @@ cat > conftest.$ac_ext << EOF -#line 1175 "configure" +#line 1176 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1202,12 +1203,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1206: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1207: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1211: checking whether we are using GNU C" >&5 +echo "configure:1212: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1216,7 +1217,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1235,7 +1236,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1239: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1240: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1267,7 +1268,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1271: checking how to run the C preprocessor" >&5 +echo "configure:1272: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1282,13 +1283,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1299,13 +1300,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1316,13 +1317,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1347,7 +1348,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1351: checking for POSIXized ISC" >&5 +echo "configure:1352: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1379,7 +1380,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1383: checking for a BSD compatible install" >&5 +echo "configure:1384: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1434,7 +1435,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1438: checking for $ac_word" >&5 +echo "configure:1439: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1461,6 +1462,49 @@ echo "$ac_t""no" 1>&6 fi +# Extract the first word of "docbook-to-man", so it can be a program name with args. +set dummy docbook-to-man; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1469: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DOCBOOK_TO_MAN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$DOCBOOK_TO_MAN"; then + ac_cv_prog_DOCBOOK_TO_MAN="$DOCBOOK_TO_MAN" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DOCBOOK_TO_MAN="yes" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_DOCBOOK_TO_MAN" && ac_cv_prog_DOCBOOK_TO_MAN="no" +fi +fi +DOCBOOK_TO_MAN="$ac_cv_prog_DOCBOOK_TO_MAN" +if test -n "$DOCBOOK_TO_MAN"; then + echo "$ac_t""$DOCBOOK_TO_MAN" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + +if test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes; then + HAVE_DOCBOOK_TO_MAN_TRUE= + HAVE_DOCBOOK_TO_MAN_FALSE='#' +else + HAVE_DOCBOOK_TO_MAN_TRUE='#' + HAVE_DOCBOOK_TO_MAN_FALSE= +fi + + + + MPI_OPT_FLAGS="" if test "$GCC" = yes; then @@ -1527,7 +1571,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1531: checking for BSD-compatible nm" >&5 +echo "configure:1575: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1563,7 +1607,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:1567: checking command to parse $NM output" >&5 +echo "configure:1611: checking command to parse $NM output" >&5 if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1584,7 +1628,7 @@ aix*) ac_symcode='[BCDTU]' ;; -openbsd* | sunos* | cygwin32* | mingw32*) +freebsd* | netbsd* | openbsd* | sunos* | cygwin32* | mingw32*) ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)' ac_symxfrm='_\1 \1' ;; @@ -1626,10 +1670,10 @@ #endif int main(){nm_test_var='a';nm_test_func;return 0;} EOF -if { (eval echo configure:1630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. ac_nlist=conftest.nm - if { (eval echo configure:1633: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then + if { (eval echo configure:1677: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then # Try sorting and uniquifying the output. if sort "$ac_nlist" | uniq > "$ac_nlist"T; then @@ -1687,7 +1731,7 @@ ac_save_CFLAGS="$CFLAGS" LIBS="conftestm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:1691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo configure:1735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_pipe_works=yes else echo "configure: failed program was:" >&5 @@ -1724,12 +1768,12 @@ if test "$cross_compiling" = yes; then echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 -echo "configure:1728: checking for _ prefix in compiled symbols" >&5 +echo "configure:1772: checking for _ prefix in compiled symbols" >&5 ac_cv_sys_symbol_underscore=yes echo "$ac_t""assume yes" 1>&6 else echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 -echo "configure:1733: checking for _ prefix in compiled symbols" >&5 +echo "configure:1777: checking for _ prefix in compiled symbols" >&5 if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1738,10 +1782,10 @@ void nm_test_func(){} int main(){nm_test_func;return 0;} EOF -if { (eval echo configure:1742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. ac_nlist=conftest.nm - if { (eval echo configure:1745: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then + if { (eval echo configure:1789: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then # See whether the symbols have a leading underscore. if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then ac_cv_sys_symbol_underscore=yes @@ -1773,7 +1817,7 @@ fi echo $ac_n "checking for option to create PIC""... $ac_c" 1>&6 -echo "configure:1777: checking for option to create PIC" >&5 +echo "configure:1821: checking for option to create PIC" >&5 CFLAGS_PIC= NO_PIC=no if test "$cross_compiling" = yes; then @@ -1838,7 +1882,7 @@ fi echo $ac_n "checking how to specify -rdynamic""... $ac_c" 1>&6 -echo "configure:1842: checking how to specify -rdynamic" >&5 +echo "configure:1886: checking how to specify -rdynamic" >&5 CFLAGS_RDYNAMIC= if test "$cross_compiling" = yes; then echo "$ac_t""assume none" 1>&6 @@ -1848,9 +1892,14 @@ CFLAGS_RDYNAMIC="-Wl,-dy" ;; - openbsd* | freebsd2* | osf4* ) + hpux* ) + CFLAGS_RDYNAMIC="-Wl,-E" + ;; + + openbsd* | freebsd2* | osf4* | irix* ) CFLAGS_RDYNAMIC="" ;; + * ) CFLAGS_RDYNAMIC="-Wl,-export-dynamic" ;; @@ -1908,12 +1957,12 @@ if test "$try_gettext" = yes; then echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1912: checking for ANSI C header files" >&5 +echo "configure:1961: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1921,7 +1970,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1938,7 +1987,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1956,7 +2005,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1977,7 +2026,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1988,7 +2037,7 @@ exit (0); } EOF -if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2012,12 +2061,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2016: checking for working const" >&5 +echo "configure:2065: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2087,21 +2136,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2091: checking for inline" >&5 +echo "configure:2140: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2127,12 +2176,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2131: checking for off_t" >&5 +echo "configure:2180: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2160,12 +2209,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2164: checking for size_t" >&5 +echo "configure:2213: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2195,19 +2244,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2199: checking for working alloca.h" >&5 +echo "configure:2248: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2228,12 +2277,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2232: checking for alloca" >&5 +echo "configure:2281: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2293,12 +2342,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2297: checking whether alloca needs Cray hooks" >&5 +echo "configure:2346: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:2327: checking for $ac_func" >&5 +echo "configure:2376: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2378,7 +2427,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2382: checking stack direction for C alloca" >&5 +echo "configure:2431: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2386,7 +2435,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2430,17 +2479,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2434: checking for $ac_hdr" >&5 +echo "configure:2483: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2469,12 +2518,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2473: checking for $ac_func" >&5 +echo "configure:2522: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2522,7 +2571,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2526: checking for working mmap" >&5 +echo "configure:2575: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2530,7 +2579,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2698,17 +2747,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2702: checking for $ac_hdr" >&5 +echo "configure:2751: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2738,12 +2787,12 @@ strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2742: checking for $ac_func" >&5 +echo "configure:2791: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2795,12 +2844,12 @@ for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2799: checking for $ac_func" >&5 +echo "configure:2848: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2857,19 +2906,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2861: checking for LC_MESSAGES" >&5 +echo "configure:2910: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2890,7 +2939,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2894: checking whether NLS is requested" >&5 +echo "configure:2943: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -2910,7 +2959,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2914: checking whether included gettext is requested" >&5 +echo "configure:2963: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -2929,17 +2978,17 @@ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2933: checking for libintl.h" >&5 +echo "configure:2982: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2956,19 +3005,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:2960: checking for gettext in libc" >&5 +echo "configure:3009: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -2984,7 +3033,7 @@ if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:2988: checking for bindtextdomain in -lintl" >&5 +echo "configure:3037: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2992,7 +3041,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3019,12 +3068,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:3023: checking for gettext in libintl" >&5 +echo "configure:3072: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:3028: checking for gettext in -lintl" >&5 +echo "configure:3077: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3032,7 +3081,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3082,7 +3131,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3086: checking for $ac_word" >&5 +echo "configure:3135: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3116,12 +3165,12 @@ for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3120: checking for $ac_func" >&5 +echo "configure:3169: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3171,7 +3220,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3175: checking for $ac_word" >&5 +echo "configure:3224: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3207,7 +3256,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3211: checking for $ac_word" >&5 +echo "configure:3260: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3239,7 +3288,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3270,7 +3319,7 @@ if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:3274: checking whether catgets can be used" >&5 +echo "configure:3323: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -3283,7 +3332,7 @@ if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:3287: checking for main in -li" >&5 +echo "configure:3336: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3291,14 +3340,14 @@ ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3326,12 +3375,12 @@ fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:3330: checking for catgets" >&5 +echo "configure:3379: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -3376,7 +3425,7 @@ # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3380: checking for $ac_word" >&5 +echo "configure:3429: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3412,7 +3461,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3416: checking for $ac_word" >&5 +echo "configure:3465: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3449,7 +3498,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3453: checking for $ac_word" >&5 +echo "configure:3502: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3484,7 +3533,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3488: checking for $ac_word" >&5 +echo "configure:3537: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3542,7 +3591,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3546: checking for $ac_word" >&5 +echo "configure:3595: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3576,7 +3625,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3580: checking for $ac_word" >&5 +echo "configure:3629: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3612,7 +3661,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3616: checking for $ac_word" >&5 +echo "configure:3665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3705,7 +3754,7 @@ LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3709: checking for catalogs to be installed" >&5 +echo "configure:3758: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3733,17 +3782,17 @@ if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:3737: checking for linux/version.h" >&5 +echo "configure:3786: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3815,8 +3864,49 @@ fi if test "$try_gdbm" = yes; then -echo $ac_n "checking for gdbm_firstkey in -lgdbm""... $ac_c" 1>&6 -echo "configure:3820: checking for gdbm_firstkey in -lgdbm" >&5 +for ac_hdr in gdbm.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3872: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + +if test "$ac_cv_header_gdbm_h" = yes ; then + echo $ac_n "checking for gdbm_firstkey in -lgdbm""... $ac_c" 1>&6 +echo "configure:3910: checking for gdbm_firstkey in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_firstkey | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3824,7 +3914,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3863,9 +3953,11 @@ fi fi +fi + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3869: checking for gethostbyname in -lnsl" >&5 +echo "configure:3961: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3873,7 +3965,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3912,7 +4004,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3916: checking for socket in -lsocket" >&5 +echo "configure:4008: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3920,7 +4012,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3957,7 +4049,7 @@ fi if test x$ac_try_nsl = x1; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3961: checking for gethostbyname in -lnsl" >&5 +echo "configure:4053: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3965,7 +4057,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4005,7 +4097,7 @@ if test "$try_dynload" = yes ; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4009: checking for dlopen in -ldl" >&5 +echo "configure:4101: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4013,7 +4105,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4064,7 +4156,7 @@ use_gnupg_extensions=yes else echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:4068: checking for dlopen in -lc" >&5 +echo "configure:4160: checking for dlopen in -lc" >&5 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4072,7 +4164,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4121,11 +4213,71 @@ DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC" use_gnupg_extensions=yes + else + echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 +echo "configure:4219: checking for shl_load in -ldld" >&5 +ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldld $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo dld | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + if test "$ac_cv_lib_dld_shl_load" = "yes"; then + cat >> confdefs.h <<\EOF +#define USE_DYNAMIC_LINKING 1 +EOF + + cat >> confdefs.h <<\EOF +#define HAVE_DL_SHL_LOAD 1 +EOF + + DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC" + use_gnupg_extensions=yes + fi fi fi else echo $ac_n "checking for dynamic loading""... $ac_c" 1>&6 -echo "configure:4129: checking for dynamic loading" >&5 +echo "configure:4281: checking for dynamic loading" >&5 DYNLINK_LDFLAGS= DYNLINK_MOD_CFLAGS= use_gnupg_extensions=no @@ -4146,12 +4298,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4150: checking for ANSI C header files" >&5 +echo "configure:4302: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4159,7 +4311,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4176,7 +4328,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4194,7 +4346,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4215,7 +4367,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4226,7 +4378,7 @@ exit (0); } EOF -if { (eval echo configure:4230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4253,17 +4405,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4257: checking for $ac_hdr" >&5 +echo "configure:4409: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4292,12 +4444,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4296: checking for working const" >&5 +echo "configure:4448: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4367,21 +4519,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4371: checking for inline" >&5 +echo "configure:4523: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4407,12 +4559,12 @@ esac echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4411: checking for size_t" >&5 +echo "configure:4563: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4440,12 +4592,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4444: checking return type of signal handlers" >&5 +echo "configure:4596: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4462,7 +4614,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4481,12 +4633,12 @@ echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:4485: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:4637: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4498,7 +4650,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:4502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -4523,14 +4675,14 @@ echo "configure: warning: cross compiling; assuming little endianess" 1>&2 fi echo $ac_n "checking endianess""... $ac_c" 1>&6 -echo "configure:4527: checking endianess" >&5 +echo "configure:4679: checking endianess" >&5 if eval "test \"`echo '$''{'gnupg_cv_c_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gnupg_cv_c_endian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -4541,11 +4693,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:4545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -4556,7 +4708,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:4560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_c_endian=big else @@ -4577,7 +4729,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gnupg_cv_c_endian=little else @@ -4622,12 +4774,12 @@ echo $ac_n "checking for byte typedef""... $ac_c" 1>&6 -echo "configure:4626: checking for byte typedef" >&5 +echo "configure:4778: checking for byte typedef" >&5 if eval "test \"`echo '$''{'gnupg_cv_typedef_byte'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4638,7 +4790,7 @@ ; return 0; } EOF -if { (eval echo configure:4642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_byte=yes else @@ -4659,12 +4811,12 @@ fi echo $ac_n "checking for ushort typedef""... $ac_c" 1>&6 -echo "configure:4663: checking for ushort typedef" >&5 +echo "configure:4815: checking for ushort typedef" >&5 if eval "test \"`echo '$''{'gnupg_cv_typedef_ushort'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4675,7 +4827,7 @@ ; return 0; } EOF -if { (eval echo configure:4679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_ushort=yes else @@ -4696,12 +4848,12 @@ fi echo $ac_n "checking for ulong typedef""... $ac_c" 1>&6 -echo "configure:4700: checking for ulong typedef" >&5 +echo "configure:4852: checking for ulong typedef" >&5 if eval "test \"`echo '$''{'gnupg_cv_typedef_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4712,7 +4864,7 @@ ; return 0; } EOF -if { (eval echo configure:4716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_ulong=yes else @@ -4733,12 +4885,12 @@ fi echo $ac_n "checking for u16 typedef""... $ac_c" 1>&6 -echo "configure:4737: checking for u16 typedef" >&5 +echo "configure:4889: checking for u16 typedef" >&5 if eval "test \"`echo '$''{'gnupg_cv_typedef_u16'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4749,7 +4901,7 @@ ; return 0; } EOF -if { (eval echo configure:4753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_u16=yes else @@ -4770,12 +4922,12 @@ fi echo $ac_n "checking for u32 typedef""... $ac_c" 1>&6 -echo "configure:4774: checking for u32 typedef" >&5 +echo "configure:4926: checking for u32 typedef" >&5 if eval "test \"`echo '$''{'gnupg_cv_typedef_u32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4786,7 +4938,7 @@ ; return 0; } EOF -if { (eval echo configure:4790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_u32=yes else @@ -4808,7 +4960,7 @@ echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6 -echo "configure:4812: checking size of unsigned short" >&5 +echo "configure:4964: checking size of unsigned short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4816,7 +4968,7 @@ ac_cv_sizeof_unsigned_short=2 else cat > conftest.$ac_ext < main() @@ -4827,7 +4979,7 @@ exit(0); } EOF -if { (eval echo configure:4831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_short=`cat conftestval` else @@ -4847,7 +4999,7 @@ echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 -echo "configure:4851: checking size of unsigned int" >&5 +echo "configure:5003: checking size of unsigned int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4855,7 +5007,7 @@ ac_cv_sizeof_unsigned_int=4 else cat > conftest.$ac_ext < main() @@ -4866,7 +5018,7 @@ exit(0); } EOF -if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_int=`cat conftestval` else @@ -4886,7 +5038,7 @@ echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:4890: checking size of unsigned long" >&5 +echo "configure:5042: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4894,7 +5046,7 @@ ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < main() @@ -4905,7 +5057,7 @@ exit(0); } EOF -if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -4934,12 +5086,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4938: checking for vprintf" >&5 +echo "configure:5090: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4986,12 +5138,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4990: checking for _doprnt" >&5 +echo "configure:5142: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -5041,12 +5193,12 @@ for ac_func in strerror stpcpy strlwr tcgetattr rand strtoul mmap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5045: checking for $ac_func" >&5 +echo "configure:5197: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5096,12 +5248,12 @@ for ac_func in memmove gettimeofday getrusage gethrtime setrlimit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5100: checking for $ac_func" >&5 +echo "configure:5252: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5151,12 +5303,12 @@ for ac_func in memicmp atexit raise getpagesize strftime nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5155: checking for $ac_func" >&5 +echo "configure:5307: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5207,12 +5359,12 @@ for ac_func in mlock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5211: checking for $ac_func" >&5 +echo "configure:5363: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5261,7 +5413,7 @@ if test "$ac_cv_func_mlock" = "yes"; then echo $ac_n "checking whether mlock is broken""... $ac_c" 1>&6 -echo "configure:5265: checking whether mlock is broken" >&5 +echo "configure:5417: checking whether mlock is broken" >&5 if eval "test \"`echo '$''{'gnupg_cv_have_broken_mlock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5270,7 +5422,7 @@ else cat > conftest.$ac_ext < @@ -5300,7 +5452,7 @@ EOF -if { (eval echo configure:5304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gnupg_cv_have_broken_mlock="no" else @@ -5335,17 +5487,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5339: checking for $ac_hdr" >&5 +echo "configure:5491: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5373,7 +5525,7 @@ if test "$ac_cv_header_sys_shm_h" = "yes"; then echo $ac_n "checking whether IPC_RMID allowes subsequent attaches""... $ac_c" 1>&6 -echo "configure:5377: checking whether IPC_RMID allowes subsequent attaches" >&5 +echo "configure:5529: checking whether IPC_RMID allowes subsequent attaches" >&5 if eval "test \"`echo '$''{'gnupg_cv_ipc_rmid_deferred_release'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5381,7 +5533,7 @@ gnupg_cv_ipc_rmid_deferred_release="assume-no" else cat > conftest.$ac_ext < @@ -5407,7 +5559,7 @@ } EOF -if { (eval echo configure:5411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gnupg_cv_ipc_rmid_deferred_release="yes" else @@ -5437,12 +5589,12 @@ fi echo $ac_n "checking whether SHM_LOCK is available""... $ac_c" 1>&6 -echo "configure:5441: checking whether SHM_LOCK is available" >&5 +echo "configure:5593: checking whether SHM_LOCK is available" >&5 if eval "test \"`echo '$''{'gnupg_cv_ipc_have_shm_lock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5453,7 +5605,7 @@ ; return 0; } EOF -if { (eval echo configure:5457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_ipc_have_shm_lock="yes" else @@ -5486,29 +5638,92 @@ fi if test "$try_dev_random" = yes ; then -echo $ac_n "checking for random device""... $ac_c" 1>&6 -echo "configure:5491: checking for random device" >&5 + echo $ac_n "checking for random device""... $ac_c" 1>&6 +echo "configure:5643: checking for random device" >&5 if eval "test \"`echo '$''{'ac_cv_have_dev_random'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -c "$NAME_OF_DEV_RANDOM" && test -c "$NAME_OF_DEV_URANDOM" ; then - ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi + ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi fi echo "$ac_t""$ac_cv_have_dev_random" 1>&6 -if test "$ac_cv_have_dev_random" = yes; then - cat >> confdefs.h <<\EOF + if test "$ac_cv_have_dev_random" = yes; then + cat >> confdefs.h <<\EOF #define HAVE_DEV_RANDOM 1 EOF -fi + fi else echo $ac_n "checking for random device""... $ac_c" 1>&6 -echo "configure:5508: checking for random device" >&5 +echo "configure:5660: checking for random device" >&5 ac_cv_have_dev_random=no echo "$ac_t""has been disabled" 1>&6 fi +if test "$ac_cv_have_dev_random" = yes ; then + for ac_hdr in linux/random.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:5670: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:5680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + echo $ac_n "checking for random device ioctl""... $ac_c" 1>&6 +echo "configure:5707: checking for random device ioctl" >&5 +if eval "test \"`echo '$''{'ac_cv_have_dev_random_ioctl'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_header_linux_random_h" = yes ; then + ac_cv_have_dev_random_ioctl=yes; + else + ac_cv_have_dev_random_ioctl=no; + fi + +fi + +echo "$ac_t""$ac_cv_have_dev_random_ioctl" 1>&6 + if test "$ac_cv_have_dev_random_ioctl" = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_DEV_RANDOM_IOCTL 1 +EOF + + fi +fi + static_modules="$static_modules rmd160" if test "$use_static_rnd" = default; then @@ -5602,7 +5817,7 @@ echo $ac_n "checking for mpi assembler functions""... $ac_c" 1>&6 -echo "configure:5606: checking for mpi assembler functions" >&5 +echo "configure:5821: checking for mpi assembler functions" >&5 if test -f $srcdir/mpi/config.links ; then . $srcdir/mpi/config.links if test "x$wk_link_files_src" = "x"; then @@ -5636,49 +5851,25 @@ MPI_SFLAGS="$ac_cv_mpi_sflags" +use_local_zlib=yes if test "$g10_force_zlib" = "yes"; then - ZLIBS="../zlib/libzlib.a" - - -if true; then - ENABLE_LOCAL_ZLIB_TRUE= - ENABLE_LOCAL_ZLIB_FALSE='#' -else - ENABLE_LOCAL_ZLIB_TRUE='#' - ENABLE_LOCAL_ZLIB_FALSE= -fi - if test "x$wk_link_files_src" = "x"; then - wk_link_files_src="zlib/zlib.h" - wk_link_files_dst="zlib.h " - else - wk_link_files_src="$wk_link_files_src zlib/zlib.h" - wk_link_files_dst="$wk_link_files_dst zlib.h " - fi - - if test "x$wk_link_files_src" = "x"; then - wk_link_files_src="zlib/zconf.h" - wk_link_files_dst="zconf.h " - else - wk_link_files_src="$wk_link_files_src zlib/zconf.h" - wk_link_files_dst="$wk_link_files_dst zconf.h " - fi - + : else -for ac_hdr in zlib.h + for ac_hdr in zlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5672: checking for $ac_hdr" >&5 +echo "configure:5863: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5704,20 +5895,52 @@ fi done -if test "$ac_cv_header_zlib_h" = yes ; then - LIBS="$LIBS -lz" - ZLIBS= - + if test "$ac_cv_header_zlib_h" = yes ; then + echo $ac_n "checking for deflateInit2_ in -lz""... $ac_c" 1>&6 +echo "configure:5901: checking for deflateInit2_ in -lz" >&5 +ac_lib_var=`echo z'_'deflateInit2_ | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lz $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else - ENABLE_LOCAL_ZLIB_TRUE='#' - ENABLE_LOCAL_ZLIB_FALSE= + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + use_local_zlib=no else - ZLIBS="../zlib/libzlib.a" + echo "$ac_t""no" 1>&6 +: +fi + + fi +fi + +if test "use_local_zlib" = yes ; then if true; then @@ -5743,11 +5966,25 @@ wk_link_files_dst="$wk_link_files_dst zconf.h " fi + ZLIBS="../zlib/libzlib.a" +else + + +if false; then + ENABLE_LOCAL_ZLIB_TRUE= + ENABLE_LOCAL_ZLIB_FALSE='#' +else + ENABLE_LOCAL_ZLIB_TRUE='#' + ENABLE_LOCAL_ZLIB_FALSE= fi + ZLIBS= + LIBS="-lz $LIBS" fi -if echo "$VERSION" | grep 'a-zA-Z' >/dev/null ; then + +tmp_pat='[a-zA-Z]' +if echo "$VERSION" | grep $tmp_pat >/dev/null ; then cat >> confdefs.h <<\EOF #define IS_DEVELOPMENT_VERSION 1 EOF @@ -5874,6 +6111,7 @@ tools/Makefile zlib/Makefile checks/Makefile +gcrypt/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff -urN gnupg-0.9.7/configure.in gnupg-0.9.8/configure.in --- gnupg-0.9.7/configure.in Sun May 23 14:28:53 1999 +++ gnupg-0.9.8/configure.in Sat Jun 26 13:01:06 1999 @@ -2,7 +2,7 @@ dnl Configure template for GNUPG dnl dnl (Process this file with autoconf to produce a configure script.) -AC_REVISION($Revision: 1.88 $)dnl +AC_REVISION($Revision: 1.94 $)dnl dnl Must reset CDPATH so that bash's cd does not print to stdout CDPATH= @@ -102,6 +102,17 @@ [g10_force_zlib=yes], [g10_force_zlib=no] ) AC_MSG_RESULT($g10_force_zlib) +dnl This does not work because automakes install tareget still needs libtool +dnl dnl +dnl dnl Check wether we want to compile libgcrypt +dnl dnl +dnl AC_MSG_CHECKING([whether compilation of libgcrypt is requested]) +dnl AC_ARG_ENABLE(libgcrypt, +dnl [ --enable-libgcrypt compile the libgcrypt [default=no]], +dnl [compile_libgcrypt="$enableval"],[compile_libgcrypt=no]) +dnl AM_CONDITIONAL(COMPILE_LIBGCRYPT, test x$compile_libgcrypt = xyes) +dnl AC_MSG_RESULT($compile_libgcrypt) + dnl Checks for programs. @@ -120,6 +131,17 @@ AC_ISC_POSIX AC_PROG_INSTALL AC_PROG_RANLIB +AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no) +AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes) + + + +dnl if test x$compile_libgcrypt = xyes; then +dnl dnl Don't default to build shared libs +dnl AM_DISABLE_SHARED +dnl AM_PROG_LIBTOOL +dnl fi + MPI_OPT_FLAGS="" if test "$GCC" = yes; then @@ -224,9 +246,17 @@ AC_SUBST(USE_INCLUDED_LIBINTL) fi +dnl +dnl There are lot of misconfigured systems. We include +dnl gdbm support only if the lib and the header is installed. +dnl if test "$try_gdbm" = yes; then -AC_CHECK_LIB(gdbm,gdbm_firstkey) +AC_CHECK_HEADERS(gdbm.h) +if test "$ac_cv_header_gdbm_h" = yes ; then + AC_CHECK_LIB(gdbm,gdbm_firstkey) fi +fi + dnl Solaris needs -lsocket and -lnsl. Unisys system includes dnl gethostbyname in libsocket but needs libnsl for socket. @@ -258,8 +288,14 @@ AC_DEFINE(HAVE_DL_DLOPEN) DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC" use_gnupg_extensions=yes -dnl else -dnl + else + AC_CHECK_LIB(dld,shl_load) + if test "$ac_cv_lib_dld_shl_load" = "yes"; then + AC_DEFINE(USE_DYNAMIC_LINKING) + AC_DEFINE(HAVE_DL_SHL_LOAD) + DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC" + use_gnupg_extensions=yes +dnl ----------------- dnl DLD is not ready for use. So I better disable this test dnl dnl AC_CHECK_LIB(dld,dld_link) @@ -268,7 +304,8 @@ dnl AC_DEFINE(HAVE_DLD_DLD_LINK) dnl DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC" dnl use_gnupg_extensions=yes -dnl fi +dnl --------------- + fi fi fi else @@ -330,20 +367,40 @@ AC_DEFINE(USE_SHM_COPROCESSING) fi +dnl dnl check whether we have a random device +dnl if test "$try_dev_random" = yes ; then -AC_CACHE_CHECK(for random device, ac_cv_have_dev_random, -[if test -c "$NAME_OF_DEV_RANDOM" && test -c "$NAME_OF_DEV_URANDOM" ; then - ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi]) -if test "$ac_cv_have_dev_random" = yes; then - AC_DEFINE(HAVE_DEV_RANDOM) -fi + AC_CACHE_CHECK(for random device, ac_cv_have_dev_random, + [if test -c "$NAME_OF_DEV_RANDOM" && test -c "$NAME_OF_DEV_URANDOM" ; then + ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi]) + if test "$ac_cv_have_dev_random" = yes; then + AC_DEFINE(HAVE_DEV_RANDOM) + fi else AC_MSG_CHECKING(for random device) ac_cv_have_dev_random=no AC_MSG_RESULT(has been disabled) fi +dnl +dnl and whether this device supports ioctl +dnl (Note, that we should do a real test here) +dnl +if test "$ac_cv_have_dev_random" = yes ; then + AC_CHECK_HEADERS(linux/random.h) + AC_CACHE_CHECK(for random device ioctl, ac_cv_have_dev_random_ioctl, + [ if test "$ac_cv_header_linux_random_h" = yes ; then + ac_cv_have_dev_random_ioctl=yes; + else + ac_cv_have_dev_random_ioctl=no; + fi + ]) + if test "$ac_cv_have_dev_random_ioctl" = yes; then + AC_DEFINE(HAVE_DEV_RANDOM_IOCTL) + fi +fi + dnl dnl Figure out the default linkage mode for cipher modules @@ -474,27 +531,33 @@ dnl Do we have zlib? Must do it here because Solaris failed dnl when compiling a conftest (due to the "-lz" from LIBS). +use_local_zlib=yes if test "$g10_force_zlib" = "yes"; then - ZLIBS="../zlib/libzlib.a" + : +else + AC_CHECK_HEADERS(zlib.h) + if test "$ac_cv_header_zlib_h" = yes ; then + AC_CHECK_LIB(z,deflateInit2_,use_local_zlib=no,:) + fi +fi + +if test "use_local_zlib" = yes ; then AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) GNUPG_LINK_FILES(zlib/zlib.h, zlib.h ) GNUPG_LINK_FILES(zlib/zconf.h, zconf.h ) + ZLIBS="../zlib/libzlib.a" else -AC_CHECK_HEADERS(zlib.h) -if test "$ac_cv_header_zlib_h" = yes ; then - LIBS="$LIBS -lz" - ZLIBS= AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false) -else - ZLIBS="../zlib/libzlib.a" - AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) - GNUPG_LINK_FILES(zlib/zlib.h, zlib.h ) - GNUPG_LINK_FILES(zlib/zconf.h, zconf.h ) -fi + ZLIBS= + LIBS="-lz $LIBS" fi AC_SUBST(ZLIBS) -if echo "$VERSION" | grep '[a-zA-Z]' >/dev/null ; then + +changequote(,)dnl +tmp_pat='[a-zA-Z]' +changequote([,])dnl +if echo "$VERSION" | grep $tmp_pat >/dev/null ; then AC_DEFINE(IS_DEVELOPMENT_VERSION) fi @@ -543,6 +606,7 @@ tools/Makefile zlib/Makefile checks/Makefile +gcrypt/Makefile ]) dnl *-*wedit:notab*-* Please keep this as the last line. diff -urN gnupg-0.9.7/doc/ChangeLog gnupg-0.9.8/doc/ChangeLog --- gnupg-0.9.7/doc/ChangeLog Wed Feb 10 17:15:44 1999 +++ gnupg-0.9.8/doc/ChangeLog Wed Jun 16 20:16:24 1999 @@ -1,3 +1,19 @@ +Wed Jun 16 20:16:21 CEST 1999 Werner Koch + + + * gpg1.pod: Removed. + * gpg.sgml: New. Replaces the pod file + * Makefile.am: Add rule to make a man file from sgml + +Tue Jun 15 12:21:08 CEST 1999 Werner Koch + + + * Makefile.in.in: Use DESTDIR. + +Mon May 31 19:41:10 CEST 1999 Werner Koch + + * gpg.1pod: Enhanced the Bugs section (Michael). + Wed Feb 10 17:15:39 CET 1999 Werner Koch diff -urN gnupg-0.9.7/doc/DETAILS gnupg-0.9.8/doc/DETAILS --- gnupg-0.9.7/doc/DETAILS Fri May 21 12:45:08 1999 +++ gnupg-0.9.8/doc/DETAILS Tue Jun 8 12:06:23 1999 @@ -12,6 +12,7 @@ ssb = secret subkey (secondary key) uid = user id (only field 10 is used). fpr = fingerprint: (fingerprint is in field 10) + pkd = public key data (special field format, see below) 2. Field: A letter describing the calculated trust, see doc/FAQ This is a single letter, but be prepared that additional @@ -38,6 +39,13 @@ control characters (the colon is quoted "\x3a"). More fields may be added later. + +If field 1 has the tag "pkd", a listing looks like this: +pkd:0:1024:B665B1435F4C2 .... FF26ABB: + ! ! !-- the value + ! !------ for infomation number of bits in the value + !--------- index (eg. DSA goes from 0 to 3: p,q,g,y) + Format of the "--status-fd" output diff -urN gnupg-0.9.7/doc/Makefile.am gnupg-0.9.8/doc/Makefile.am --- gnupg-0.9.7/doc/Makefile.am Thu Mar 11 13:29:44 1999 +++ gnupg-0.9.8/doc/Makefile.am Wed Jun 16 20:11:12 1999 @@ -1,32 +1,23 @@ ## Process this file with automake to create Makefile.in -EXTRA_DIST = DETAILS gpg.1pod gpg.1 FAQ HACKING OpenPGP +EXTRA_DIST = DETAILS gpg.sgml gpg.1 FAQ HACKING OpenPGP man_MANS = gpg.1 - -install-data-hook: - if test -f $(man1dir)/gpgm.1; then rm $(man1dir)/gpgm.1; fi - ln -s $(man1dir)/gpg.1 $(man1dir)/gpgm.1 \ - || ln $(man1dir)/gpg.1 $(man1dir)/gpgm.1 - - - -%: %pod - pod2man $< --section=`echo $@ | sed 's/^.*(?)$$/$$&/'`\ - --release="`date -r $< '+%d %b %Y'`"\ - --center="GNU Tools" --date=' '\ - >$@,$$$$ && mv -f $@,$$$$ $@\ - || rm -f $@,$$$$ - +%.1 : %.sgml +if HAVE_DOCBOOK_TO_MAN + docbook-to-man $< >$@ +else + : Warning: missing docbook-to-man, cannot make $@ +endif %.txt : %.sgml sgml2txt -c latin $* %.html : %.sgml - sgml2html -l deutsch -c latin $* + sgml2html -c latin $* %.dvi : %.sgml -rm $*.sgml.tmp diff -urN gnupg-0.9.7/doc/Makefile.in gnupg-0.9.8/doc/Makefile.in --- gnupg-0.9.7/doc/Makefile.in Sun May 23 20:02:58 1999 +++ gnupg-0.9.8/doc/Makefile.in Sat Jun 26 13:07:38 1999 @@ -70,6 +70,7 @@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@ DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ @@ -101,7 +102,7 @@ ZLIBS = @ZLIBS@ l = @l@ -EXTRA_DIST = DETAILS gpg.1pod gpg.1 FAQ HACKING OpenPGP +EXTRA_DIST = DETAILS gpg.sgml gpg.1 FAQ HACKING OpenPGP man_MANS = gpg.1 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -197,8 +198,6 @@ install-exec: install-exec-am install-data-am: install-man - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-data: install-data-am install-am: all-am @@ -249,23 +248,15 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean -install-data-hook: - if test -f $(man1dir)/gpgm.1; then rm $(man1dir)/gpgm.1; fi - ln -s $(man1dir)/gpg.1 $(man1dir)/gpgm.1 \ - || ln $(man1dir)/gpg.1 $(man1dir)/gpgm.1 - -%: %pod - pod2man $< --section=`echo $@ | sed 's/^.*(?)$$/$$&/'`\ - --release="`date -r $< '+%d %b %Y'`"\ - --center="GNU Tools" --date=' '\ - >$@,$$$$ && mv -f $@,$$$$ $@\ - || rm -f $@,$$$$ +%.1 : %.sgml +@HAVE_DOCBOOK_TO_MAN_TRUE@ docbook-to-man $< >$@ +@HAVE_DOCBOOK_TO_MAN_FALSE@ : Warning: missing docbook-to-man, cannot make $@ %.txt : %.sgml sgml2txt -c latin $* %.html : %.sgml - sgml2html -l deutsch -c latin $* + sgml2html -c latin $* %.dvi : %.sgml -rm $*.sgml.tmp diff -urN gnupg-0.9.7/doc/gpg.1 gnupg-0.9.8/doc/gpg.1 --- gnupg-0.9.7/doc/gpg.1 Sat May 22 22:27:06 1999 +++ gnupg-0.9.8/doc/gpg.1 Thu Jun 17 16:45:06 1999 @@ -1,784 +1,592 @@ -.rn '' }` -''' $RCSfile$$Revision$$Date$ -''' -''' $Log$ -''' -.de Sh -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp -.if t .sp .5v -.if n .sp -.. -.de Ip -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.de Vb -.ft CW -.nf -.ne \\$1 -.. -.de Ve -.ft R - -.fi -.. -''' -''' -''' Set up \*(-- to give an unbreakable dash; -''' string Tr holds user defined translation string. -''' Bell System Logo is used as a dummy character. -''' -.tr \(*W-|\(bv\*(Tr -.ie n \{\ -.ds -- \(*W- -.ds PI pi -.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -.ds L" "" -.ds R" "" -''' \*(M", \*(S", \*(N" and \*(T" are the equivalent of -''' \*(L" and \*(R", except that they are used on ".xx" lines, -''' such as .IP and .SH, which do another additional levels of -''' double-quote interpretation -.ds M" """ -.ds S" """ -.ds N" """"" -.ds T" """"" -.ds L' ' -.ds R' ' -.ds M' ' -.ds S' ' -.ds N' ' -.ds T' ' -'br\} -.el\{\ -.ds -- \(em\| -.tr \*(Tr -.ds L" `` -.ds R" '' -.ds M" `` -.ds S" '' -.ds N" `` -.ds T" '' -.ds L' ` -.ds R' ' -.ds M' ` -.ds S' ' -.ds N' ` -.ds T' ' -.ds PI \(*p -'br\} -.\" If the F register is turned on, we'll generate -.\" index entries out stderr for the following things: -.\" TH Title -.\" SH Header -.\" Sh Subsection -.\" Ip Item -.\" X<> Xref (embedded -.\" Of course, you have to process the output yourself -.\" in some meaninful fashion. -.if \nF \{ -.de IX -.tm Index:\\$1\t\\n%\t"\\$2" +...\" $Header: /usr/src/docbook-to-man/cmd/RCS/docbook-to-man.sh,v 1.3 1996/06/17 03:36:49 fld Exp $ +...\" +...\" transcript compatibility for postscript use. +...\" +...\" synopsis: .P! +...\" +.de P! +.fl +\!!1 setgray +.fl +\\&.\" +.fl +\!!0 setgray +.fl \" force out current output buffer +\!!save /psv exch def currentpoint translate 0 0 moveto +\!!/showpage{}def +.fl \" prolog +.sy sed -e 's/^/!/' \\$1\" bring in postscript file +\!!psv restore +. +.de pF +.ie \\*(f1 .ds f1 \\n(.f +.el .ie \\*(f2 .ds f2 \\n(.f +.el .ie \\*(f3 .ds f3 \\n(.f +.el .ie \\*(f4 .ds f4 \\n(.f +.el .tm ? font overflow +.ft \\$1 .. -.nr % 0 -.rr F -.\} -.TH gpg.1pod gpg.1 "21 May 1999" " " "GNU Tools" -.UC -.if n .hy 0 -.if n .na -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.de CQ \" put $1 in typewriter font -.ft CW -'if n "\c -'if t \\&\\$1\c -'if n \\&\\$1\c -'if n \&" -\\&\\$2 \\$3 \\$4 \\$5 \\$6 \\$7 -'.ft R +.de fP +.ie !\\*(f4 \{\ +. ft \\*(f4 +. ds f4\" +' br \} +.el .ie !\\*(f3 \{\ +. ft \\*(f3 +. ds f3\" +' br \} +.el .ie !\\*(f2 \{\ +. ft \\*(f2 +. ds f2\" +' br \} +.el .ie !\\*(f1 \{\ +. ft \\*(f1 +. ds f1\" +' br \} +.el .tm ? font underflow .. -.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2 -. \" AM - accent mark definitions -.bd B 3 -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds ? ? -. ds ! ! -. ds / -. ds q -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds ? \s-2c\h'-\w'c'u*7/10'\u\h'\*(#H'\zi\d\s+2\h'\w'c'u*8/10' -. ds ! \s-2\(or\s+2\h'-\w'\(or'u'\v'-.8m'.\v'.8m' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -. ds q o\h'-\w'o'u*8/10'\s-4\v'.4m'\z\(*i\v'-.4m'\s+4\h'\w'o'u*8/10' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#] -.ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u' -.ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u' -.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#] -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -.ds oe o\h'-(\w'o'u*4/10)'e -.ds Oe O\h'-(\w'O'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds v \h'-1'\o'\(aa\(ga' -. ds _ \h'-1'^ -. ds . \h'-1'. -. ds 3 3 -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -. ds oe oe -. ds Oe OE -.\} -.rm #[ #] #H #V #F C +.ds f1\" +.ds f2\" +.ds f3\" +.ds f4\" +.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n +.TH "gpg" "1" .SH "NAME" -gpg \- GNU Privacy Guard +gpg \(em encryption and signing tool .SH "SYNOPSIS" -\fBgpg\fR [--homedir name] [--options file] [options] command [args] -.SH "DESCRIPTION" -\fBgpg\fR is the main program for the GnuPG system. -.SH "COMMANDS" -\fBgpg\fR recognizes these commands: -.PP -\fB\-s\fR, \fB--sign\fR - Make a signature. This option may be combined - with \fB--encrypt\fR. -.PP -\fB--clearsign\fR - Make a clear text signature. -.PP -\fB\-b\fR, \fB--detach-sign\fR - Make a detached signature. -.PP -\fB\-e\fR, \fB--encrypt\fR - Encrypt data. This option may be combined with \fB--sign\fR. -.PP -\fB\-c\fR, \fB--symmetric\fR - Encrypt with symmetric cipher only - This command asks for a passphrase. -.PP -\fB--store\fR - Store only (make a simple RFC1991 packet). -.PP -\fB--decrypt\fR [\fIfile\fR] - Decrypt file (or stdin if no file is specified) and - write it to stdout (or the file specified with - \fB--output\fR). If the decrypted file is signed, the - signature is also verified. This command differs - from the default operation, as it never writes to the - filename which is included in the file and it - rejects files which don't begin with an encrypted - message. -.PP -\fB--verify\fR [[\fIsigfile\fR] {\fIsigned-files\fR}] - Assume that \fIsigfile\fR is a signature and verify it - without generating any output. With no arguments, - the signature packet is read from stdin (it may be a - detached signature when not used in batch mode). If - only a sigfile is given, it may be a complete - signature or a detached signature, in which case - the signed stuff is expected in a file without the - \fI.sig\fR or \fI.asc\fR extension (if such a file does - not exist it is expected at stdin \- use \fB\-\fR as - filename to force a read from stdin). With more than - 1 argument, the first should be a detached signature - and the remaining files are the signed stuff. -.PP -\fB\-k\fR [\fIusername\fR] [\fIkeyring\fR] - Kludge to be somewhat compatible with PGP. - Without arguments, all public keyrings are listed. - With one argument, only \fIkeyring\fR is listed. - Special combinations are also allowed, but they may - give strange results when combined with more options. - \fB\-kv\fR Same as \fB\-k\fR - \fB\-kvv\fR List the signatures with every key. - \fB\-kvvv\fR Additionally check all signatures. - \fB\-kvc\fR List fingerprints - \fB\-kvvc\fR List fingerprints and signatures -.PP -.Vb 1 -\& B -.Ve -\fB--list-keys\fR [\fInames\fR] -\fB--list-public-keys\fR [\fInames\fR] - List all keys from the public keyrings, or just the - ones given on the command line. -.PP -\fB--list-secret-keys\fR [\fInames\fR] - List all keys from the secret keyrings, or just the - ones given on the command line. -.PP -\fB--list-sigs\fR [\fInames\fR] - Same as \fB--list-keys\fR, but the signatures are listed - too. -.PP -\fB--check-sigs\fR [\fInames\fR] - Same as \fB--list-sigs\fR, but the signatures are verified. -.PP -\fB--fingerprint\fR [\fInames\fR] - List all keys with their fingerprints. This is the - same output as \fBlist-keys\fR but with the additional output - of a line with the fingerprint. May also be combined - with \fB--list-sigs\fR or \fB--check-sigs\fR. - If this command is given twice, the fingerprints of all - secondary keys are listed too. -.PP -\fB--list-packets\fR - List only the sequence of packets. This is mainly - useful for debugging. -.PP -\fB--gen-key\fR - Generate a new key pair. This command can only be - used interactive. -.PP -\fB--edit-key\fR \fIname\fR - Present a menu which enables you to do all key - related tasks: - \fBsign\fR - Make a signature on key of user \fIname\fR. - If the key is not yet signed by the default - user (or the users given with \fB\-u\fR), the - program displays the information of the key - again, together with its fingerprint and - asks whether it should be signed. This - question is repeated for all users specified - with \fB\-u\fR. - \fBlsign\fR - Same as \fBsign\fR but the signature is marked as - non-exportbale and will therefore never be used - by others. This may be used to make keys valid - only in the local environment. - \fBrevsig\fR - Revoke a signature. GnuPG asks for every - every signature which has been done by one of - teh secret keys, whether a revocation - certificate should be generated. - \fBtrust\fR - Change the owner trust value. This updates the - trust-db immediately and no save is required. - \fBadduid\fR - Create an alternate user id. - \fBdeluid\fR - Delete an user id. - \fBaddkey\fR - Add a subkey to this key. - \fBdelkey\fR - Remove a subkey. - \fBrevkey\fR - Revoke a subkey. - \fBexpire\fR - Change the key expiration time. If a key is - selected, the time of this key will be changed. - With no selection the key expiration of the - primary key is changed. - \fBpasswd\fR - Change the passphrase of the secret key. - \fBuid\fR \fIn\fR - Toggle selection of user id with index \fIn\fR. - Use 0 to deselect all. - \fBkey\fR \fIn\fR - Toggle selection of subkey with index \fIn\fR. - Use 0 to deselect all. - \fBcheck\fR - Check all selected user ids. - \fBpref\fR - List preferences. - \fBtoggle\fR - Toggle between public and secret key listing. - \fBsave\fR - Save all changes to the key rings and quit. - \fBquit\fR - Quit the program without updating the - key rings. - The listing shows you the key with its secondary - keys and all user ids. Selected keys or user ids - are indicated by an asterisk. The trust value is - displayed with the primary key: the first is the - assigned owner trust and the second is the calculated - trust value. Letters are used for the values: - \fB\-\fR No ownertrust assigned / not yet calculated. - \fBe\fR Trust calculation has failed. - \fBq\fR Not enough information for calculation. - \fBn\fR Never trust this key. - \fBm\fR Marginally trusted. - \fBf\fR Fully trusted. - \fBu\fR Ultimately trusted .PP -\fB--delete-key\fR - Remove key from the public keyring -.PP -\fB--delete-secret-key\fR - Remove key from the secret and public keyring -.PP -\fB--gen-revoke\fR - Generate a revocation certificate. -.PP -\fB--export\fR [\fInames\fR] - Either export all keys from all keyrings (default - keyrings and those registered via option \fB--keyring\fR), - or if at least one name is given, those of the given - name. The new keyring is written to \fIstdout\fR or to - the file given with option \*(L"output\*(R". Use together - with \fB\-a\fR to mail those keys. -.PP -\fB--send-keys\fR [\fInames\fR] - Same as \fB--export\fR but sends the keys to a keyserver. - Option \fB--keyserver\fR must be used to give the name - of this keyserver. Don't send your complete keyring - to a keyserver \- select only those keys which are new - or changed by you. -.PP -\fB--export-all\fR [\fInames\fR] - Same as \fB--export\fR but does also export keys which - are not compatible to OpenPGP. -.PP -\fB--export-secret-keys\fR [\fInames\fR] - Same as \fB--export\fR, but does export the secret keys. - This is normally not very useful. -.PP -\fB--import\fR, \fB--fast-import\fR - Import/merge keys. The fast version does not build - the trustdb; this can be done at any time with the - command \fB--update-trustdb\fR. -.PP -\fB--recv-keys\fR \fIkey_IDs\fR - Import the keys with the given key IDs from a HKP - keyserver. Option \fB--keyserver\fR must be used to - give the name of this keyserver. +.nf +\fBgpg\fP [--homedir \fBname\fR] [--options \fBfile\fR] [\fBoptions\fR] \fBcommand\fR [\fBargs\fR] +.fi +.SH "DESCRIPTION" .PP -\fB--export-ownertrust\fR - List the assigned ownertrust values in ASCII format - for backup purposes +\fBgpg\fP is the main program for the GnuPG system\&. + +.SH "COMMANDS" .PP -\fB--import-ownertrust\fR [\fIfilename\fR] - Update the trustdb with the ownertrust values stored - in \fIfilename\fR (or stdin if not given); existing - values will be overwritten. +\fBgpg\fP recognizes these commands: +.IP "-s, --sign" 10 +Make a signature\&. This command may be combined +with --encrypt\&. +.IP "--clearsign" 10 +Make a clear text signature\&. +.IP "-b, --detach-sign" 10 +Make a detached signature\&. +.IP "-e, --encrypt" 10 +Encrypt data\&. This option may be combined with --sign\&. +.IP "-c, --symmetric" 10 +Encrypt with symmetric cipher only +This command asks for a passphrase\&. +.IP "--store" 10 +Store only (make a simple RFC1991 packet)\&. +.IP "--decrypt [\fBfile\fR]" 10 +Decrypt \fBfile\fR (or stdin if no file is specified) and +write it to stdout (or the file specified with +--output)\&. If the decrypted file is signed, the +signature is also verified\&. This command differs +from the default operation, as it never writes to the +filename which is included in the file and it +rejects files which don\&'t begin with an encrypted +message\&. +.IP "--verify [[\fBsigfile\fR] [\fBsigned-files\fR]]" 10 +Assume that \fBsigfile\fR is a signature and verify it +without generating any output\&. With no arguments, +the signature packet is read from stdin (it may be a +detached signature when not used in batch mode)\&. If +only a sigfile is given, it may be a complete +signature or a detached signature, in which case +the signed stuff is expected in a file without the +"\&.sig" or "\&.asc" extension (if such a file does +not exist it is expected at stdin; use a single dash ("-") as +filename to force a read from stdin)\&. With more than +1 argument, the first should be a detached signature +and the remaining files are the signed stuff\&. +.IP "--list-keys [\fBnames\fR]" 10 +.IP "--list-public-keys [\fBnames\fR]" 10 +List all keys from the public keyrings, or just the +ones given on the command line\&. +.IP "--list-secret-keys [\fBnames\fR]" 10 +List all keys from the secret keyrings, or just the +ones given on the command line\&. +.IP "--list-sigs [\fBnames\fR]" 10 +Same as --list-keys, but the signatures are listed too\&. +.IP "--check-sigs [\fBnames\fR]" 10 +Same as --list-sigs, but the signatures are verified\&. +.IP "--fingerprint [\fBnames\fR]" 10 +List all keys with their fingerprints\&. This is the +same output as --list-keys but with the additional output +of a line with the fingerprint\&. May also be combined +with --list-sigs or --check-sigs\&. +If this command is given twice, the fingerprints of all +secondary keys are listed too\&. +.IP "--list-packets" 10 +List only the sequence of packets\&. This is mainly +useful for debugging\&. +.IP "--gen-key" 10 +Generate a new key pair\&. This command can only be +used interactive\&. +.IP "--edit-key \fBname\fR" 10 +Present a menu which enables you to do all key +related tasks: +.RS +.IP "sign" 10 +Make a signature on key of user \fBname\fR If the key is not yet signed by the default +user (or the users given with -u), the +program displays the information of the key +again, together with its fingerprint and +asks whether it should be signed\&. This +question is repeated for all users specified +with -u\&. +.IP "lsign" 10 +Same as --sign but the signature is marked as +non-exportbale and will therefore never be used +by others\&. This may be used to make keys valid +only in the local environment\&. +.IP "revsig" 10 +Revoke a signature\&. GnuPG asks for every +every signature which has been done by one of +the secret keys, whether a revocation +certificate should be generated\&. +.IP "trust" 10 +Change the owner trust value\&. This updates the +trust-db immediately and no save is required\&. +.IP "adduid" 10 +Create an alternate user id\&. +.IP "deluid" 10 +Delete an user id\&. +.IP "addkey" 10 +Add a subkey to this key\&. +.IP "delkey" 10 +Remove a subkey\&. +.IP "revkey" 10 +Revoke a subkey\&. +.IP "expire" 10 +Change the key expiration time\&. If a key is +selected, the time of this key will be changed\&. +With no selection the key expiration of the +primary key is changed\&. +.IP "passwd" 10 +Change the passphrase of the secret key\&. +.IP "uid \fBn\fR" 10 +Toggle selection of user id with index \fBn\fR\&. +Use 0 to deselect all\&. +.IP "key \fBn\fR" 10 +Toggle selection of subkey with index \fBn\fR\&. +Use 0 to deselect all\&. +.IP "check" 10 +Check all selected user ids\&. +.IP "pref" 10 +List preferences\&. +.IP "toggle" 10 +Toggle between public and secret key listing\&. +.IP "save" 10 +Save all changes to the key rings and quit\&. +.IP "quit" 10 +Quit the program without updating the +key rings\&. +.RE +.IP "" 10 +The listing shows you the key with its secondary +keys and all user ids\&. Selected keys or user ids +are indicated by an asterisk\&. The trust value is +displayed with the primary key: the first is the +assigned owner trust and the second is the calculated +trust value\&. Letters are used for the values: +.RS +.IP "-" 10 +No ownertrust assigned / not yet calculated\&. +.IP "e" 10 +Trust calculation has failed\&. +.IP "q" 10 +Not enough information for calculation\&. +.IP "n" 10 +Never trust this key\&. +.IP "m" 10 +Marginally trusted\&. +.IP "f" 10 +Fully trusted\&. +.IP "u" 10 +Ultimately trusted\&. +.RE +.IP "--delete-key \fBname\fR" 10 +Remove key from the public keyring +.IP "--delete-secret-key \fBname\fR" 10 +Remove key from the secret and public keyring +.IP "--gen-revoke" 10 +Generate a revocation certificate for the complete key\&. To revoke +a subkey or a signature, use the --edit command\&. +.IP "--export [\fBnames\fR]" 10 +Either export all keys from all keyrings (default +keyrings and those registered via option --keyring), +or if at least one name is given, those of the given +name\&. The new keyring is written to stdout or to +the file given with option "output"\&. Use together +with --armor to mail those keys\&. +.IP "--send-keys [\fBnames\fR]" 10 +Same as --export but sends the keys to a keyserver\&. +Option --keyserver must be used to give the name +of this keyserver\&. Don\&'t send your complete keyring +to a keyserver - select only those keys which are new +or changed by you\&. +.IP "--export-all [\fBnames\fR]" 10 +Same as --export, but does also export keys which +are not compatible to OpenPGP\&. +.IP "--export-secret-keys [\fBnames\fR]" 10 +Same as --export, but does export the secret keys\&. +This is normally not very useful and a security risk\&. +.IP "--import [\fBfiles\fR]" 10 +.IP "--fast-import [\fBfiles\fR]" 10 +Import/merge keys\&. The fast version does not build +the trustdb; this can be done at any time with the +command --update-trustdb\&. +.IP "--recv-keys \fBkey IDs\fR" 10 +Import the keys with the given key IDs from a HKP +keyserver\&. Option --keyserver must be used to +give the name of this keyserver\&. +.IP "--export-ownertrust" 10 +List the assigned ownertrust values in ASCII format +for backup purposes +.IP "--import-ownertrust [\fBfiles\fR]" 10 +Update the trustdb with the ownertrust values stored +in \fBfiles\fR (or stdin if not given); existing +values will be overwritten\&. +.IP "--version" 10 +Print version information along with a list +of supported algorithms\&. +.IP "--warranty" 10 +Print warranty information\&. +.IP "-h, --help" 10 +Print usage information\&. This is a really long list even it does list +not all options\&. .SH "OPTIONS" -Long options can be put in an options file (default \fI~/.gnupg/options\fR). -Do not write the 2 dashes, but simply the name of the option and any -required arguments. Lines with a hash as the first non-white-space -character are ignored. Commands may be put in this file too, but that -does not make sense. -.PP -\fBgpg\fR recognizes these options: -.PP -\fB\-a\fR, \fB--armor\fR - Create ASCII armored output. -.PP -\fB\-o\fR \fIfile\fR, \fB--output\fR \fIfile\fR - Write output to \fIfile\fR. -.PP -\fB\-u\fR \fIname\fR, \fB--local-user\fR \fIname\fR - Use \fIname\fR as the user-id to sign. - This option is silently ignored for the list commands, - so that it can be used in an options file. -.PP -\fB--default-key\fR \fIname\fR - Use \fIname\fR as default user-id for signatures. If this - is not used the default user-id is the first user-id - from the secret keyring. -.PP -\fB\-r\fR \fIname\fR, \fB--recipient\fR \fIname\fR - Encrypt for user id \fIname\fR. If this option is not - specified, GnuPG asks for the user id. -.PP -\fB--encrypt-to\fR \fIname\fR - Same as \fB--recipient\fR but this one is intended for - in the options file and may be used together with - an own user-id as an \*(L"encrypt-to-self\*(R". These keys - are only used when there are other recipients given - either by use of --recipient or by the asked user id. - No trust checking is performed for these user ids. -.PP -\fB--no-encrypt-to\fR - Disable the use of all \fB--encrypt-to\fR keys. -.PP -\fB\-v\fR, \fB--verbose\fR - Give more information during processing. If used - twice, the input data is listed in detail. -.PP -\fB\-q\fR, \fB--quiet\fR - Be somewhat more quiet in some cases. -.PP -\fB\-z\fR \fIn\fR - Set compress level to \fIn\fR. A value of 0 for \fIn\fR - disables compression. Default is to use the default - compression level of zlib (normally 6). -.PP -\fB\-t\fR, \fB--textmode\fR - Use canonical text mode. If \fB\-t\fR (but not - \fB--textmode\fR) is used together with armoring - and signing, this enables clearsigned messages. - This kludge is needed for PGP compatibility; - normally you would use \fB--sign\fR or \fB--clearsign\fR - to selected the type of the signature. -.PP -\fB\-n\fR, \fB--dry-run\fR - Don't make any changes (not yet implemented). -.PP -\fB\-i\fR, \fB--interactive\fR - Prompt before overwriting any files. .PP -\fB--batch\fR - Use batch mode. Never ask, do not allow interactive - commands. -.PP -\fB--no-batch\fR - Disable batch mode. This may be used if \fBbatch\fR - is used in the options file. -.PP -\fB--yes\fR - Assume \*(L"yes\*(R" on most questions. -.PP -\fB--no\fR - Assume \*(L"no\*(R" on most questions. -.PP -\fB--keyserver\fR \fIname\fR - Use \fIname\fR to lookup keys which are not yet in - your keyring. This is only done while verifying - messages with signatures. The option is also - required for the command \fB--send-keys\fR to - specify the keyserver to where the keys should - be send. All keyservers synchronize with each - other \- so there is no need to send keys to more - than one server. Using the command - \*(L"host \-l pgp.net | grep wwwkeys\*(R" gives you a - list of keyservers. Because there is load - balancing using round-robin-dns you may notice - that you get different key servers. -.PP -\fB--keyring\fR \fIfile\fR - Add \fIfile\fR to the list of keyrings. - If \fIfile\fR begins with a tilde and a slash, these - are replaced by the HOME directory. If the filename - does not contain a slash, it is assumed to be in the - home-directory (\fI~/.gnupg\fR if \fB--homedir\fR) is not used. - The filename may be prefixed with a scheme: - \*(L"gnupg-ring:\*(R" is the default one. - \*(L"gnupg-gdbm:\*(R" may be used for a GDBM ring. - It might make sense to use it together with - \fB--no-default-keyring\fR. -.PP -\fB--secret-keyring\fR \fIfile\fR - Same as \fB--keyring\fR but for the secret keyrings. -.PP -\fB--homedir\fR \fIdir\fR - Set the name of the home directory to \fIdir\fR. If this - option is not used it defaults to \fI~/.gnupg\fR. It does - not make sense to use this in a options file. This - also overrides the environment variable \f(CWGNUPGHOME\fR. -.PP -\fB--charset\fR \fIname\fR - Set the name of the native character set. This is used - to convert some strings to proper UTF\-8 encoding. - Valid values for \fIname\fR are: - \fBiso-8859-1\fR This is the default. - \fBkoi8-r\fR The usual Russian set (rfc1489). -.PP -\fB--options\fR \fIfile\fR - Read options from \fIfile\fR and do not try to read - them from the default options file in the homedir - (see \fB--homedir\fR). This option is ignored when used - in an options file. -.PP -\fB--no-options\fR - Shortcut for \fB--options\fR \fI/dev/null\fR. This option is - detected before an attempt to open an option file. -.PP -\fB--load-extension\fR \fImodulename\fR - Load an extension module. If \fImodulename\fR does not - contain a slash it is searched in \fB/usr/local/lib/gnupg\fR - See the manual for more information about extensions. -.PP -\fB--debug\fR \fIflags\fR - Set debugging flags. All flags are or-ed and \fIflags\fR may - be given in C syntax (e.g. 0x0042). -.PP -\fB--debug-all\fR - Set all useful debugging flags. -.PP -\fB--status-fd\fR \fIn\fR - Write special status strings to the file descriptor \fIn\fR. -.PP -\fB--logger-fd\fR \fIn\fR - Write log output to file descriptor \fIn\fR and not to stderr. -.PP -\fB--no-comment\fR - Do not write comment packets. This option affects only - the generation of secret keys. Output of option packets - is disabled since version 0.4.2. -.PP -\fB--comment\fR \fIstring\fR - Use \fIstring\fR as comment string in clear text signatures. -.PP -\fB--set-filename\fR \fIstring\fR - Use \fIstring\fR as the name of file which is stored in - messages. -.PP -\fB--completes-needed\fR \fIn\fR - Number of completely trusted users to introduce a new - key signer (defaults to 1). -.PP -\fB--marginals-needed\fR \fIn\fR - Number of marginally trusted users to introduce a new - key signer (defaults to 3) -.PP -\fB--max-cert-depth\fR \fIn\fR - Maximum depth of a certification chain (default is 5). -.PP -\fB--cipher-algo\fR \fIname\fR - Use \fIname\fR as cipher algorithm. Running the program - with the command \fB--version\fR yields a list of supported - algorithms. If this is not used the cipher algorithm is - selected from the preferences stored with the key. -.PP -\fB--digest-algo\fR \fIname\fR - Use \fIname\fR as message digest algorithm. Running the - program with the command \fB--version\fR yields a list of - supported algorithms. Please note that using this - option may violate the OpenPGP requirement, that a - 160 bit hash is to be used for DSA. -.PP -\fB--s2k-cipher-algo\fR \fIname\fR - Use \fIname\fR as the cipher algorithm used to protect secret - keys. The default cipher is BLOWFISH. This cipher is - also used for conventional encryption if \fB--cipher-algo\fR - is not given. -.PP -\fB--s2k-digest-algo\fR \fIname\fR - Use \fIname\fR as the digest algorithm used to mangle the - passphrases. The default algorithm is RIPE\-MD\-160. - This digest algorithm is also used for conventional - encryption if \fB--digest-algo\fR is not given. -.PP -\fB--s2k-mode\fR \fInumber\fR - Selects how passphrases are mangled. A number of \fI0\fR - uses the plain passphrase (which is not recommended), - a \fI1\fR (default) adds a salt to the passphrase and - \fI3\fR iterates the whole process a couple of times. - Unless \-\fB--rfc1991\fR is used, this mode is also used - for conventional encryption. -.PP -\fB--compress-algo\fR \fInumber\fR - Use compress algorithm \fInumber\fR. Default is \fI2\fR which is - RFC1950 compression. You may use \fI1\fR to use the old zlib - version which is used by PGP. The default algorithm may - give better results because the window size is not limited - to 8K. If this is not used the OpenPGP behavior is used, - i.e. the compression algorithm is selected from the - preferences. -.PP -\fB--digest-algo\fR \fIname\fR - Use \fIname\fR as message digest algorithm. Running the - program with the command \fB--version\fR yields a list of - supported algorithms. -.PP -\fB--throw-keyid\fR - Do not put the keyid into encrypted packets. This option - hides the receiver of the message and is a countermeasure - against traffic analysis. It may slow down the decryption - process because all available secret keys are tried. -.PP -\fB--not-dash-escaped\fR - This option changes the behavior of cleartext signatures - so that they can be used for patch files. You should not - send such an armored file via email because all spaces - and line endings are hashed too. You can not use this - option for data which has 5 dashes at the beginning of a - line, patch files don't have this. A special armor header - line tells GnuPG about this cleartext signature option. -.PP -\fB--escape-from-lines\fR - Because some mailers change lines starting with \*(L"From \*(L" - to \*(L">From \*(L" it is good to handle such lines in a special - way when creating cleartext signatures. All other PGP - versions do it this way too. This option is not enabled - by default because it would violate rfc2440. -.PP -\fB--passphrase-fd\fR \fIn\fR - Read the passphrase from file descriptor \fIn\fR. If you use - 0 for \fIn\fR, the passphrase will be read from stdin. This - can only be used if only one passphrase is supplied. - \fBDon't use this option if you can avoid it\fR -.PP -\fB--rfc1991\fR - Try to be more RFC1991 (PGP 2.x) compliant. -.PP -\fB--force-v3-sigs\fR - OpenPGP states that an implementation should generate - v4 signatures but PGP 5.x recognizes v4 signatures only - on key material. This options forces v3 signatures for - signatures on data. -.PP -\fB--force-mdc\fR - Force the use of encryption with appended manipulation - code. This is always used with the newer cipher (those - with a blocksize greater than 64 bit). -.PP -\fB--lock-once\fR - Lock the file the first time a lock is requested - and do not release the lock until the process - terminates. -.PP -\fB--no-verbose\fR - Reset verbose level to 0. -.PP -\fB--no-greeting\fR - Suppress the initial copyright message but do not - enter batch mode. -.PP -\fB--no-armor\fR - Assume the input data is not in ASCII armored format. -.PP -\fB--no-default-keyring\fR - Do not add the default keyrings to the list of - keyrings. -.PP -\fB--skip-verify\fR - Skip the signature verification step. This may be - used to make the encryption faster if the signature - verification is not needed. -.PP -\fB--version\fR - Print version information along with a list - of supported algorithms. -.PP -\fB--with-colons\fR - Print key listings delimited by colons. -.PP -\fB--warranty\fR - Print warranty information. -.PP -\fB\-h\fR, \fB--help\fR - Print usage information. +Long options can be put in an options file (default "~/\&.gnupg/options")\&. +Do not write the 2 dashes, but simply the name of the option and any +required arguments\&. Lines with a hash as the first non-white-space +character are ignored\&. Commands may be put in this file too, but that +does not make sense\&. +.PP +\fBgpg\fP recognizes these options: +.IP "-a, --armor" 10 +Create ASCII armored output\&. +.IP "-o, --output \fBfile\fR" 10 +Write output to \fBfile\fR\&. +.IP "-u, --local-user \fBname\fR" 10 +Use \fBname\fR as the user ID to sign\&. +This option is silently ignored for the list commands, +so that it can be used in an options file\&. +.IP "--default-key \fBname\fR" 10 +Use \fBname\fR as default user ID for signatures\&. If this +is not used the default user ID is the first user ID +found in the secret keyring\&. +.IP "-r, --recipient \fBname\fR" 10 +.IP "" 10 +Encrypt for user id \fBname\fR\&. If this option is not +specified, GnuPG asks for the user id\&. +.IP "--encrypt-to \fBname\fR" 10 +Same as --recipient but this one is intended for +in the options file and may be used together with +an own user-id as an "encrypt-to-self"\&. These keys +are only used when there are other recipients given +either by use of --recipient or by the asked user id\&. +No trust checking is performed for these user ids\&. +.IP "--no-encrypt-to" 10 +Disable the use of all --encrypt-to keys\&. +.IP "-v, --verbose" 10 +Give more information during processing\&. If used +twice, the input data is listed in detail\&. +.IP "-q, --quiet" 10 +Try to be as quiet as possible\&. +.IP "-z \fBn\fR" 10 +Set compression level to \fBn\fR\&. A value of 0 for \fBn\fR disables compression\&. Default is to use the default +compression level of zlib (normally 6)\&. +.IP "-t, --textmode" 10 +Use canonical text mode\&. If -t (but not +--textmode) is used together with armoring +and signing, this enables clearsigned messages\&. +This kludge is needed for PGP compatibility; +normally you would use --sign or --clearsign +to selected the type of the signature\&. +.IP "-n, --dry-run" 10 +Don\&'t make any changes (this is not completely implemented)\&. +.IP "-i, --interactive" 10 +Prompt before overwriting any files\&. +.IP "--batch" 10 +Use batch mode\&. Never ask, do not allow interactive +commands\&. +.IP "--no-batch" 10 +Disable batch mode\&. This may be of use if --batch +is enabled from an options file\&. +.IP "--yes" 10 +Assume "yes" on most questions\&. +.IP "--no" 10 + Assume "no" on most questions\&. +.IP "--keyserver \fBname\fR" 10 +Use \fBname\fR to lookup keys which are not yet in +your keyring\&. This is only done while verifying +messages with signatures\&. The option is also +required for the command --send-keys to +specify the keyserver to where the keys should +be send\&. All keyservers synchronize with each +other - so there is no need to send keys to more +than one server\&. Using the command +"host -l pgp\&.net | grep wwwkeys" gives you a +list of keyservers\&. Because there is load +balancing using round-robin DNS you may notice +that you get different key servers\&. +.IP "--keyring \fBfile\fR" 10 +Add \fBfile\fR to the list of keyrings\&. +If \fBfile\fR begins with a tilde and a slash, these +are replaced by the HOME directory\&. If the filename +does not contain a slash, it is assumed to be in the +home-directory ("~/\&.gnupg" if --homedir is not used)\&. +The filename may be prefixed with a scheme: +.IP "" 10 +"gnupg-ring:" is the default one\&. +.IP "" 10 +"gnupg-gdbm:" may be used for a GDBM ring\&. +.IP "" 10 +It might make sense to use it together with --no-default-keyring\&. +.IP "--secret-keyring \fBfile\fR" 10 +Same as --keyring but for the secret keyrings\&. +.IP "--homedir \fBdirectory\fR" 10 +Set the name of the home directory to \fBdirectory\fR If this +option is not used it defaults to "~/\&.gnupg"\&. It does +not make sense to use this in a options file\&. This +also overrides the environment variable "GNUPGHOME"\&. +.IP "--charset \fBname\fR" 10 +Set the name of the native character set\&. This is used +to convert some strings to proper UTF-8 encoding\&. +Valid values for \fBname\fR are: +.RS +.IP "iso-8859-1" 10 +This is the default Latin 1 set\&. +.IP "iso-8859-2" 10 +The Latin 2 set\&. +.IP "koi8-r" 10 +The usual Russian set (rfc1489)\&. +.RE +.IP "--options \fBfile\fR" 10 +Read options from \fBfile\fR and do not try to read +them from the default options file in the homedir +(see --homedir)\&. This option is ignored if used +in an options file\&. +.IP "--no-options" 10 +Shortcut for "--options /dev/null"\&. This option is +detected before an attempt to open an option file\&. +.IP "--load-extension \fBname\fR" 10 +Load an extension module\&. If \fBname\fR does not +contain a slash it is searched in "/usr/local/lib/gnupg" +See the manual for more information about extensions\&. +.IP "--debug \fBflags\fR" 10 +Set debugging flags\&. All flags are or-ed and \fBflags\fR may +be given in C syntax (e\&.g\&. 0x0042)\&. +.IP "--debug-all" 10 + Set all useful debugging flags\&. +.IP "--status-fd \fBn\fR" 10 +Write special status strings to the file descriptor \fBn\fR\&. +See the file DETAILS in the documentation for a listing of them\&. +.IP "--logger-fd \fBn\fR" 10 +Write log output to file descriptor \fBn\fR and not to stderr\&. +.IP "--no-comment" 10 +Do not write comment packets\&. This option affects only +the generation of secret keys\&. Output of option packets +is disabled since version 0\&.4\&.2\&. +.IP "--comment \fBstring\fR" 10 +Use \fBstring\fR as comment string in clear text signatures\&. +.IP "--default-comment" 10 +Force to write the standard comment string in clear +text signatures\&. Use this to overwrite a --comment +from a config file\&. +.IP "--no-version" 10 +Omit the version string in clear text signatures\&. +.IP "--emit-version" 10 +Force to write the version string in clear text +signatures\&. Use this to overwrite a previous +--no-version from a config file\&. +.IP "-N, --notation-data \fBname=value\fR" 10 +Put the name value pair into the signature as notation data\&. +\fBname\fR must consists only of alphanumeric characters, digits +or the underscore; the first character must not be a digit\&. +\fBvalue\fR may be any printable string; it will encoded in UTF8, +so sou should have check that your --charset is set right\&. +If you prefix \fBname\fR with an exclamation mark, the notation +data will be flagged as critical (rfc2440:5\&.2\&.3\&.15)\&. +.IP "--set-policy-url \fBstring\fR" 10 +Use \fBstring\fR as Policy URL for signatures (rfc2440:5\&.2\&.3\&.19)\&. +If you prefix it with an exclamation mark, the policy URL +packet will be flagged as critical\&. +.IP "--set-filename \fBstring\fR" 10 +Use \fBstring\fR as the name of file which is stored in +messages\&. +.IP "--completes-needed \fBn\fR" 10 +Number of completely trusted users to introduce a new +key signer (defaults to 1)\&. +.IP "--marginals-needed \fBn\fR" 10 +Number of marginally trusted users to introduce a new +key signer (defaults to 3) +.IP "--max-cert-depth \fBn\fR" 10 +Maximum depth of a certification chain (default is 5)\&. +.IP "--cipher-algo \fBname\fR" 10 +Use \fBname\fR as cipher algorithm\&. Running the program +with the command --version yields a list of supported +algorithms\&. If this is not used the cipher algorithm is +selected from the preferences stored with the key\&. +.IP "--digest-algo \fBname\fR" 10 +Use \fBname\fR as message digest algorithm\&. Running the +program with the command --version yields a list of +supported algorithms\&. Please note that using this +option may violate the OpenPGP requirement, that a +160 bit hash is to be used for DSA\&. +.IP "--s2k-cipher-algo \fBname\fR" 10 +Use \fBname\fR as the cipher algorithm used to protect secret +keys\&. The default cipher is BLOWFISH\&. This cipher is +also used for conventional encryption if --cipher-algo +is not given\&. +.IP "--s2k-digest-algo \fBname\fR" 10 +Use \fBname\fR as the digest algorithm used to mangle the +passphrases\&. The default algorithm is RIPE-MD-160\&. +This digest algorithm is also used for conventional +encryption if --digest-algo is not given\&. +.IP "--s2k-mode \fBn\fR" 10 +Selects how passphrases are mangled\&. If \fBn\fR is 0 +a plain passphrase (which is not recommended) will be used, +a 1 (default) adds a salt to the passphrase and +a 3 iterates the whole process a couple of times\&. +Unless --rfc1991 is used, this mode is also used +for conventional encryption\&. +.IP "--compress-algo \fBn\fR" 10 +Use compress algorithm \fBn\fR\&. Default is 2 which is +RFC1950 compression\&. You may use 1 to use the old zlib +version which is used by PGP\&. The default algorithm may +give better results because the window size is not limited +to 8K\&. If this is not used the OpenPGP behavior is used, +i\&.e\&. the compression algorithm is selected from the +preferences; note, that this can\&'t be done if you do +not encrypt the data\&. +.IP "--throw-keyid" 10 +Do not put the keyid into encrypted packets\&. This option +hides the receiver of the message and is a countermeasure +against traffic analysis\&. It may slow down the decryption +process because all available secret keys are tried\&. +.IP "--not-dash-escaped" 10 +This option changes the behavior of cleartext signatures +so that they can be used for patch files\&. You should not +send such an armored file via email because all spaces +and line endings are hashed too\&. You can not use this +option for data which has 5 dashes at the beginning of a +line, patch files don\&'t have this\&. A special armor header +line tells GnuPG about this cleartext signature option\&. +.IP "--escape-from-lines" 10 +Because some mailers change lines starting with "From " +to " [--homedir name] [--options file] [options] command [args] - -=head1 DESCRIPTION - -B is the main program for the GnuPG system. - -=head1 COMMANDS - -B recognizes these commands: - -B<-s>, B<--sign> - Make a signature. This option may be combined - with B<--encrypt>. - -B<--clearsign> - Make a clear text signature. - -B<-b>, B<--detach-sign> - Make a detached signature. - -B<-e>, B<--encrypt> - Encrypt data. This option may be combined with B<--sign>. - -B<-c>, B<--symmetric> - Encrypt with symmetric cipher only - This command asks for a passphrase. - -B<--store> - Store only (make a simple RFC1991 packet). - -B<--decrypt> [I] - Decrypt file (or stdin if no file is specified) and - write it to stdout (or the file specified with - B<--output>). If the decrypted file is signed, the - signature is also verified. This command differs - from the default operation, as it never writes to the - filename which is included in the file and it - rejects files which don't begin with an encrypted - message. - -B<--verify> [[I] {I}] - Assume that I is a signature and verify it - without generating any output. With no arguments, - the signature packet is read from stdin (it may be a - detached signature when not used in batch mode). If - only a sigfile is given, it may be a complete - signature or a detached signature, in which case - the signed stuff is expected in a file without the - I<.sig> or I<.asc> extension (if such a file does - not exist it is expected at stdin - use B<-> as - filename to force a read from stdin). With more than - 1 argument, the first should be a detached signature - and the remaining files are the signed stuff. - -B<-k> [I] [I] - Kludge to be somewhat compatible with PGP. - Without arguments, all public keyrings are listed. - With one argument, only I is listed. - Special combinations are also allowed, but they may - give strange results when combined with more options. - B<-kv> Same as B<-k> - B<-kvv> List the signatures with every key. - B<-kvvv> Additionally check all signatures. - B<-kvc> List fingerprints - B<-kvvc> List fingerprints and signatures - - B - -B<--list-keys> [I] -B<--list-public-keys> [I] - List all keys from the public keyrings, or just the - ones given on the command line. - -B<--list-secret-keys> [I] - List all keys from the secret keyrings, or just the - ones given on the command line. - -B<--list-sigs> [I] - Same as B<--list-keys>, but the signatures are listed - too. - -B<--check-sigs> [I] - Same as B<--list-sigs>, but the signatures are verified. - -B<--fingerprint> [I] - List all keys with their fingerprints. This is the - same output as B but with the additional output - of a line with the fingerprint. May also be combined - with B<--list-sigs> or B<--check-sigs>. - If this command is given twice, the fingerprints of all - secondary keys are listed too. - -B<--list-packets> - List only the sequence of packets. This is mainly - useful for debugging. - -B<--gen-key> - Generate a new key pair. This command can only be - used interactive. - - -B<--edit-key> I - Present a menu which enables you to do all key - related tasks: - B - Make a signature on key of user I. - If the key is not yet signed by the default - user (or the users given with B<-u>), the - program displays the information of the key - again, together with its fingerprint and - asks whether it should be signed. This - question is repeated for all users specified - with B<-u>. - B - Same as B but the signature is marked as - non-exportbale and will therefore never be used - by others. This may be used to make keys valid - only in the local environment. - B - Revoke a signature. GnuPG asks for every - every signature which has been done by one of - teh secret keys, whether a revocation - certificate should be generated. - B - Change the owner trust value. This updates the - trust-db immediately and no save is required. - B - Create an alternate user id. - B - Delete an user id. - B - Add a subkey to this key. - B - Remove a subkey. - B - Revoke a subkey. - B - Change the key expiration time. If a key is - selected, the time of this key will be changed. - With no selection the key expiration of the - primary key is changed. - B - Change the passphrase of the secret key. - B I - Toggle selection of user id with index I. - Use 0 to deselect all. - B I - Toggle selection of subkey with index I. - Use 0 to deselect all. - B - Check all selected user ids. - B - List preferences. - B - Toggle between public and secret key listing. - B - Save all changes to the key rings and quit. - B - Quit the program without updating the - key rings. - The listing shows you the key with its secondary - keys and all user ids. Selected keys or user ids - are indicated by an asterisk. The trust value is - displayed with the primary key: the first is the - assigned owner trust and the second is the calculated - trust value. Letters are used for the values: - B<-> No ownertrust assigned / not yet calculated. - B Trust calculation has failed. - B Not enough information for calculation. - B Never trust this key. - B Marginally trusted. - B Fully trusted. - B Ultimately trusted - - -B<--delete-key> - Remove key from the public keyring - -B<--delete-secret-key> - Remove key from the secret and public keyring - -B<--gen-revoke> - Generate a revocation certificate. - -B<--export> [I] - Either export all keys from all keyrings (default - keyrings and those registered via option B<--keyring>), - or if at least one name is given, those of the given - name. The new keyring is written to F or to - the file given with option "output". Use together - with B<-a> to mail those keys. - -B<--send-keys> [I] - Same as B<--export> but sends the keys to a keyserver. - Option B<--keyserver> must be used to give the name - of this keyserver. Don't send your complete keyring - to a keyserver - select only those keys which are new - or changed by you. - -B<--export-all> [I] - Same as B<--export> but does also export keys which - are not compatible to OpenPGP. - -B<--export-secret-keys> [I] - Same as B<--export>, but does export the secret keys. - This is normally not very useful. - -B<--import>, B<--fast-import> - Import/merge keys. The fast version does not build - the trustdb; this can be done at any time with the - command B<--update-trustdb>. - -B<--recv-keys> I - Import the keys with the given key IDs from a HKP - keyserver. Option B<--keyserver> must be used to - give the name of this keyserver. - -B<--export-ownertrust> - List the assigned ownertrust values in ASCII format - for backup purposes - -B<--import-ownertrust> [I] - Update the trustdb with the ownertrust values stored - in I (or stdin if not given); existing - values will be overwritten. - -=head1 OPTIONS - -Long options can be put in an options file (default F<~/.gnupg/options>). -Do not write the 2 dashes, but simply the name of the option and any -required arguments. Lines with a hash as the first non-white-space -character are ignored. Commands may be put in this file too, but that -does not make sense. - -B recognizes these options: - - -B<-a>, B<--armor> - Create ASCII armored output. - -B<-o> I, B<--output> I - Write output to I. - -B<-u> I, B<--local-user> I - Use I as the user-id to sign. - This option is silently ignored for the list commands, - so that it can be used in an options file. - -B<--default-key> I - Use I as default user-id for signatures. If this - is not used the default user-id is the first user-id - from the secret keyring. - -B<-r> I, B<--recipient> I - Encrypt for user id I. If this option is not - specified, GnuPG asks for the user id. - -B<--encrypt-to> I - Same as B<--recipient> but this one is intended for - in the options file and may be used together with - an own user-id as an "encrypt-to-self". These keys - are only used when there are other recipients given - either by use of --recipient or by the asked user id. - No trust checking is performed for these user ids. - -B<--no-encrypt-to> - Disable the use of all B<--encrypt-to> keys. - -B<-v>, B<--verbose> - Give more information during processing. If used - twice, the input data is listed in detail. - -B<-q>, B<--quiet> - Be somewhat more quiet in some cases. - -B<-z> I - Set compress level to I. A value of 0 for I - disables compression. Default is to use the default - compression level of zlib (normally 6). - -B<-t>, B<--textmode> - Use canonical text mode. If B<-t> (but not - B<--textmode>) is used together with armoring - and signing, this enables clearsigned messages. - This kludge is needed for PGP compatibility; - normally you would use B<--sign> or B<--clearsign> - to selected the type of the signature. - -B<-n>, B<--dry-run> - Don't make any changes (not yet implemented). - -B<-i>, B<--interactive> - Prompt before overwriting any files. - -B<--batch> - Use batch mode. Never ask, do not allow interactive - commands. - -B<--no-batch> - Disable batch mode. This may be used if B - is used in the options file. - -B<--yes> - Assume "yes" on most questions. - -B<--no> - Assume "no" on most questions. - -B<--keyserver> I - Use I to lookup keys which are not yet in - your keyring. This is only done while verifying - messages with signatures. The option is also - required for the command B<--send-keys> to - specify the keyserver to where the keys should - be send. All keyservers synchronize with each - other - so there is no need to send keys to more - than one server. Using the command - "host -l pgp.net | grep wwwkeys" gives you a - list of keyservers. Because there is load - balancing using round-robin-dns you may notice - that you get different key servers. - -B<--keyring> I - Add I to the list of keyrings. - If I begins with a tilde and a slash, these - are replaced by the HOME directory. If the filename - does not contain a slash, it is assumed to be in the - home-directory (F<~/.gnupg> if B<--homedir>) is not used. - The filename may be prefixed with a scheme: - "gnupg-ring:" is the default one. - "gnupg-gdbm:" may be used for a GDBM ring. - It might make sense to use it together with - B<--no-default-keyring>. - -B<--secret-keyring> I - Same as B<--keyring> but for the secret keyrings. - -B<--homedir> I - Set the name of the home directory to I. If this - option is not used it defaults to F<~/.gnupg>. It does - not make sense to use this in a options file. This - also overrides the environment variable C. - -B<--charset> I - Set the name of the native character set. This is used - to convert some strings to proper UTF-8 encoding. - Valid values for I are: - B This is the default. - B The usual Russian set (rfc1489). - -B<--options> I - Read options from I and do not try to read - them from the default options file in the homedir - (see B<--homedir>). This option is ignored when used - in an options file. - -B<--no-options> - Shortcut for B<--options> I. This option is - detected before an attempt to open an option file. - -B<--load-extension> I - Load an extension module. If I does not - contain a slash it is searched in B - See the manual for more information about extensions. - -B<--debug> I - Set debugging flags. All flags are or-ed and I may - be given in C syntax (e.g. 0x0042). - -B<--debug-all> - Set all useful debugging flags. - -B<--status-fd> I - Write special status strings to the file descriptor I. - -B<--logger-fd> I - Write log output to file descriptor I and not to stderr. - -B<--no-comment> - Do not write comment packets. This option affects only - the generation of secret keys. Output of option packets - is disabled since version 0.4.2. - -B<--comment> I - Use I as comment string in clear text signatures. - -B<--set-filename> I - Use I as the name of file which is stored in - messages. - -B<--completes-needed> I - Number of completely trusted users to introduce a new - key signer (defaults to 1). - -B<--marginals-needed> I - Number of marginally trusted users to introduce a new - key signer (defaults to 3) - -B<--max-cert-depth> I - Maximum depth of a certification chain (default is 5). - -B<--cipher-algo> I - Use I as cipher algorithm. Running the program - with the command B<--version> yields a list of supported - algorithms. If this is not used the cipher algorithm is - selected from the preferences stored with the key. - -B<--digest-algo> I - Use I as message digest algorithm. Running the - program with the command B<--version> yields a list of - supported algorithms. Please note that using this - option may violate the OpenPGP requirement, that a - 160 bit hash is to be used for DSA. - -B<--s2k-cipher-algo> I - Use I as the cipher algorithm used to protect secret - keys. The default cipher is BLOWFISH. This cipher is - also used for conventional encryption if B<--cipher-algo> - is not given. - -B<--s2k-digest-algo> I - Use I as the digest algorithm used to mangle the - passphrases. The default algorithm is RIPE-MD-160. - This digest algorithm is also used for conventional - encryption if B<--digest-algo> is not given. - -B<--s2k-mode> I - Selects how passphrases are mangled. A number of I<0> - uses the plain passphrase (which is not recommended), - a I<1> (default) adds a salt to the passphrase and - I<3> iterates the whole process a couple of times. - Unless -B<--rfc1991> is used, this mode is also used - for conventional encryption. - -B<--compress-algo> I - Use compress algorithm I. Default is I<2> which is - RFC1950 compression. You may use I<1> to use the old zlib - version which is used by PGP. The default algorithm may - give better results because the window size is not limited - to 8K. If this is not used the OpenPGP behavior is used, - i.e. the compression algorithm is selected from the - preferences. - -B<--digest-algo> I - Use I as message digest algorithm. Running the - program with the command B<--version> yields a list of - supported algorithms. - - -B<--throw-keyid> - Do not put the keyid into encrypted packets. This option - hides the receiver of the message and is a countermeasure - against traffic analysis. It may slow down the decryption - process because all available secret keys are tried. - -B<--not-dash-escaped> - This option changes the behavior of cleartext signatures - so that they can be used for patch files. You should not - send such an armored file via email because all spaces - and line endings are hashed too. You can not use this - option for data which has 5 dashes at the beginning of a - line, patch files don't have this. A special armor header - line tells GnuPG about this cleartext signature option. - -B<--escape-from-lines> - Because some mailers change lines starting with "From " - to ">From " it is good to handle such lines in a special - way when creating cleartext signatures. All other PGP - versions do it this way too. This option is not enabled - by default because it would violate rfc2440. - -B<--passphrase-fd> I - Read the passphrase from file descriptor I. If you use - 0 for I, the passphrase will be read from stdin. This - can only be used if only one passphrase is supplied. - B - -B<--rfc1991> - Try to be more RFC1991 (PGP 2.x) compliant. - -B<--force-v3-sigs> - OpenPGP states that an implementation should generate - v4 signatures but PGP 5.x recognizes v4 signatures only - on key material. This options forces v3 signatures for - signatures on data. - -B<--force-mdc> - Force the use of encryption with appended manipulation - code. This is always used with the newer cipher (those - with a blocksize greater than 64 bit). - -B<--lock-once> - Lock the file the first time a lock is requested - and do not release the lock until the process - terminates. - -B<--no-verbose> - Reset verbose level to 0. - -B<--no-greeting> - Suppress the initial copyright message but do not - enter batch mode. - -B<--no-armor> - Assume the input data is not in ASCII armored format. - -B<--no-default-keyring> - Do not add the default keyrings to the list of - keyrings. - -B<--skip-verify> - Skip the signature verification step. This may be - used to make the encryption faster if the signature - verification is not needed. - -B<--version> - Print version information along with a list - of supported algorithms. - -B<--with-colons> - Print key listings delimited by colons. - -B<--warranty> - Print warranty information. - -B<-h>, B<--help> - Print usage information. - - -=head1 RETURN VALUE - -The Program returns 0 if everything was fine, 1 if at least -a signature was bad, and other error codes for fatal errors. - -=head1 EXAMPLES - - -se -r Bob [file] sign and encrypt for user Bob - -sat [file] make a clear text signature - -sb [file] make a detached signature - -k [userid] show keys - -kc [userid] show fingerprint - -=head1 ENVIRONMENT - -C Used to locate the default home directory. -C If set directory used instead of F<~/.gnupg>. - -=head1 FILES - -F<~/.gnupg/secring.gpg> The secret keyring -F<~/.gnupg/secring.gpg.lock> and the lock file - -F<~/.gnupg/pubring.gpg> The public keyring -F<~/.gnupg/pubring.gpg.lock> and the lock file - -F<~/.gnupg/trustdb.gpg> The trust database -F<~/.gnupg/trustdb.gpg.lock> and the lock file - -F<~/.gnupg/options> May contain options -F Skeleton file - -F Default location for extensions - -=head1 SEE ALSO - -gpg(1) - - -=head1 WARNINGS - -Use a B password for your user account and a B passphrase -to protect your secret key. This passphrase is the weakest part of the -whole system. Programs to do dictionary attacks on your secret keyring -are very easy to write and so you should protect your B<~/.gnupg/> -directory very well. - -Keep in mind that, if this program is used over a network (telnet), it -is B easy to spy out your passphrase! - -=head1 BUGS - -On many systems this program should be installed as setuid(root). This -is necessary to lock memory pages. If you get no warning message about -insecure memory your OS kernel supports locking without being root. -The program drops root privileges as soon as locked memory is allocated. - diff -urN gnupg-0.9.7/doc/gpg.sgml gnupg-0.9.8/doc/gpg.sgml --- gnupg-0.9.7/doc/gpg.sgml Thu Jan 1 01:00:00 1970 +++ gnupg-0.9.8/doc/gpg.sgml Thu Jun 17 15:43:34 1999 @@ -0,0 +1,1214 @@ + + + + +directory"> +file"> +&ParmFile;"> +files"> +&ParmFiles;"> +names"> +&ParmNames;"> +name"> +&ParmName;"> +key IDs"> +n"> +flags"> +string"> +value"> +name=value"> +]> + + + + gpg + 1 + GNU Tools + + + encryption and signing tool + + + +gpg + --homedir + --options + + command + + + + + + DESCRIPTION + + + + + +COMMANDS + + + + + + +-s, --sign + +Make a signature. This command may be combined +with --encrypt. + + + + +--clearsign + +Make a clear text signature. + + + + +-b, --detach-sign + +Make a detached signature. + + + + +-e, --encrypt + +Encrypt data. This option may be combined with --sign. + + + + +-c, --symmetric + +Encrypt with symmetric cipher only +This command asks for a passphrase. + + + +--store + +Store only (make a simple RFC1991 packet). + + + + +--decrypt &OptParmFile; + +Decrypt &ParmFile; (or stdin if no file is specified) and +write it to stdout (or the file specified with +--output). If the decrypted file is signed, the +signature is also verified. This command differs +from the default operation, as it never writes to the +filename which is included in the file and it +rejects files which don't begin with an encrypted +message. + + + + +--verify + + +Assume that + + + + +--list-keys &OptParmNames; +--list-public-keys &OptParmNames; + +List all keys from the public keyrings, or just the +ones given on the command line. + + + + +--list-secret-keys &OptParmNames; + +List all keys from the secret keyrings, or just the +ones given on the command line. + + + + +--list-sigs &OptParmNames; + +Same as --list-keys, but the signatures are listed too. + + + + +--check-sigs &OptParmNames; + +Same as --list-sigs, but the signatures are verified. + + + + +--fingerprint &OptParmNames; + +List all keys with their fingerprints. This is the +same output as --list-keys but with the additional output +of a line with the fingerprint. May also be combined +with --list-sigs or --check-sigs. +If this command is given twice, the fingerprints of all +secondary keys are listed too. + + + + +--list-packets + +List only the sequence of packets. This is mainly +useful for debugging. + + + + +--gen-key + +Generate a new key pair. This command can only be +used interactive. + + + + +--edit-key &ParmName; + +Present a menu which enables you to do all key +related tasks: + + + + sign + +Make a signature on key of user &ParmName; +If the key is not yet signed by the default +user (or the users given with -u), the +program displays the information of the key +again, together with its fingerprint and +asks whether it should be signed. This +question is repeated for all users specified +with -u. + + lsign + +Same as --sign but the signature is marked as +non-exportbale and will therefore never be used +by others. This may be used to make keys valid +only in the local environment. + + revsig + +Revoke a signature. GnuPG asks for every +every signature which has been done by one of +the secret keys, whether a revocation +certificate should be generated. + + trust + +Change the owner trust value. This updates the +trust-db immediately and no save is required. + + adduid + +Create an alternate user id. + + deluid + +Delete an user id. + + addkey + +Add a subkey to this key. + + delkey + +Remove a subkey. + + revkey + +Revoke a subkey. + + expire + +Change the key expiration time. If a key is +selected, the time of this key will be changed. +With no selection the key expiration of the +primary key is changed. + + passwd + +Change the passphrase of the secret key. + + uid &ParmN; + +Toggle selection of user id with index &ParmN;. +Use 0 to deselect all. + + key &ParmN; + +Toggle selection of subkey with index &ParmN;. +Use 0 to deselect all. + + check + +Check all selected user ids. + + pref + +List preferences. + + toggle + +Toggle between public and secret key listing. + + save + +Save all changes to the key rings and quit. + + quit + +Quit the program without updating the +key rings. + + +The listing shows you the key with its secondary +keys and all user ids. Selected keys or user ids +are indicated by an asterisk. The trust value is +displayed with the primary key: the first is the +assigned owner trust and the second is the calculated +trust value. Letters are used for the values: + + -No ownertrust assigned / not yet calculated. + eTrust calculation has failed. + qNot enough information for calculation. + nNever trust this key. + mMarginally trusted. + fFully trusted. + uUltimately trusted. + + + + + +--delete-key &ParmName; + +Remove key from the public keyring + + + +--delete-secret-key &ParmName; + +Remove key from the secret and public keyring + + + +--gen-revoke + +Generate a revocation certificate for the complete key. To revoke +a subkey or a signature, use the --edit command. + + + + +--export &OptParmNames; + +Either export all keys from all keyrings (default +keyrings and those registered via option --keyring), +or if at least one name is given, those of the given +name. The new keyring is written to stdout or to +the file given with option "output". Use together +with --armor to mail those keys. + + + + +--send-keys &OptParmNames; + +Same as --export but sends the keys to a keyserver. +Option --keyserver must be used to give the name +of this keyserver. Don't send your complete keyring +to a keyserver - select only those keys which are new +or changed by you. + + + + +--export-all &OptParmNames; + +Same as --export, but does also export keys which +are not compatible to OpenPGP. + + + + +--export-secret-keys &OptParmNames; + +Same as --export, but does export the secret keys. +This is normally not very useful and a security risk. + + + + +--import &OptParmFiles; +--fast-import &OptParmFiles; + +Import/merge keys. The fast version does not build +the trustdb; this can be done at any time with the +command --update-trustdb. + + + + +--recv-keys &ParmKeyIDs; + +Import the keys with the given key IDs from a HKP +keyserver. Option --keyserver must be used to +give the name of this keyserver. + + + + +--export-ownertrust + +List the assigned ownertrust values in ASCII format +for backup purposes + + + + +--import-ownertrust &OptParmFiles; + +Update the trustdb with the ownertrust values stored +in &ParmFiles; (or stdin if not given); existing +values will be overwritten. + + + + +--version + +Print version information along with a list +of supported algorithms. + + + + +--warranty + +Print warranty information. + + + + +-h, --help + +Print usage information. This is a really long list even it does list +not all options. + + + + + + + + +OPTIONS + +Long options can be put in an options file (default "~/.gnupg/options"). +Do not write the 2 dashes, but simply the name of the option and any +required arguments. Lines with a hash as the first non-white-space +character are ignored. Commands may be put in this file too, but that +does not make sense. + + + + + + + + +-a, --armor + +Create ASCII armored output. + + + + +-o, --output &ParmFile; + +Write output to &ParmFile;. + + + + +-u, --local-user &ParmName; + +Use &ParmName as the user ID to sign. +This option is silently ignored for the list commands, +so that it can be used in an options file. + + + + +--default-key &ParmName; + +Use &ParmName; as default user ID for signatures. If this +is not used the default user ID is the first user ID +found in the secret keyring. + + + + +-r, --recipient &ParmName; + + +Encrypt for user id &ParmName;. If this option is not +specified, GnuPG asks for the user id. + + + + +--encrypt-to &ParmName; + +Same as --recipient but this one is intended for +in the options file and may be used together with +an own user-id as an "encrypt-to-self". These keys +are only used when there are other recipients given +either by use of --recipient or by the asked user id. +No trust checking is performed for these user ids. + + + + +--no-encrypt-to + +Disable the use of all --encrypt-to keys. + + + + +-v, --verbose + +Give more information during processing. If used +twice, the input data is listed in detail. + + + + +-q, --quiet + +Try to be as quiet as possible. + + + + +-z &ParmN; + +Set compression level to &ParmN;. A value of 0 for &ParmN; +disables compression. Default is to use the default +compression level of zlib (normally 6). + + + + +-t, --textmode + +Use canonical text mode. If -t (but not +--textmode) is used together with armoring +and signing, this enables clearsigned messages. +This kludge is needed for PGP compatibility; +normally you would use --sign or --clearsign +to selected the type of the signature. + + + + +-n, --dry-run + +Don't make any changes (this is not completely implemented). + + + + +-i, --interactive + +Prompt before overwriting any files. + + + + +--batch + +Use batch mode. Never ask, do not allow interactive +commands. + + + + +--no-batch + +Disable batch mode. This may be of use if --batch +is enabled from an options file. + + + + +--yes + +Assume "yes" on most questions. + + + + +--no + + Assume "no" on most questions. + + + + +--keyserver &ParmName; + +Use &ParmName to lookup keys which are not yet in +your keyring. This is only done while verifying +messages with signatures. The option is also +required for the command --send-keys to +specify the keyserver to where the keys should +be send. All keyservers synchronize with each +other - so there is no need to send keys to more +than one server. Using the command +"host -l pgp.net | grep wwwkeys" gives you a +list of keyservers. Because there is load +balancing using round-robin DNS you may notice +that you get different key servers. + + + + +--keyring &ParmFile; + +Add &ParmFile to the list of keyrings. +If &ParmFile begins with a tilde and a slash, these +are replaced by the HOME directory. If the filename +does not contain a slash, it is assumed to be in the +home-directory ("~/.gnupg" if --homedir is not used). +The filename may be prefixed with a scheme: +"gnupg-ring:" is the default one. +"gnupg-gdbm:" may be used for a GDBM ring. +It might make sense to use it together with --no-default-keyring. + + + + +--secret-keyring &ParmFile; + +Same as --keyring but for the secret keyrings. + + + + +--homedir &ParmDir; + +Set the name of the home directory to &ParmDir; If this +option is not used it defaults to "~/.gnupg". It does +not make sense to use this in a options file. This +also overrides the environment variable "GNUPGHOME". + + + + +--charset &ParmName; + +Set the name of the native character set. This is used +to convert some strings to proper UTF-8 encoding. +Valid values for &ParmName; are: + + +iso-8859-1This is the default Latin 1 set. + + +iso-8859-2The Latin 2 set. + + +koi8-rThe usual Russian set (rfc1489). + + + + + + +--options &ParmFile; + +Read options from &ParmFile; and do not try to read +them from the default options file in the homedir +(see --homedir). This option is ignored if used +in an options file. + + + + +--no-options + +Shortcut for "--options /dev/null". This option is +detected before an attempt to open an option file. + + + + +--load-extension &ParmName; + +Load an extension module. If &ParmName; does not +contain a slash it is searched in "/usr/local/lib/gnupg" +See the manual for more information about extensions. + + + + +--debug &ParmFlags; + +Set debugging flags. All flags are or-ed and &ParmFlags; may +be given in C syntax (e.g. 0x0042). + + + + +--debug-all + + Set all useful debugging flags. + + + + +--status-fd &ParmN; + +Write special status strings to the file descriptor &ParmN;. +See the file DETAILS in the documentation for a listing of them. + + + + +--logger-fd &ParmN; + +Write log output to file descriptor &ParmN; and not to stderr. + + + + +--no-comment + +Do not write comment packets. This option affects only +the generation of secret keys. Output of option packets +is disabled since version 0.4.2. + + + + +--comment &ParmString; + +Use &ParmString; as comment string in clear text signatures. + + + + +--default-comment + +Force to write the standard comment string in clear +text signatures. Use this to overwrite a --comment +from a config file. + + + + +--no-version + +Omit the version string in clear text signatures. + + + + +--emit-version + +Force to write the version string in clear text +signatures. Use this to overwrite a previous +--no-version from a config file. + + + + +-N, --notation-data &ParmNameValue; + +Put the name value pair into the signature as notation data. +&ParmName; must consists only of alphanumeric characters, digits +or the underscore; the first character must not be a digit. +&ParmValue; may be any printable string; it will encoded in UTF8, +so sou should have check that your --charset is set right. +If you prefix &ParmName; with an exclamation mark, the notation +data will be flagged as critical (rfc2440:5.2.3.15). + + + + +--set-policy-url &ParmString; + +Use &ParmString; as Policy URL for signatures (rfc2440:5.2.3.19). +If you prefix it with an exclamation mark, the policy URL +packet will be flagged as critical. + + + + +--set-filename &ParmString; + +Use &ParmString; as the name of file which is stored in +messages. + + + + +--completes-needed &ParmN; + +Number of completely trusted users to introduce a new +key signer (defaults to 1). + + + + +--marginals-needed &ParmN; + +Number of marginally trusted users to introduce a new +key signer (defaults to 3) + + + + +--max-cert-depth &ParmN; + +Maximum depth of a certification chain (default is 5). + + + + +--cipher-algo &ParmName; + +Use &ParmName; as cipher algorithm. Running the program +with the command --version yields a list of supported +algorithms. If this is not used the cipher algorithm is +selected from the preferences stored with the key. + + + + +--digest-algo &ParmName; + +Use &ParmName; as message digest algorithm. Running the +program with the command --version yields a list of +supported algorithms. Please note that using this +option may violate the OpenPGP requirement, that a +160 bit hash is to be used for DSA. + + + + +--s2k-cipher-algo &ParmName; + +Use &ParmName; as the cipher algorithm used to protect secret +keys. The default cipher is BLOWFISH. This cipher is +also used for conventional encryption if --cipher-algo +is not given. + + + + +--s2k-digest-algo &ParmName; + +Use &ParmName; as the digest algorithm used to mangle the +passphrases. The default algorithm is RIPE-MD-160. +This digest algorithm is also used for conventional +encryption if --digest-algo is not given. + + + + +--s2k-mode &ParmN; + +Selects how passphrases are mangled. If &ParmN; is 0 +a plain passphrase (which is not recommended) will be used, +a 1 (default) adds a salt to the passphrase and +a 3 iterates the whole process a couple of times. +Unless --rfc1991 is used, this mode is also used +for conventional encryption. + + + + +--compress-algo &ParmN; + +Use compress algorithm &ParmN;. Default is 2 which is +RFC1950 compression. You may use 1 to use the old zlib +version which is used by PGP. The default algorithm may +give better results because the window size is not limited +to 8K. If this is not used the OpenPGP behavior is used, +i.e. the compression algorithm is selected from the +preferences; note, that this can't be done if you do +not encrypt the data. + + + + +--throw-keyid + +Do not put the keyid into encrypted packets. This option +hides the receiver of the message and is a countermeasure +against traffic analysis. It may slow down the decryption +process because all available secret keys are tried. + + + + +--not-dash-escaped + +This option changes the behavior of cleartext signatures +so that they can be used for patch files. You should not +send such an armored file via email because all spaces +and line endings are hashed too. You can not use this +option for data which has 5 dashes at the beginning of a +line, patch files don't have this. A special armor header +line tells GnuPG about this cleartext signature option. + + + + +--escape-from-lines + +Because some mailers change lines starting with "From " +to "<From " it is good to handle such lines in a special +way when creating cleartext signatures. All other PGP +versions do it this way too. This option is not enabled +by default because it would violate rfc2440. + + + + +--passphrase-fd &ParmN; + +Read the passphrase from file descriptor &ParmN;. If you use +0 for &ParmN;, the passphrase will be read from stdin. This +can only be used if only one passphrase is supplied. + +Don't use this option if you can avoid it. + + + + +--rfc1991 + +Try to be more RFC1991 (PGP 2.x) compliant. + + + + +--openpgp + +Reset all packet, cipher and digest options to OpenPGP +behavior. Use this option to reset all previous +options like --rfc1991, --force-v3-sigs, --s2k-*, +--cipher-algo, --digest-algo and --compress-algo to +OpenPGP compliant values. + + + + +--force-v3-sigs + +OpenPGP states that an implementation should generate +v4 signatures but PGP 5.x recognizes v4 signatures only +on key material. This options forces v3 signatures for +signatures on data. + + + + +--force-mdc + +Force the use of encryption with appended manipulation +code. This is always used with the newer cipher (those +with a blocksize greater than 64 bit). + + + + +--lock-once + +Lock the databases the first time a lock is requested +and do not release the lock until the process +terminates. + + + + +--lock-multiple + +Release the locks every time a lock is no longer +needed. Use this to override a previous --lock-once +from a config file. + + + + +--no-verbose + +Reset verbose level to 0. + + + + +--no-greeting + +Suppress the initial copyright message but do not +enter batch mode. + + + + +--no-armor + +Assume the input data is not in ASCII armored format. + + + + +--no-default-keyring + +Do not add the default keyrings to the list of +keyrings. + + + + +--skip-verify + +Skip the signature verification step. This may be +used to make the encryption faster if the signature +verification is not needed. + + + + +--with-colons + +Print key listings delimited by colons. + + + + +--with-key-data + +Print key listings delimited by colons and print the public key data. + + + + + + + RETURN VALUE + +The program returns 0 if everything was fine, 1 if at least +a signature was bad, and other error codes for fatal errors. + + + + + EXAMPLES + + + +gpg -se -r +sign and encrypt for user Bob + + + +gpg --clearsign &ParmFile; +make a clear text signature + + + +gpg -sb &ParmFile; +make a detached signature + + + +gpg --list-keys +show keys + + + +gpg --fingerprint +show fingerprint + + + + + + + + ENVIRONMENT + + + +HOME +Used to locate the default home directory. + + +GNUPGHOME +If set directory used instead of "~/.gnupg". + + + + + + + FILES + + + +~/.gnupg/secring.gpg +The secret keyring + + + +~/.gnupg/secring.gpg.lock +and the lock file + + + +~/.gnupg/pubring.gpg +The public keyring + + + +~/.gnupg/pubring.gpg.lock +and the lock file + + + +~/.gnupg/trustdb.gpg +The trust database + + + +~/.gnupg/trustdb.gpg.lock +and the lock file + + + +~/.gnupg/options +May contain options + + + +/usr[/local]/share/gnupg/options.skel +Skeleton options file + + + +/usr[/local]/lib/gnupg/ +Default location for extensions + + + + + + + + + WARNINGS + +Use a *good* password for your user account and a *good* passphrase +to protect your secret key. This passphrase is the weakest part of the +whole system. Programs to do dictionary attacks on your secret keyring +are very easy to write and so you should protect your "~/.gnupg/" +directory very well. + + +Keep in mind that, if this program is used over a network (telnet), it +is *very* easy to spy out your passphrase! + + + + + + BUGS + +On many systems this program should be installed as setuid(root). This +is necessary to lock memory pages. Locking memory pages prevents the +operating system from writing memory pages to disk. If you get no +warning message about insecure memory your operating system supports +locking without being root. The program drops root privileges as soon +as locked memory is allocated. + + + + + diff -urN gnupg-0.9.7/g10/ChangeLog gnupg-0.9.8/g10/ChangeLog --- gnupg-0.9.7/g10/ChangeLog Sun May 23 14:20:27 1999 +++ gnupg-0.9.8/g10/ChangeLog Sat Jun 26 12:16:00 1999 @@ -1,3 +1,96 @@ +Sat Jun 26 12:15:59 CEST 1999 Werner Koch + + + * dearmor.c (enarmor_file): Fixed comment string. + * tdbdump.c (export_ownertrust): Text fix. + * tbio.c (tdbio_invalid): Ditto. + + * parse-packet.c (parse_key): Made temp buffer larger. + + * Makefile.am (install-data-local): Add missing backslashes + +Tue Jun 15 12:21:08 CEST 1999 Werner Koch + + * g10.c (main): Made iterated+salted the default S2K method. + + * Makefile.am (install-data-local): Use DESTDIR. + + * passphrase.c (passphrase_to_dek): Emit missing-passphrase while in + batchmode. + + * parse-packet.c (parse_pubkeyenc): Fixed a SEGV. + +Mon Jun 14 21:18:54 CEST 1999 Michael Roth + + * g10.c: New options --openpgp, --no-tty, --emit-version, + --default-comment and --lock-multiple + +Thu Jun 10 14:18:23 CEST 1999 Werner Koch + + * free-packet.c (free_encrypted): Fixed EOF case (Remi). + (free_plaintext): Ditto. + + * helptext.c (keyedit.delsig.unknown): New (Remi). + * keyedit.c (print_and_check_one_sig): Add arg print_without_key and + changed all callers to make use of it (Remi): + +Tue Jun 8 13:36:25 CEST 1999 Werner Koch + + * keylist.c (print_key_data): New and called elsewhere. + * g10.c: New option --with-key-data + +Wed Jun 2 14:17:19 CEST 1999 Werner Koch + + * mainproc.c (proc_tree): Yet another bad hack to cope with + broken pgp2 created detached messages in textmode. + +Tue Jun 1 16:01:46 CEST 1999 Werner Koch + + * openfile.c (make_outfile_name): New. + * plaintext.c (handle_plaintext): Outputfile is now the inputfile + without the suffix. + * g10.c: New option --use-embedded-filename + +Mon May 31 19:41:10 CEST 1999 Werner Koch + + * g10.c (main): Fix for SHM init (Michael). + + * compress.c, encr-data.c, mdfilter.c, + plaintext.c, free-packet.c: Speed patches (RИmi). + +Thu May 27 09:40:55 CEST 1999 Werner Koch + + * status.c (cpr_get_answer_yes_no_quit): New. + * keyedit.c (menu_delsig): New. + (check_all_keysigs): Splitted. + (print_and_check_one_sig): New. + +Wed May 26 14:36:29 CEST 1999 Werner Koch + + * build-packet.c (build_sig_subpkt): Support large packets. + * parse-packet.c (enum_sig_subpkt): Replaces parse_sig_subpkt. + * mainproc.c (print_notation_data): Print all notation packets. + * g10.c (add_notation_data): Add a way to specify the critical flag. + (main): Add option --set-policy-url. + (check_policy_url): Basic checks. + * sign.c (mk_notation_and_policy): Replaces mk_notation. + + * parse-packet.c (can_handle_critical): Moved decision whether we can + handle critical subpacket to an extra function. + +Tue May 25 19:50:32 CEST 1999 Werner Koch + + * sign.c (sign_file): Always use compression algo 1 for signed + onyl file becuase we can╢ be sure the the verifier supports other + algorithms. + + * build-packet.c (build_sig_subpkt): Support for notation data. + * sign.c (sign_file,clearsign_file,make_keysig_packet): Ditto. + (mk_notation): New. + * g10.c (add_notation_data): New and add option -N + * mainproc.c (print_notation_data): New. + (check_sig_and_print): Print any notation data of the signed text. + Sun May 23 14:20:22 CEST 1999 Werner Koch * pkclist.c (check_signatures_trust): Print a warning and return diff -urN gnupg-0.9.7/g10/Makefile.am gnupg-0.9.8/g10/Makefile.am --- gnupg-0.9.7/g10/Makefile.am Thu May 6 14:57:01 1999 +++ gnupg-0.9.8/g10/Makefile.am Fri Jun 25 17:51:12 1999 @@ -82,11 +82,12 @@ install-data-local: - $(mkinstalldirs) $(pkgdatadir) - $(INSTALL_DATA) $(srcdir)/options.skel $(pkgdatadir)/options.skel + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(INSTALL_DATA) $(srcdir)/options.skel \ + $(DESTDIR)$(pkgdatadir)/options.skel @set -e;\ - if test -f $(bindir)/gpgm ; then \ - rm $(bindir)/gpgm ; ln -s gpg $(bindir)/gpgm ; \ + if test -f $(DESTDIR)$(bindir)/gpgm ; then \ + echo "removing obsolete gpgm binary" ; \ + rm $(DESTDIR)$(bindir)/gpgm ; \ fi - diff -urN gnupg-0.9.7/g10/Makefile.in gnupg-0.9.8/g10/Makefile.in --- gnupg-0.9.7/g10/Makefile.in Sun May 23 20:02:42 1999 +++ gnupg-0.9.8/g10/Makefile.in Sat Jun 26 13:07:22 1999 @@ -70,6 +70,7 @@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@ DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ @@ -275,8 +276,8 @@ ../include/iobuf.h ../include/types.h ../include/memory.h \ ../include/util.h ../include/mpi.h filter.h ../include/cipher.h \ ../include/../cipher/random.h packet.h options.h main.h keydb.h -comment.o: comment.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +comment.o: comment.c ../config.h ../g10defs.h options.h \ + ../include/types.h packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ ../include/util.h main.h keydb.h @@ -289,19 +290,19 @@ ../include/iobuf.h ../include/types.h ../include/memory.h \ ../include/util.h ../include/mpi.h filter.h ../include/cipher.h \ ../include/../cipher/random.h packet.h options.h main.h keydb.h -decrypt.o: decrypt.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +decrypt.o: decrypt.c ../config.h ../g10defs.h options.h \ + ../include/types.h packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h main.h ../include/i18n.h -delkey.o: delkey.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +delkey.o: delkey.c ../config.h ../g10defs.h options.h ../include/types.h \ + packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h main.h trustdb.h ../include/ttyio.h \ status.h ../include/i18n.h -encode.o: encode.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +encode.o: encode.c ../config.h ../g10defs.h options.h ../include/types.h \ + packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h main.h trustdb.h ../include/i18n.h @@ -310,8 +311,8 @@ ../include/iobuf.h ../include/memory.h packet.h \ ../include/cipher.h ../include/../cipher/random.h filter.h \ options.h ../include/i18n.h -export.o: export.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +export.o: export.c ../config.h ../g10defs.h options.h ../include/types.h \ + packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h main.h ../include/i18n.h @@ -341,8 +342,8 @@ ../include/i18n.h options.h filter.h ../include/cipher.h \ ../include/../cipher/random.h ../include/http.h main.h keydb.h \ packet.h -import.o: import.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +import.o: import.c ../config.h ../g10defs.h options.h ../include/types.h \ + packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h trustdb.h main.h ../include/i18n.h @@ -351,8 +352,8 @@ ../include/iobuf.h ../include/memory.h packet.h \ ../include/cipher.h ../include/../cipher/random.h filter.h \ keydb.h -keyedit.o: keyedit.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +keyedit.o: keyedit.c ../config.h ../g10defs.h options.h \ + ../include/types.h packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h main.h trustdb.h ../include/ttyio.h \ @@ -368,8 +369,8 @@ ../include/iobuf.h ../include/memory.h main.h \ ../include/cipher.h ../include/../cipher/random.h keydb.h \ packet.h filter.h options.h -keylist.o: keylist.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +keylist.o: keylist.c ../config.h ../g10defs.h options.h \ + ../include/types.h packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h trustdb.h main.h ../include/i18n.h @@ -405,8 +406,8 @@ ../include/ttyio.h ../include/cipher.h \ ../include/../cipher/random.h keydb.h packet.h filter.h main.h \ ../include/i18n.h status.h -pkclist.o: pkclist.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +pkclist.o: pkclist.c ../config.h ../g10defs.h options.h \ + ../include/types.h packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h trustdb.h ../include/ttyio.h status.h \ @@ -421,8 +422,8 @@ ../include/iobuf.h ../include/memory.h packet.h \ ../include/cipher.h ../include/../cipher/random.h filter.h \ keydb.h trustdb.h status.h options.h ../include/i18n.h -revoke.o: revoke.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +revoke.o: revoke.c ../config.h ../g10defs.h options.h ../include/types.h \ + packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h main.h ../include/ttyio.h status.h \ @@ -448,19 +449,19 @@ ../include/iobuf.h ../include/memory.h packet.h \ ../include/cipher.h ../include/../cipher/random.h filter.h \ keydb.h main.h status.h ../include/i18n.h -sign.o: sign.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +sign.o: sign.c ../config.h ../g10defs.h options.h ../include/types.h \ + packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h main.h ../include/ttyio.h trustdb.h \ ../include/i18n.h -signal.o: signal.c ../config.h ../g10defs.h options.h \ +signal.o: signal.c ../config.h ../g10defs.h options.h ../include/types.h \ ../include/errors.h ../include/memory.h ../include/util.h \ - ../include/types.h ../include/mpi.h ../include/iobuf.h main.h \ - ../include/cipher.h ../include/../cipher/random.h keydb.h \ - packet.h filter.h ../include/ttyio.h -skclist.o: skclist.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ + ../include/mpi.h ../include/iobuf.h main.h ../include/cipher.h \ + ../include/../cipher/random.h keydb.h packet.h filter.h \ + ../include/ttyio.h +skclist.o: skclist.c ../config.h ../g10defs.h options.h \ + ../include/types.h packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h ../include/i18n.h @@ -492,8 +493,8 @@ ../include/../cipher/random.h filter.h ../include/util.h \ trustdb.h options.h main.h ../include/i18n.h tdbio.h \ ../include/host2net.h ../include/ttyio.h -verify.o: verify.c ../config.h ../g10defs.h options.h packet.h \ - ../include/types.h ../include/iobuf.h ../include/mpi.h \ +verify.o: verify.c ../config.h ../g10defs.h options.h ../include/types.h \ + packet.h ../include/iobuf.h ../include/mpi.h \ ../include/memory.h ../include/cipher.h \ ../include/../cipher/random.h filter.h ../include/errors.h \ keydb.h ../include/util.h main.h ../include/ttyio.h \ @@ -573,11 +574,13 @@ $(PROGRAMS): $(needed_libs) install-data-local: - $(mkinstalldirs) $(pkgdatadir) - $(INSTALL_DATA) $(srcdir)/options.skel $(pkgdatadir)/options.skel + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(INSTALL_DATA) $(srcdir)/options.skel \ + $(DESTDIR)$(pkgdatadir)/options.skel @set -e;\ - if test -f $(bindir)/gpgm ; then \ - rm $(bindir)/gpgm ; ln -s gpg $(bindir)/gpgm ; \ + if test -f $(DESTDIR)$(bindir)/gpgm ; then \ + echo "removing obsolete gpgm binary" ; \ + rm $(DESTDIR)$(bindir)/gpgm ; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN gnupg-0.9.7/g10/build-packet.c gnupg-0.9.8/g10/build-packet.c --- gnupg-0.9.7/g10/build-packet.c Mon May 17 12:26:03 1999 +++ gnupg-0.9.8/g10/build-packet.c Mon May 31 19:36:07 1999 @@ -622,21 +622,29 @@ { byte *data; - size_t hlen, dlen; - int found, hashed, realloced; + size_t hlen, dlen, nlen; + int found=0; + int critical, hashed, realloced; size_t n, n0; - if( (data = find_subpkt( sig->hashed_data, type, &hlen, &dlen )) ) + critical = (type & SIGSUBPKT_FLAG_CRITICAL); + type &= ~SIGSUBPKT_FLAG_CRITICAL; + + if( type == SIGSUBPKT_NOTATION ) + ; /* we allow multiple packets */ + else if( (data = find_subpkt( sig->hashed_data, type, &hlen, &dlen )) ) found = 1; else if( (data = find_subpkt( sig->unhashed_data, type, &hlen, &dlen ))) found = 2; - else - found = 0; if( found ) log_bug("build_sig_packet: update nyi\n"); - if( buflen+1 >= 192 ) - log_bug("build_sig_packet: long subpackets are nyi\n"); + if( (buflen+1) >= 8384 ) + nlen = 5; + else if( (buflen+1) >= 192 ) + nlen = 2; + else + nlen = 1; switch( type ) { case SIGSUBPKT_SIG_CREATED: @@ -646,6 +654,8 @@ case SIGSUBPKT_PREF_COMPR: case SIGSUBPKT_KS_FLAGS: case SIGSUBPKT_KEY_EXPIRE: + case SIGSUBPKT_NOTATION: + case SIGSUBPKT_POLICY: hashed = 1; break; default: hashed = 0; break; } @@ -653,7 +663,7 @@ if( hashed ) { n0 = sig->hashed_data ? ((*sig->hashed_data << 8) | sig->hashed_data[1]) : 0; - n = n0 + 1 + 1 + buflen; /* length, type, buffer */ + n = n0 + nlen + 1 + buflen; /* length, type, buffer */ realloced = !!sig->hashed_data; data = sig->hashed_data ? m_realloc( sig->hashed_data, n+2 ) : m_alloc( n+2 ); @@ -661,17 +671,37 @@ else { n0 = sig->unhashed_data ? ((*sig->unhashed_data << 8) | sig->unhashed_data[1]) : 0; - n = n0 + 1 + 1 + buflen; /* length, type, buffer */ + n = n0 + nlen + 1 + buflen; /* length, type, buffer */ realloced = !!sig->unhashed_data; data = sig->unhashed_data ? m_realloc( sig->unhashed_data, n+2 ) : m_alloc( n+2 ); } + if( critical ) + type |= SIGSUBPKT_FLAG_CRITICAL; + data[0] = (n >> 8) & 0xff; data[1] = n & 0xff; - data[n0+2] = buflen+1; - data[n0+3] = type; - memcpy(data+n0+4, buffer, buflen ); + if( nlen == 5 ) { + data[n0+2] = 255; + data[n0+3] = (buflen+1) >> 24; + data[n0+4] = (buflen+1) >> 16; + data[n0+5] = (buflen+1) >> 8; + data[n0+6] = (buflen+1); + data[n0+7] = type; + memcpy(data+n0+8, buffer, buflen ); + } + else if( nlen == 2 ) { + data[n0+2] = (buflen+1-192) / 256 + 192; + data[n0+3] = (buflen+1-192) & 256; + data[n0+4] = type; + memcpy(data+n0+5, buffer, buflen ); + } + else { + data[n0+2] = buflen+1; + data[n0+3] = type; + memcpy(data+n0+4, buffer, buflen ); + } if( hashed ) { if( !realloced ) @@ -684,7 +714,6 @@ sig->unhashed_data = data; } } - /**************** * Put all the required stuff from SIG into subpackets of sig. diff -urN gnupg-0.9.7/g10/compress.c gnupg-0.9.8/g10/compress.c --- gnupg-0.9.7/g10/compress.c Fri Apr 23 17:02:16 1999 +++ gnupg-0.9.8/g10/compress.c Mon May 31 19:16:41 1999 @@ -132,8 +132,7 @@ int zrc; int rc=0; size_t n; - byte *p; - int c; + int nread, count; int refill = !zs->avail_in; if( DBG_FILTER ) @@ -145,16 +144,17 @@ n = zs->avail_in; if( !n ) zs->next_in = zfx->inbuf; - for( p=zfx->inbuf+n; n < zfx->inbufsize; n++, p++ ) { - if( (c=iobuf_get(a)) == -1 ) { - /* If we use the undocumented feature to suppress - * the zlib header, we have to give inflate an - * extra dummy byte to read */ - if( zfx->algo != 1 || zfx->algo1hack ) - break; - zfx->algo1hack = 1; - } - *p = c & 0xff; + count = zfx->inbufsize - n; + nread = iobuf_read( a, zfx->inbuf + n, count ); + if( nread == -1 ) nread = 0; + n += nread; + /* If we use the undocumented feature to suppress + * the zlib header, we have to give inflate an + * extra dummy byte to read */ + if( nread < count && zfx->algo == 1 ) { + *(zfx->inbuf + n) = 0xFF; /* is it really needed ? */ + zfx->algo1hack = 1; + n++; } zs->avail_in = n; } diff -urN gnupg-0.9.7/g10/dearmor.c gnupg-0.9.8/g10/dearmor.c --- gnupg-0.9.7/g10/dearmor.c Sat Mar 20 12:40:43 1999 +++ gnupg-0.9.8/g10/dearmor.c Fri Jun 25 17:16:31 1999 @@ -103,7 +103,7 @@ goto leave; afx.what = 4; - afx.hdrlines = "Comment: Use \"gpgm --dearmor\" for unpacking\n"; + afx.hdrlines = "Comment: Use \"gpg --dearmor\" for unpacking\n"; iobuf_push_filter( out, armor_filter, &afx ); while( (c = iobuf_get(inp)) != -1 ) diff -urN gnupg-0.9.7/g10/encode.c gnupg-0.9.8/g10/encode.c --- gnupg-0.9.7/g10/encode.c Tue May 11 08:14:42 1999 +++ gnupg-0.9.8/g10/encode.c Mon Jun 14 08:34:14 1999 @@ -405,6 +405,20 @@ enc->pubkey_algo = pk->pubkey_algo; keyid_from_pk( pk, enc->keyid ); enc->throw_keyid = opt.throw_keyid; + + /* Okay, what's going on: We have the session key somewhere in + * the structure DEK and want to encode this session key in + * an integer value of n bits. pubkey_nbits gives us the + * number of bits we have to use. We then encode the session + * key in some way and we get it back in the big intger value + * FRAME. Then we use FRAME, the public key PK->PKEY and the + * algorithm number PK->PUBKEY_ALGO and pass it to pubkey_encrypt + * which returns the encrypted value in the array ENC->DATA. + * This array has a size which depends on the used algorithm + * (e.g. 2 for ElGamal). We don't need frame anymore because we + * have everything now in enc->data which is the passed to + * build_packet() + */ frame = encode_session_key( dek, pubkey_nbits( pk->pubkey_algo, pk->pkey ) ); rc = pubkey_encrypt( pk->pubkey_algo, enc->data, frame, pk->pkey ); diff -urN gnupg-0.9.7/g10/encr-data.c gnupg-0.9.8/g10/encr-data.c --- gnupg-0.9.7/g10/encr-data.c Tue May 11 08:25:13 1999 +++ gnupg-0.9.8/g10/encr-data.c Mon May 31 19:16:41 1999 @@ -217,16 +217,11 @@ decode_filter_ctx_t *fc = opaque; size_t n, size = *ret_len; int rc = 0; - int c; if( control == IOBUFCTRL_UNDERFLOW ) { assert(a); - for(n=0; n < size; n++ ) { - if( (c = iobuf_get(a)) == -1 ) - break; - buf[n] = c; - } - + n = iobuf_read( a, buf, size ); + if( n == -1 ) n = 0; if( n ) cipher_decrypt( fc->cipher_hd, buf, buf, n); else diff -urN gnupg-0.9.7/g10/free-packet.c gnupg-0.9.8/g10/free-packet.c --- gnupg-0.9.7/g10/free-packet.c Sat May 8 18:42:14 1999 +++ gnupg-0.9.8/g10/free-packet.c Thu Jun 10 13:03:23 1999 @@ -229,7 +229,7 @@ if( zd->buf ) { /* have to skip some bytes */ /* don't have any information about the length, so * we assume this is the last packet */ - while( iobuf_get(zd->buf) != -1 ) + while( iobuf_read( zd->buf, NULL, 1<<30 ) != -1 ) ; } m_free(zd); @@ -240,12 +240,17 @@ { if( ed->buf ) { /* have to skip some bytes */ if( iobuf_in_block_mode(ed->buf) ) { - while( iobuf_get(ed->buf) != -1 ) + while( iobuf_read( ed->buf, NULL, 1<<30 ) != -1 ) ; } else { - for( ; ed->len; ed->len-- ) /* skip the packet */ - iobuf_get(ed->buf); + while( ed->len ) { /* skip the packet */ + int n = iobuf_read( ed->buf, NULL, ed->len ); + if( n == -1 ) + ed->len = 0; + else + ed->len -= n; + } } } m_free(ed); @@ -257,12 +262,17 @@ { if( pt->buf ) { /* have to skip some bytes */ if( iobuf_in_block_mode(pt->buf) ) { - while( iobuf_get(pt->buf) != -1 ) + while( iobuf_read( pt->buf, NULL, 1<<30 ) != -1 ) ; } else { - for( ; pt->len; pt->len-- ) /* skip the packet */ - iobuf_get(pt->buf); + while( pt->len ) { /* skip the packet */ + int n = iobuf_read( pt->buf, NULL, pt->len ); + if( n == -1 ) + pt->len = 0; + else + pt->len -= n; + } } } m_free(pt); diff -urN gnupg-0.9.7/g10/g10.c gnupg-0.9.8/g10/g10.c --- gnupg-0.9.7/g10/g10.c Sun May 23 09:03:12 1999 +++ gnupg-0.9.8/g10/g10.c Tue Jun 15 11:47:39 1999 @@ -63,6 +63,7 @@ oUser = 'u', oVerbose = 'v', oCompress = 'z', + oNotation = 'N', oBatch = 500, aClearsign, aStore, @@ -115,11 +116,13 @@ oStatusFD, oNoComment, oNoVersion, + oEmitVersion, oCompletesNeeded, oMarginalsNeeded, oMaxCertDepth, oLoadExtension, oRFC1991, + oOpenPGP, oCipherAlgo, oDigestAlgo, oCompressAlgo, @@ -131,10 +134,12 @@ oNoArmor, oNoDefKeyring, oNoGreeting, + oNoTTY, oNoOptions, oNoBatch, oHomedir, oWithColons, + oWithKeyData, oSkipVerify, oCompressKeys, oCompressSigs, @@ -142,7 +147,10 @@ oEmuChecksumBug, oRunAsShmCP, oSetFilename, + oSetPolicyURL, + oUseEmbeddedFilename, oComment, + oDefaultComment, oThrowKeyid, oForceV3Sigs, oForceMDC, @@ -153,6 +161,7 @@ oNotDashEscaped, oEscapeFrom, oLockOnce, + oLockMultiple, oKeyServer, oEncryptTo, oNoEncryptTo, @@ -222,6 +231,7 @@ { oOutput, "output", 2, N_("use as output file")}, { oVerbose, "verbose", 0, N_("verbose") }, { oQuiet, "quiet", 0, N_("be somewhat more quiet") }, + { oNoTTY, "no-tty", 0, N_("don't use the terminal at all") }, { oForceV3Sigs, "force-v3-sigs", 0, N_("force v3 signatures") }, { oForceMDC, "force-mdc", 0, N_("always use a MDC for encryption") }, { oDryRun, "dry-run", 0, N_("do not make any changes") }, @@ -245,6 +255,7 @@ { oMaxCertDepth, "max-cert-depth", 1, "@" }, { oLoadExtension, "load-extension" ,2, N_("|FILE|load extension module FILE")}, { oRFC1991, "rfc1991", 0, N_("emulate the mode described in RFC1991")}, + { oOpenPGP, "openpgp", 0, N_("set all packet, cipher and digest options to OpenPGP behavior")}, { oS2KMode, "s2k-mode", 1, N_("|N|use passphrase mode N")}, { oS2KDigest, "s2k-digest-algo",2, N_("|NAME|use message digest algorithm NAME for passphrases")}, @@ -254,6 +265,7 @@ { oDigestAlgo, "digest-algo", 2 , N_("|NAME|use message digest algorithm NAME")}, { oCompressAlgo, "compress-algo", 1 , N_("|N|use compress algorithm N")}, { oThrowKeyid, "throw-keyid", 0, N_("throw keyid field of encrypted packets")}, + { oNotation, "notation-data", 2, N_("|NAME=VALUE|use this notation data")}, { 302, NULL, 0, N_("@\nExamples:\n\n" " -se -r Bob [file] sign and encrypt for user Bob\n" @@ -281,6 +293,7 @@ { oHomedir, "homedir", 2, "@" }, /* defaults to "~/.gnupg" */ { oNoBatch, "no-batch", 0, "@" }, { oWithColons, "with-colons", 0, "@"}, + { oWithKeyData,"with-key-data", 0, "@"}, { aListKeys, "list-key", 0, "@" }, /* alias */ { aListSigs, "list-sig", 0, "@" }, /* alias */ { aCheckKeys, "check-sig",0, "@" }, /* alias */ @@ -291,12 +304,17 @@ { oEmuChecksumBug, "emulate-checksum-bug", 0, "@"}, { oRunAsShmCP, "run-as-shm-coprocess", 4, "@" }, { oSetFilename, "set-filename", 2, "@" }, + { oSetPolicyURL, "set-policy-url", 2, "@" }, { oComment, "comment", 2, "@" }, - { oNoVersion, "no-version", 0, "@"}, + { oDefaultComment, "default-comment", 0, "@" }, + { oNoVersion, "no-version", 0, "@"}, + { oEmitVersion, "emit-version", 0, "@"}, { oNotDashEscaped, "not-dash-escaped", 0, "@" }, { oEscapeFrom, "escape-from-lines", 0, "@" }, { oLockOnce, "lock-once", 0, "@" }, + { oLockMultiple, "lock-multiple", 0, "@" }, { oLoggerFD, "logger-fd",1, "@" }, + { oUseEmbeddedFilename, "use-embedded-filename", 0, "@" }, {0} }; @@ -312,6 +330,8 @@ enum cmd_and_opt_values new_cmd ); static void print_hex( byte *p, size_t n ); static void print_mds( const char *fname, int algo ); +static void add_notation_data( const char *string ); +static int check_policy_url( const char *s ); const char * strusage( int level ) @@ -503,11 +523,11 @@ create_dotlock(NULL); /* register locking cleanup */ i18n_init(); opt.compress = -1; /* defaults to standard compress level */ - /* fixme: set the next two to zero and decide where used */ + /* note: if you change these lines, look at oOpenPGP */ opt.def_cipher_algo = 0; opt.def_digest_algo = 0; opt.def_compress_algo = 2; - opt.s2k_mode = 1; /* salted */ + opt.s2k_mode = 3; /* iterated+salted */ opt.s2k_digest_algo = DIGEST_ALGO_RMD160; opt.s2k_cipher_algo = CIPHER_ALGO_BLOWFISH; opt.completes_needed = 1; @@ -548,6 +568,11 @@ opt.shm_coprocess = 1; requested_shm_size = pargs.r.ret_ulong; } + else if ( pargs.r_opt == oStatusFD ) { + /* this is needed to ensure that the status-fd filedescriptor is + * initialized when init_shm_coprocessing() is called */ + set_status_fd( pargs.r.ret_int ); + } #endif } @@ -640,6 +665,7 @@ case oArmor: opt.armor = 1; opt.no_armor=0; break; case oOutput: opt.outfile = pargs.r.ret_str; break; case oQuiet: opt.quiet = 1; break; + case oNoTTY: opt.quiet = 1; tty_no_terminal(1); break; case oDryRun: opt.dry_run = 1; break; case oInteractive: opt.interactive = 1; break; case oVerbose: g10_opt_verbose++; @@ -672,6 +698,7 @@ case oQuickRandom: quick_random_gen(1); break; case oNoComment: opt.no_comment=1; break; case oNoVersion: opt.no_version=1; break; + case oEmitVersion: opt.no_version=0; break; case oCompletesNeeded: opt.completes_needed = pargs.r.ret_int; break; case oMarginalsNeeded: opt.marginals_needed = pargs.r.ret_int; break; case oMaxCertDepth: opt.max_cert_depth = pargs.r.ret_int; break; @@ -680,6 +707,7 @@ case oNoOptions: break; /* no-options */ case oHomedir: opt.homedir = pargs.r.ret_str; break; case oNoBatch: opt.batch = 0; break; + case oWithKeyData: opt.with_key_data=1; /* fall thru */ case oWithColons: opt.with_colons=':'; break; case oSkipVerify: opt.skip_verify=1; break; @@ -696,6 +724,20 @@ opt.no_comment = 1; opt.escape_from = 1; break; + case oOpenPGP: + opt.rfc1991 = 0; + opt.escape_from = 0; + opt.force_v3_sigs = 0; + opt.compress_keys = 0; /* not mandated but we do it */ + opt.compress_sigs = 0; /* ditto. */ + opt.not_dash_escaped = 0; + opt.def_cipher_algo = 0; + opt.def_digest_algo = 0; + opt.def_compress_algo = 2; + opt.s2k_mode = 3; /* iterated+salted */ + opt.s2k_digest_algo = DIGEST_ALGO_RMD160; + opt.s2k_cipher_algo = CIPHER_ALGO_BLOWFISH; + break; case oEmuChecksumBug: opt.emulate_bugs |= EMUBUG_GPGCHKSUM; break; case oCompressSigs: opt.compress_sigs = 1; break; case oRunAsShmCP: @@ -706,7 +748,10 @@ #endif break; case oSetFilename: opt.set_filename = pargs.r.ret_str; break; + case oSetPolicyURL: opt.set_policy_url = pargs.r.ret_str; break; + case oUseEmbeddedFilename: opt.use_embedded_filename = 1; break; case oComment: opt.comment_string = pargs.r.ret_str; break; + case oDefaultComment: opt.comment_string = NULL; break; case oThrowKeyid: opt.throw_keyid = 1; break; case oForceV3Sigs: opt.force_v3_sigs = 1; break; case oForceMDC: opt.force_mdc = 1; break; @@ -740,7 +785,9 @@ case oNotDashEscaped: opt.not_dash_escaped = 1; break; case oEscapeFrom: opt.escape_from = 1; break; case oLockOnce: opt.lock_once = 1; break; + case oLockMultiple: opt.lock_once = 0; break; case oKeyServer: opt.keyserver_name = pargs.r.ret_str; break; + case oNotation: add_notation_data( pargs.r.ret_str ); break; default : pargs.err = configfp? 1:2; break; } @@ -797,6 +844,10 @@ if( check_digest_algo(opt.s2k_digest_algo) ) log_error(_("selected digest algorithm is invalid\n")); } + if( opt.set_policy_url ) { + if( check_policy_url( opt.set_policy_url ) ) + log_error(_("the given policy URL is invalid\n")); + } if( opt.def_compress_algo < 1 || opt.def_compress_algo > 2 ) log_error(_("compress algorithm must be in range %d..%d\n"), 1, 2); if( opt.completes_needed < 1 ) @@ -1380,5 +1431,81 @@ if( fp != stdin ) fclose(fp); +} + + +/**************** + * Check the supplied name,value string and add it to the notation + * data to be used for signatures. + */ +static void +add_notation_data( const char *string ) +{ + const char *s; + const char *s2; + STRLIST sl; + int critical=0; + int highbit=0; + + if( *string == '!' ) { + critical = 1; + string++; + } + s = string; + + if( !*s || (*s & 0x80) || (!isalpha(*s) && *s != '_') ) { + log_error(_("the first character of a notation name " + "must be a letter or an underscore\n") ); + return; + } + for(s++; *s != '='; s++ ) { + if( !*s || (*s & 0x80) || (!isalnum(*s) && *s != '_' && *s != '.' ) ) { + log_error(_("a notation name must have only letters, " + "digits, dots or underscores and end with an '='\n") ); + return; + } + } + if( s[-1] == '.' || ((s2=strstr(string, "..")) && s2 < s ) ) { + log_error(_("dots in a notation name must be surrounded " + "by other characters\n") ); + return; + } + /* we do only support printabe text - therefore we enforce the use + * of only printable characters (an empty value is valid) */ + for( s++; *s ; s++ ) { + if( iscntrl(*s) ) { + log_error(_("a notation value must not use " + "any control characters\n") ); + return; + } + else if( *s & 0x80 ) + highbit = 1; + } + + if( highbit ) { /* must use UTF8 encoding */ + char *p = native_to_utf8( string ); + sl = add_to_strlist( &opt.notation_data, p ); + m_free( p ); + } + else + sl = add_to_strlist( &opt.notation_data, string ); + + if( critical ) + sl->flags |= 1; +} + + +static int +check_policy_url( const char *s ) +{ + if( *s == '!' ) + s++; + if( !*s ) + return -1; + for(; *s ; s++ ) { + if( (*s & 0x80) || iscntrl(*s) ) + return -1; + } + return 0; } diff -urN gnupg-0.9.7/g10/helptext.c gnupg-0.9.8/g10/helptext.c --- gnupg-0.9.7/g10/helptext.c Sat Mar 20 12:40:43 1999 +++ gnupg-0.9.8/g10/helptext.c Thu Jun 10 12:57:11 1999 @@ -172,6 +172,31 @@ "Answer \"yes\" if it is okay to delete the subkey" }, + +{ N_("keyedit.delsig.valid"), + "This is a valid signature on the key; you normally don't want\n" + "to delete this signature may be important to establish a trust\n" + "connection to the key or another key certified by this key." +}, +{ N_("keyedit.delsig.unknown"), + "This signature can't be checked because you don't have the\n" + "corresponding key. You should postpone its deletion until you\n" + "know which key was used because this signing key might establish" + "a trust connection through another already certified key." +}, +{ N_("keyedit.delsig.invalid"), + "The signature is not valid. It does make sense to remove it from\n" + "your keyring." +}, +{ N_("keyedit.delsig.selfsig"), + "This is a signature which binds the user ID to the key. It is\n" + "usually not a good idea to remove such a signature. Actually\n" + "GnuPG might not be able to use this key anymore. So do this\n" + "only if this self-signature is for some reason not valid and\n" + "a second one is available." +}, + + { N_("passphrase.enter"), "" "Please enter the passhrase; this is a secret sentence \n" diff -urN gnupg-0.9.7/g10/import.c gnupg-0.9.8/g10/import.c --- gnupg-0.9.7/g10/import.c Sat May 22 22:09:48 1999 +++ gnupg-0.9.8/g10/import.c Wed May 26 08:16:55 1999 @@ -376,10 +376,10 @@ log_info( _("writing to `%s'\n"), keyblock_resource_name(&kbpos) ); if( (rc=lock_keyblock( &kbpos )) ) - log_error(_("can't lock keyring `%': %s\n"), + log_error(_("can't lock keyring `%s': %s\n"), keyblock_resource_name(&kbpos), g10_errstr(rc) ); else if( (rc=insert_keyblock( &kbpos, keyblock )) ) - log_error( _("error writing keyring `%': %s\n"), + log_error( _("error writing keyring `%s': %s\n"), keyblock_resource_name(&kbpos), g10_errstr(rc) ); unlock_keyblock( &kbpos ); /* we are ready */ @@ -432,7 +432,7 @@ mod_key = 1; /* keyblock_orig has been updated; write */ if( (rc=lock_keyblock( &kbpos )) ) - log_error( _("can't lock keyring `%': %s\n"), + log_error( _("can't lock keyring `%s': %s\n"), keyblock_resource_name(&kbpos), g10_errstr(rc) ); else if( (rc=update_keyblock( &kbpos, keyblock_orig )) ) log_error( _("error writing keyring `%s': %s\n"), diff -urN gnupg-0.9.7/g10/keyedit.c gnupg-0.9.8/g10/keyedit.c --- gnupg-0.9.7/g10/keyedit.c Sat May 22 18:09:11 1999 +++ gnupg-0.9.8/g10/keyedit.c Thu Jun 17 11:13:18 1999 @@ -47,6 +47,7 @@ static void show_fingerprint( PKT_public_key *pk ); static int menu_adduid( KBNODE keyblock, KBNODE sec_keyblock ); static void menu_deluid( KBNODE pub_keyblock, KBNODE sec_keyblock ); +static int menu_delsig( KBNODE pub_keyblock ); static void menu_delkey( KBNODE pub_keyblock, KBNODE sec_keyblock ); static int menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock ); static int menu_select_uid( KBNODE keyblock, int idx ); @@ -104,6 +105,68 @@ /**************** + * Print information about a signature, chek it and return true + * if the signature is okay. NODE must be a signature packet. + */ +static int +print_and_check_one_sig( KBNODE keyblock, KBNODE node, + int *inv_sigs, int *no_key, int *oth_err, + int *is_selfsig, int print_without_key ) +{ + PKT_signature *sig = node->pkt->pkt.signature; + int rc, sigrc; + int is_rev = sig->sig_class == 0x30; + + switch( (rc = check_key_signature( keyblock, node, is_selfsig)) ) { + case 0: + node->flag &= ~(NODFLG_BADSIG|NODFLG_NOKEY|NODFLG_SIGERR); + sigrc = '!'; + break; + case G10ERR_BAD_SIGN: + node->flag = NODFLG_BADSIG; + sigrc = '-'; + if( inv_sigs ) + ++*inv_sigs; + break; + case G10ERR_NO_PUBKEY: + node->flag = NODFLG_NOKEY; + sigrc = '?'; + if( no_key ) + ++*no_key; + break; + default: + node->flag = NODFLG_SIGERR; + sigrc = '%'; + if( oth_err ) + ++*oth_err; + break; + } + if( sigrc != '?' || print_without_key ) { + tty_printf("%s%c %08lX %s ", + is_rev? "rev":"sig", + sigrc, sig->keyid[1], datestr_from_sig(sig)); + if( sigrc == '%' ) + tty_printf("[%s] ", g10_errstr(rc) ); + else if( sigrc == '?' ) + ; + else if( *is_selfsig ) { + tty_printf( is_rev? _("[revocation]") + : _("[self-signature]") ); + } + else { + size_t n; + char *p = get_user_id( sig->keyid, &n ); + tty_print_string( p, n > 40? 40 : n ); + m_free(p); + } + tty_printf("\n"); + } + return (sigrc == '!'); +} + + + +/**************** * Check the keysigs and set the flags to indicate errors. * Returns true if error found. */ @@ -112,7 +175,6 @@ { KBNODE kbctx; KBNODE node; - int rc; int inv_sigs = 0; int no_key = 0; int oth_err = 0; @@ -140,54 +202,14 @@ else if( selected && node->pkt->pkttype == PKT_SIGNATURE && ( (node->pkt->pkt.signature->sig_class&~3) == 0x10 || node->pkt->pkt.signature->sig_class == 0x30 ) ) { - PKT_signature *sig = node->pkt->pkt.signature; - int sigrc, selfsig; - int is_rev = sig->sig_class == 0x30; + int selfsig; - switch( (rc = check_key_signature( keyblock, node, &selfsig)) ) { - case 0: - node->flag &= ~(NODFLG_BADSIG|NODFLG_NOKEY|NODFLG_SIGERR); - sigrc = '!'; - break; - case G10ERR_BAD_SIGN: - node->flag = NODFLG_BADSIG; - sigrc = '-'; - inv_sigs++; - break; - case G10ERR_NO_PUBKEY: - node->flag = NODFLG_NOKEY; - sigrc = '?'; - no_key++; - break; - default: - node->flag = NODFLG_SIGERR; - sigrc = '%'; - oth_err++; - break; - } - if( sigrc != '?' ) { - tty_printf("%s%c %08lX %s ", - is_rev? "rev":"sig", - sigrc, sig->keyid[1], datestr_from_sig(sig)); - if( sigrc == '%' ) - tty_printf("[%s] ", g10_errstr(rc) ); - else if( sigrc == '?' ) - ; - else if( selfsig ) { - tty_printf( is_rev? _("[revocation]") - : _("[self-signature]") ); - if( sigrc == '!' ) - has_selfsig = 1; - } - else { - size_t n; - char *p = get_user_id( sig->keyid, &n ); - tty_print_string( p, n > 40? 40 : n ); - m_free(p); - } - tty_printf("\n"); - /* fixme: Should we update the trustdb here */ + if( print_and_check_one_sig( keyblock, node, &inv_sigs, + &no_key, &oth_err, &selfsig, 0 ) ) { + if( selfsig ) + has_selfsig = 1; } + /* Hmmm: should we update the trustdb here? */ } } if( !has_selfsig ) @@ -525,7 +547,7 @@ { enum cmdids { cmdNONE = 0, cmdQUIT, cmdHELP, cmdFPR, cmdLIST, cmdSELUID, cmdCHECK, cmdSIGN, - cmdLSIGN, cmdREVSIG, cmdREVKEY, + cmdLSIGN, cmdREVSIG, cmdREVKEY, cmdDELSIG, cmdDEBUG, cmdSAVE, cmdADDUID, cmdDELUID, cmdADDKEY, cmdDELKEY, cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF, cmdEXPIRE, cmdNOP }; @@ -554,6 +576,7 @@ { N_("deluid") , cmdDELUID , 0, N_("delete user id") }, { N_("addkey") , cmdADDKEY , 1, N_("add a secondary key") }, { N_("delkey") , cmdDELKEY , 0, N_("delete a secondary key") }, + { N_("delsig") , cmdDELSIG , 0, N_("delete signatures") }, { N_("expire") , cmdEXPIRE , 1, N_("change the expire date") }, { N_("toggle") , cmdTOGGLE , 1, N_("toggle between secret " "and public key listing") }, @@ -805,11 +828,26 @@ } break; + case cmdDELSIG: { + int n1; + + if( !(n1=count_selected_uids(keyblock)) ) + tty_printf(_("You must select at least one user id.\n")); + else if( menu_delsig( keyblock ) ) { + /* no redisplay here, because it may scroll away some + * status output of delsig */ + modified = 1; + } + } + break; + case cmdADDKEY: + secmem_dump_stats(); if( generate_subkeypair( keyblock, sec_keyblock ) ) { redisplay = 1; sec_modified = modified = 1; } + secmem_dump_stats(); break; @@ -1227,6 +1265,70 @@ } +static int +menu_delsig( KBNODE pub_keyblock ) +{ + KBNODE node; + PKT_user_id *uid = NULL; + int changed=0; + + for( node = pub_keyblock; node; node = node->next ) { + if( node->pkt->pkttype == PKT_USER_ID ) { + uid = (node->flag & NODFLG_SELUID)? node->pkt->pkt.user_id : NULL; + } + else if( uid && node->pkt->pkttype == PKT_SIGNATURE ) { + int okay, valid, selfsig, inv_sig, no_key, other_err; + + tty_printf("uid "); + tty_print_string( uid->name, uid->len ); + tty_printf("\n"); + + okay = inv_sig = no_key = other_err = 0; + valid = print_and_check_one_sig( pub_keyblock, node, + &inv_sig, &no_key, &other_err, + &selfsig, 1 ); + + if( valid ) + okay = cpr_get_answer_yes_no_quit( + "keyedit.delsig.valid", + _("Delete this good signature? (y/N/q)")); + else if( inv_sig || other_err ) + okay = cpr_get_answer_yes_no_quit( + "keyedit.delsig.invalid", + _("Delete this invalid signature? (y/N/q)")); + else if( no_key ) + okay = cpr_get_answer_yes_no_quit( + "keyedit.delsig.unknown", + _("Delete this unknown signature? (y/N/q)")); + + if( okay == -1 ) + break; + if( okay && selfsig && !cpr_get_answer_is_yes( + "keyedit.delsig.selfsig", + _("Really delete this self-signature? (y/N)") )) + okay = 0; + if( okay ) { + delete_kbnode( node ); + changed++; + } + + } + else if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) + uid = NULL; + } + + if( changed ) { + commit_kbnode( &pub_keyblock ); + tty_printf( changed == 1? _("Deleted %d signature.\n") + : _("Deleted %d signatures.\n"), changed ); + } + else + tty_printf( _("Nothing deleted.\n") ); + + return changed; +} + + /**************** * Remove some of the secondary keys */ @@ -1300,9 +1402,9 @@ return 0; } else if( n1 ) - tty_printf(_("Changing exiration time for a secondary key.\n")); + tty_printf(_("Changing expiration time for a secondary key.\n")); else { - tty_printf(_("Changing exiration time for the primary key.\n")); + tty_printf(_("Changing expiration time for the primary key.\n")); mainkey=1; } diff -urN gnupg-0.9.7/g10/keygen.c gnupg-0.9.8/g10/keygen.c --- gnupg-0.9.7/g10/keygen.c Wed Apr 7 16:27:29 1999 +++ gnupg-0.9.8/g10/keygen.c Wed Jun 16 19:51:32 1999 @@ -800,7 +800,7 @@ /**************** - * Generate a new user id packet, or return NULL if cancelled + * Generate a new user id packet, or return NULL if canceled */ PKT_user_id * generate_user_id() @@ -856,7 +856,7 @@ expire = ask_expire_interval(); uid = ask_user_id(0); if( !uid ) { - log_error(_("Key generation cancelled.\n")); + log_error(_("Key generation canceled.\n")); return; } dek = ask_passphrase( &s2k ); diff -urN gnupg-0.9.7/g10/keylist.c gnupg-0.9.8/g10/keylist.c --- gnupg-0.9.7/g10/keylist.c Tue Apr 27 17:34:15 1999 +++ gnupg-0.9.8/g10/keylist.c Tue Jun 8 12:01:15 1999 @@ -152,6 +152,20 @@ } } +static void +print_key_data( PKT_public_key *pk, u32 *keyid ) +{ + int n = pubkey_get_npkey( pk->pubkey_algo ); + int i; + + for(i=0; i < n; i++ ) { + printf("pkd:%d:%u:", i, mpi_get_nbits( pk->pkey[i] ) ); + mpi_print(stdout, pk->pkey[i], 1 ); + putchar(':'); + putchar('\n'); + } +} + static void list_keyblock( KBNODE keyblock, int secret ) @@ -249,6 +263,8 @@ if( !any ) { if( opt.fingerprint ) fingerprint( pk, sk ); + if( opt.with_key_data ) + print_key_data( pk, keyid ); any = 1; } } @@ -289,6 +305,8 @@ datestr_from_pk( pk2 ) ); if( opt.fingerprint > 1 ) fingerprint( pk2, NULL ); + if( opt.with_key_data ) + print_key_data( pk2, keyid2 ); } else if( node->pkt->pkttype == PKT_SECRET_SUBKEY ) { u32 keyid2[2]; diff -urN gnupg-0.9.7/g10/main.h gnupg-0.9.8/g10/main.h --- gnupg-0.9.7/g10/main.h Sat May 22 18:16:59 1999 +++ gnupg-0.9.8/g10/main.h Tue Jun 1 14:54:18 1999 @@ -96,6 +96,7 @@ /*-- openfile.c --*/ int overwrite_filep( const char *fname ); +char *make_outfile_name( const char *iname ); int open_outfile( const char *iname, int mode, IOBUF *a ); IOBUF open_sigfile( const char *iname ); void copy_options_file( const char *destdir ); diff -urN gnupg-0.9.7/g10/mainproc.c gnupg-0.9.8/g10/mainproc.c --- gnupg-0.9.7/g10/mainproc.c Fri May 21 17:17:47 1999 +++ gnupg-0.9.8/g10/mainproc.c Wed Jun 2 13:37:08 1999 @@ -492,6 +492,45 @@ putchar('\n'); } +static void +print_notation_data( PKT_signature *sig ) +{ + size_t n, n1, n2; + const byte *p; + int seq = 0; + + while( (p = enum_sig_subpkt( sig->hashed_data, SIGSUBPKT_NOTATION, + &n, &seq )) ) { + if( n < 8 ) { + log_info(_("WARNING: invalid notation data found\n")); + return; + } + if( !(*p & 0x80) ) + return; /* not human readable */ + n1 = (p[4] << 8) | p[5]; + n2 = (p[6] << 8) | p[7]; + p += 8; + if( 8+n1+n2 != n ) { + log_info(_("WARNING: invalid notation data found\n")); + return; + } + log_info(_("Notation: ") ); + print_string( log_stream(), p, n1, 0 ); + putc( '=', log_stream() ); + print_string( log_stream(), p+n1, n2, 0 ); + putc( '\n', log_stream() ); + } + if( (p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_POLICY, &n ) )) { + log_info(_("Policy: ") ); + print_string( log_stream(), p, n, 0 ); + putc( '\n', log_stream() ); + } + + /* Now check wheter the key of this signature has some + * notation data */ + + /* TODO */ +} /**************** * List the certificate in a user friendly way @@ -935,7 +974,8 @@ fputs("[?]\"\n", log_stream() ); } release_kbnode( keyblock ); - + if( !rc ) + print_notation_data( sig ); if( !rc && is_status_enabled() ) { /* print a status response with the fingerprint */ @@ -1040,10 +1080,23 @@ /* enable a workaround for a pgp2 bug */ c->mfx.md2 = md_open( DIGEST_ALGO_MD5, 0 ); } + #if 0 + #warning md_start_debug enabled + md_start_debug( c->mfx.md, "det1" ); + if( c->mfx.md2 ) + md_start_debug( c->mfx.md2, "det2" ); + #endif + /* Here we have another hack to work around a pgp 2 bug + * It works by not using the textmode for detached signatures; + * this will let the first signazure check (on md) fail + * but the second one (on md2) which adds an extra CR should + * then produce the "correct" hash. This is very, very ugly + * hack but it may help in some cases (and break others) + */ if( c->sigs_only ) rc = hash_datafiles( c->mfx.md, c->mfx.md2, c->signed_data, c->sigfilename, - sig->sig_class == 0x01 ); + c->mfx.md2? 0 :(sig->sig_class == 0x01) ); else rc = ask_for_detached_datafile( &c->mfx, iobuf_get_fname(c->iobuf)); diff -urN gnupg-0.9.7/g10/mdfilter.c gnupg-0.9.8/g10/mdfilter.c --- gnupg-0.9.7/g10/mdfilter.c Wed May 19 14:42:41 1999 +++ gnupg-0.9.8/g10/mdfilter.c Mon May 31 19:16:41 1999 @@ -42,17 +42,13 @@ { size_t size = *ret_len; md_filter_context_t *mfx = opaque; - int i, c, rc=0; + int i, rc=0; if( control == IOBUFCTRL_UNDERFLOW ) { if( mfx->maxbuf_size && size > mfx->maxbuf_size ) size = mfx->maxbuf_size; - for(i=0; i < size; i++ ) { - if( (c = iobuf_get(a)) == -1 ) - break; - buf[i] = c; - } - + i = iobuf_read( a, buf, size ); + if( i == -1 ) i = 0; if( i ) { md_write(mfx->md, buf, i ); if( mfx->md2 ) diff -urN gnupg-0.9.7/g10/openfile.c gnupg-0.9.8/g10/openfile.c --- gnupg-0.9.7/g10/openfile.c Sun May 23 13:21:05 1999 +++ gnupg-0.9.8/g10/openfile.c Tue Jun 1 15:17:45 1999 @@ -71,6 +71,36 @@ /**************** + * Strip know extensions from iname and return a newly allocated + * filename. Return NULL if we can't do that. + */ +char * +make_outfile_name( const char *iname ) +{ + size_t n; + + if( (!iname || (*iname=='-' && !iname[1]) )) + return m_strdup("-"); + + #ifdef HAVE_DRIVE_LETTERS + #warning add case insensitive compare + #endif + n = strlen(iname); + if( n > 4 && ( !strcmp(iname+n-4,".gpg") + || !strcmp(iname+n-4,".sig") + || !strcmp(iname+n-4,".asc") ) ) { + char *buf = m_strdup( iname ); + buf[n-4] = 0; + return buf; + } + + log_error(_("%s: unknown suffix\n"), iname ); + return NULL; +} + + + +/**************** * Make an output filename for the inputfile INAME. * Returns an IOBUF and an errorcode * Mode 0 = use ".gpg" @@ -108,6 +138,7 @@ mode==2 ? ".sig" : ".gpg"); name = buf; } + if( overwrite_filep( name ) ) { if( !(*a = iobuf_create( name )) ) { log_error(_("%s: can't create: %s\n"), name, strerror(errno) ); @@ -122,6 +153,7 @@ } return rc; } + /**************** diff -urN gnupg-0.9.7/g10/options.h gnupg-0.9.8/g10/options.h --- gnupg-0.9.7/g10/options.h Tue May 18 08:30:02 1999 +++ gnupg-0.9.8/g10/options.h Tue Jun 8 11:50:54 1999 @@ -20,6 +20,7 @@ #ifndef G10_OPTIONS_H #define G10_OPTIONS_H +#include #undef ENABLE_COMMENT_PACKETS /* don't create comment packets */ @@ -38,6 +39,7 @@ int answer_no; /* answer no on most questions */ int check_sigs; /* check key signatures */ int with_colons; + int with_key_data; int fingerprint; /* list fingerprints */ int list_sigs; /* list signatures */ int no_armor; @@ -73,6 +75,9 @@ const char *keyserver_name; int no_encrypt_to; int interactive; + STRLIST notation_data; + const char *set_policy_url; + int use_embedded_filename; } opt; diff -urN gnupg-0.9.7/g10/packet.h gnupg-0.9.8/g10/packet.h --- gnupg-0.9.7/g10/packet.h Tue May 11 08:08:17 1999 +++ gnupg-0.9.8/g10/packet.h Wed May 26 10:04:11 1999 @@ -231,7 +231,9 @@ SIGSUBPKT_POLICY =26, /* policy URL */ SIGSUBPKT_KEY_FLAGS =27, /* key flags */ SIGSUBPKT_SIGNERS_UID =28, /* signer's user id */ - SIGSUBPKT_PRIV_ADD_SIG =101 /* signatur is also valid for this uid */ + SIGSUBPKT_PRIV_ADD_SIG =101,/* signatur is also valid for this uid */ + + SIGSUBPKT_FLAG_CRITICAL=128 } sigsubpkttype_t; @@ -264,8 +266,10 @@ int skip_some_packets( IOBUF inp, unsigned n ); #endif -const byte *parse_sig_subpkt( const byte *buffer, - sigsubpkttype_t reqtype, size_t *ret_n ); +const byte *enum_sig_subpkt( const byte *buffer, sigsubpkttype_t reqtype, + size_t *ret_n, int *start ); +const byte *parse_sig_subpkt( const byte *buffer, sigsubpkttype_t reqtype, + size_t *ret_n ); const byte *parse_sig_subpkt2( PKT_signature *sig, sigsubpkttype_t reqtype, size_t *ret_n ); diff -urN gnupg-0.9.7/g10/parse-packet.c gnupg-0.9.8/g10/parse-packet.c --- gnupg-0.9.7/g10/parse-packet.c Mon May 17 12:27:39 1999 +++ gnupg-0.9.8/g10/parse-packet.c Fri Jun 25 17:26:36 1999 @@ -640,7 +640,7 @@ int i, ndata; PKT_pubkey_enc *k; - k = packet->pkt.pubkey_enc = m_alloc(sizeof *packet->pkt.pubkey_enc ); + k = packet->pkt.pubkey_enc = m_alloc_clear(sizeof *packet->pkt.pubkey_enc); if( pktlen < 12 ) { log_error("packet(%d) too short\n", pkttype); goto leave; @@ -745,7 +745,28 @@ (ulong)buffer_to_u32(buffer+4) ); break; case SIGSUBPKT_NOTATION: - p = "notation data"; + { + fputs("notation: ", stdout ); + if( length < 8 ) + p = "[too short]"; + else if( !(*buffer & 0x80) ) + p = "[not human readable]"; + else { + const byte *s = buffer; + size_t n1, n2; + + n1 = (s[4] << 8) | s[5]; + n2 = (s[6] << 8) | s[7]; + s += 8; + if( 8+n1+n2 != length ) + p = "[error]"; + else { + print_string( stdout, s, n1, ')' ); + putc( '=', stdout ); + print_string( stdout, s+n1, n2, ')' ); + } + } + } break; case SIGSUBPKT_PREF_HASH: fputs("pref-hash-algos:", stdout ); @@ -767,7 +788,8 @@ p = "primary user id"; break; case SIGSUBPKT_POLICY: - p = "policy URL"; + fputs("policy: ", stdout ); + print_string( stdout, buffer, length, ')' ); break; case SIGSUBPKT_KEY_FLAGS: p = "key flags"; @@ -808,9 +830,14 @@ if( n < 8 ) break; return 0; + case SIGSUBPKT_NOTATION: + if( n < 8 ) /* minimum length needed */ + break; + return 0; case SIGSUBPKT_PREF_SYM: case SIGSUBPKT_PREF_HASH: case SIGSUBPKT_PREF_COMPR: + case SIGSUBPKT_POLICY: return 0; case SIGSUBPKT_PRIV_ADD_SIG: /* because we use private data, we check the GNUPG marker */ @@ -824,16 +851,46 @@ return -3; } + +static int +can_handle_critical( const byte *buffer, size_t n, int type ) +{ + switch( type ) { + case SIGSUBPKT_NOTATION: + if( n >= 8 && (*buffer & 0x80) ) + return 1; /* human readable is handled */ + return 0; + + case SIGSUBPKT_SIG_CREATED: + case SIGSUBPKT_SIG_EXPIRE: + case SIGSUBPKT_KEY_EXPIRE: + case SIGSUBPKT_EXPORTABLE: + case SIGSUBPKT_ISSUER:/* issuer key ID */ + case SIGSUBPKT_PREF_SYM: + case SIGSUBPKT_PREF_HASH: + case SIGSUBPKT_PREF_COMPR: + return 1; + + case SIGSUBPKT_POLICY: /* Is enough to show the policy? */ + default: + return 0; + } +} + + const byte * -parse_sig_subpkt( const byte *buffer, sigsubpkttype_t reqtype, size_t *ret_n ) +enum_sig_subpkt( const byte *buffer, sigsubpkttype_t reqtype, + size_t *ret_n, int *start ) { int buflen; int type; int critical; int offset; size_t n; + int seq = 0; + int reqseq = start? *start: 0; - if( !buffer ) + if( !buffer || reqseq == -1 ) return NULL; buflen = (*buffer << 8) | buffer[1]; buffer += 2; @@ -864,13 +921,17 @@ } else critical = 0; - if( reqtype == SIGSUBPKT_TEST_CRITICAL ) { + if( !(++seq > reqseq) ) + ; + else if( reqtype == SIGSUBPKT_TEST_CRITICAL ) { if( critical ) { if( n-1 > buflen+1 ) goto too_short; - if( parse_one_sig_subpkt(buffer+1, n-1, type ) < 0 ) { + if( !can_handle_critical(buffer+1, n-1, type ) ) { log_info(_("subpacket of type %d has critical bit set\n"), type); + if( start ) + *start = seq; return NULL; /* this is an error */ } } @@ -897,6 +958,8 @@ default: break; } + if( start ) + *start = seq; return buffer+offset; } buffer += n; buflen -=n; @@ -904,15 +967,25 @@ if( reqtype == SIGSUBPKT_TEST_CRITICAL ) return buffer; /* as value true to indicate that there is no */ /* critical bit we don't understand */ + if( start ) + *start = -1; return NULL; /* end of packets; not found */ too_short: log_error("buffer shorter than subpacket\n"); + if( start ) + *start = -1; return NULL; } const byte * +parse_sig_subpkt( const byte *buffer, sigsubpkttype_t reqtype, size_t *ret_n ) +{ + return enum_sig_subpkt( buffer, reqtype, ret_n, NULL ); +} + +const byte * parse_sig_subpkt2( PKT_signature *sig, sigsubpkttype_t reqtype, size_t *ret_n ) { const byte *p; @@ -1208,7 +1281,7 @@ if( pkttype == PKT_SECRET_KEY || pkttype == PKT_SECRET_SUBKEY ) { PKT_secret_key *sk = pkt->pkt.secret_key; - byte temp[8]; + byte temp[16]; if( !npkey ) { sk->skey[0] = mpi_set_opaque( NULL, @@ -1297,6 +1370,8 @@ * so a * sk->protect.ivlen = cipher_get_blocksize(sk->protect.algo); * won't work. The only solution I see is to hardwire it here. + * NOTE: if you change the ivlen above 16, don't forget to + * enlarge temp. */ switch( sk->protect.algo ) { case 7: case 8: case 9: /* reserved for AES */ diff -urN gnupg-0.9.7/g10/passphrase.c gnupg-0.9.8/g10/passphrase.c --- gnupg-0.9.7/g10/passphrase.c Fri Apr 9 10:24:05 1999 +++ gnupg-0.9.8/g10/passphrase.c Tue Jun 15 10:40:19 1999 @@ -184,8 +184,10 @@ pw = m_alloc_secure( strlen(fd_passwd)+1 ); strcpy( pw, fd_passwd ); } - else if( opt.batch ) + else if( opt.batch ) { + write_status( STATUS_MISSING_PASSPHRASE ); log_fatal("Can't query password in batchmode\n"); + } else { pw = cpr_get_hidden("passphrase.enter", _("Enter passphrase: ") ); tty_kill_prompt(); diff -urN gnupg-0.9.7/g10/pkclist.c gnupg-0.9.8/g10/pkclist.c --- gnupg-0.9.7/g10/pkclist.c Sun May 23 12:54:14 1999 +++ gnupg-0.9.8/g10/pkclist.c Fri Jun 4 09:37:31 1999 @@ -547,6 +547,17 @@ } } + +static int +key_present_in_pk_list(PK_LIST pk_list, PKT_public_key *pk) +{ + for( ; pk_list; pk_list = pk_list->next) + if (cmp_public_keys(pk_list->pk, pk) == 0) + return 0; + + return -1; +} + int build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use ) { @@ -569,13 +580,22 @@ log_error(_("%s: skipped: %s\n"), rov->d, g10_errstr(rc) ); } else if( !(rc=check_pubkey_algo2(pk->pubkey_algo, use )) ) { - PK_LIST r; - r = m_alloc( sizeof *r ); - r->pk = pk; pk = NULL; - r->next = pk_list; - r->mark = 0; - pk_list = r; + /* Skip the actual key if the key is already present + * in the list */ + if (key_present_in_pk_list(pk_list, pk) == 0) { + free_public_key(pk); pk = NULL; + log_info(_("%s: skipped: public key already present\n"), + rov->d); + } + else { + PK_LIST r; + r = m_alloc( sizeof *r ); + r->pk = pk; pk = NULL; + r->next = pk_list; + r->mark = 0; + pk_list = r; + } } else { free_public_key( pk ); pk = NULL; @@ -655,14 +675,26 @@ } else if( do_we_trust_pre( pk, trustlevel ) ) { /* note: do_we_trust may have changed the trustlevel */ - PK_LIST r; - r = m_alloc( sizeof *r ); - r->pk = pk; pk = NULL; - r->next = pk_list; - r->mark = 0; - pk_list = r; + /* We have at least one valid recipient. It doesn't matters + * if this recipient is already present. */ any_recipients = 1; + + /* Skip the actual key if the key is already present + * in the list */ + if (key_present_in_pk_list(pk_list, pk) == 0) { + free_public_key(pk); pk = NULL; + log_info(_("%s: skipped: public key already present\n"), + remusr->d); + } + else { + PK_LIST r; + r = m_alloc( sizeof *r ); + r->pk = pk; pk = NULL; + r->next = pk_list; + r->mark = 0; + pk_list = r; + } } else { /* we don't trust this pk */ free_public_key( pk ); pk = NULL; diff -urN gnupg-0.9.7/g10/plaintext.c gnupg-0.9.8/g10/plaintext.c --- gnupg-0.9.7/g10/plaintext.c Wed May 19 14:36:35 1999 +++ gnupg-0.9.8/g10/plaintext.c Tue Jun 1 15:12:43 1999 @@ -63,6 +63,13 @@ log_info(_("data not saved; use option \"--output\" to save it\n")); nooutput = 1; } + else if( !opt.use_embedded_filename ) { + fname = make_outfile_name( iobuf_get_real_fname(pt->buf) ); + if( !fname ) { + rc = G10ERR_CREATE_FILE; + goto leave; + } + } else { fname = m_alloc( pt->namelen +1 ); memcpy( fname, pt->name, pt->namelen ); @@ -90,41 +97,92 @@ if( pt->len ) { assert( !clearsig ); - for( ; pt->len; pt->len-- ) { - if( (c = iobuf_get(pt->buf)) == -1 ) { - log_error("Problem reading source (%u bytes remaining)\n", - (unsigned)pt->len); - rc = G10ERR_READ_FILE; - goto leave; + if( convert ) { /* text mode */ + for( ; pt->len; pt->len-- ) { + if( (c = iobuf_get(pt->buf)) == -1 ) { + log_error("Problem reading source (%u bytes remaining)\n", + (unsigned)pt->len); + rc = G10ERR_READ_FILE; + goto leave; + } + if( mfx->md ) + md_putc(mfx->md, c ); + if( c == '\r' ) + continue; /* fixme: this hack might be too simple */ + if( fp ) { + if( putc( c, fp ) == EOF ) { + log_error("Error writing to `%s': %s\n", + fname, strerror(errno) ); + rc = G10ERR_WRITE_FILE; + goto leave; + } + } } - if( mfx->md ) - md_putc(mfx->md, c ); - if( convert && c == '\r' ) - continue; /* fixme: this hack might be too simple */ - if( fp ) { - if( putc( c, fp ) == EOF ) { - log_error("Error writing to `%s': %s\n", - fname, strerror(errno) ); - rc = G10ERR_WRITE_FILE; + } + else { /* binary mode */ + byte *buffer = m_alloc( 32768 ); + while( pt->len ) { + int len = pt->len > 32768 ? 32768 : pt->len; + len = iobuf_read( pt->buf, buffer, len ); + if( len == -1 ) { + log_error("Problem reading source (%u bytes remaining)\n", + (unsigned)pt->len); + rc = G10ERR_READ_FILE; + m_free( buffer ); goto leave; } + if( mfx->md ) + md_write( mfx->md, buffer, len ); + if( fp ) { + if( fwrite( buffer, 1, len, fp ) != len ) { + log_error("Error writing to `%s': %s\n", + fname, strerror(errno) ); + rc = G10ERR_WRITE_FILE; + m_free( buffer ); + goto leave; + } + } + pt->len -= len; } + m_free( buffer ); } } else if( !clearsig ) { - while( (c = iobuf_get(pt->buf)) != -1 ) { - if( mfx->md ) - md_putc(mfx->md, c ); - if( convert && c == '\r' ) - continue; /* fixme: this hack might be too simple */ - if( fp ) { - if( putc( c, fp ) == EOF ) { - log_error("Error writing to `%s': %s\n", - fname, strerror(errno) ); - rc = G10ERR_WRITE_FILE; - goto leave; + if( convert ) { /* text mode */ + while( (c = iobuf_get(pt->buf)) != -1 ) { + if( mfx->md ) + md_putc(mfx->md, c ); + if( convert && c == '\r' ) + continue; /* fixme: this hack might be too simple */ + if( fp ) { + if( putc( c, fp ) == EOF ) { + log_error("Error writing to `%s': %s\n", + fname, strerror(errno) ); + rc = G10ERR_WRITE_FILE; + goto leave; + } + } + } + } + else { /* binary mode */ + byte *buffer = m_alloc( 32768 ); + for( ;; ) { + int len = iobuf_read( pt->buf, buffer, 32768 ); + if( len == -1 ) + break; + if( mfx->md ) + md_write( mfx->md, buffer, len ); + if( fp ) { + if( fwrite( buffer, 1, len, fp ) != len ) { + log_error("Error writing to `%s': %s\n", + fname, strerror(errno) ); + rc = G10ERR_WRITE_FILE; + m_free( buffer ); + goto leave; + } } } + m_free( buffer ); } pt->buf = NULL; } diff -urN gnupg-0.9.7/g10/sign.c gnupg-0.9.8/g10/sign.c --- gnupg-0.9.7/g10/sign.c Thu May 20 13:51:23 1999 +++ gnupg-0.9.8/g10/sign.c Wed May 26 13:29:48 1999 @@ -39,6 +39,59 @@ #include "i18n.h" + +/**************** + * Create a notation. It is assumed that the stings in STRLIST + * are already checked to contain only printable data and have a valid + * NAME=VALUE format. + */ +static void +mk_notation_and_policy( PKT_signature *sig ) +{ + const char *string, *s; + byte *buf; + unsigned n1, n2; + + /* notation data */ + if( opt.notation_data && sig->version < 4 ) + log_info("can't put notation data into v3 signatures\n"); + else if( opt.notation_data ) { + STRLIST nd = opt.notation_data; + + for( ; nd; nd = nd->next ) { + string = nd->d; + s = strchr( string, '=' ); + if( !s ) + BUG(); /* we have already parsed this */ + n1 = s - string; + s++; + n2 = strlen(s); + buf = m_alloc( 8 + n1 + n2 ); + buf[0] = 0x80; /* human readable */ + buf[1] = buf[2] = buf[3] = 0; + buf[4] = n1 >> 8; + buf[5] = n1; + buf[6] = n2 >> 8; + buf[7] = n2; + memcpy(buf+8, string, n1 ); + memcpy(buf+8+n1, s, n2 ); + build_sig_subpkt( sig, SIGSUBPKT_NOTATION + | ((nd->flags & 1)? SIGSUBPKT_FLAG_CRITICAL:0), + buf, 8+n1+n2 ); + } + } + + /* set policy URL */ + if( (s=opt.set_policy_url) ) { + if( *s == '!' ) + build_sig_subpkt( sig, SIGSUBPKT_POLICY | SIGSUBPKT_FLAG_CRITICAL, + s+1, strlen(s+1) ); + else + build_sig_subpkt( sig, SIGSUBPKT_POLICY, s, strlen(s) ); + } +} + + static int do_sign( PKT_secret_key *sk, PKT_signature *sig, MD_HANDLE md, int digest_algo ) @@ -253,8 +306,10 @@ if( !compr_algo ) ; /* don't use compression */ else { - if( old_style || compr_algo == 1 ) - zfx.algo = 1; + if( old_style + || compr_algo == 1 + || (compr_algo == -1 && !encrypt) ) + zfx.algo = 1; /* use the non optional algorithm */ iobuf_push_filter( out, compress_filter, &zfx ); } } @@ -392,6 +447,9 @@ build_sig_subpkt_from_sig( sig ); md_putc( md, sig->version ); } + + mk_notation_and_policy( sig ); + md_putc( md, sig->sig_class ); if( sig->version < 4 ) { u32 a = sig->timestamp; @@ -578,6 +636,9 @@ build_sig_subpkt_from_sig( sig ); md_putc( md, sig->version ); } + + mk_notation_and_policy( sig ); + md_putc( md, sig->sig_class ); if( sig->version < 4 ) { u32 a = sig->timestamp; @@ -706,6 +767,7 @@ rc = (*mksubpkt)( sig, opaque ); if( !rc ) { + mk_notation_and_policy( sig ); if( sig->version >= 4 ) md_putc( md, sig->version ); md_putc( md, sig->sig_class ); diff -urN gnupg-0.9.7/g10/status.c gnupg-0.9.8/g10/status.c --- gnupg-0.9.7/g10/status.c Fri Apr 23 10:22:49 1999 +++ gnupg-0.9.8/g10/status.c Thu May 27 08:38:59 1999 @@ -358,3 +358,29 @@ } } +int +cpr_get_answer_yes_no_quit( const char *keyword, const char *prompt ) +{ + int yes; + char *p; + + #ifdef USE_SHM_COPROCESSING + if( opt.shm_coprocess ) + return !!do_shm_get( keyword, 0, 1 ); + #endif + for(;;) { + p = tty_get( prompt ); + trim_spaces(p); /* it is okay to do this here */ + if( *p == '?' && !p[1] ) { + m_free(p); + display_online_help( keyword ); + } + else { + tty_kill_prompt(); + yes = answer_is_yes_no_quit(p); + m_free(p); + return yes; + } + } +} + diff -urN gnupg-0.9.7/g10/status.h gnupg-0.9.8/g10/status.h --- gnupg-0.9.7/g10/status.h Fri Apr 23 10:21:19 1999 +++ gnupg-0.9.8/g10/status.h Thu May 27 09:01:06 1999 @@ -80,6 +80,7 @@ char *cpr_get_hidden( const char *keyword, const char *prompt ); void cpr_kill_prompt(void); int cpr_get_answer_is_yes( const char *keyword, const char *prompt ); +int cpr_get_answer_yes_no_quit( const char *keyword, const char *prompt ); #endif /*G10_STATUS_H*/ diff -urN gnupg-0.9.7/g10/tdbdump.c gnupg-0.9.8/g10/tdbdump.c --- gnupg-0.9.7/g10/tdbdump.c Fri May 21 16:57:36 1999 +++ gnupg-0.9.8/g10/tdbdump.c Fri Jun 25 17:17:35 1999 @@ -399,7 +399,7 @@ init_trustdb(); printf(_("# List of assigned trustvalues, created %s\n" - "# (Use \"gpgm --import-ownertrust\" to restore them)\n"), + "# (Use \"gpg --import-ownertrust\" to restore them)\n"), asctimestamp( make_timestamp() ) ); for(recnum=0; !tdbio_read_record( recnum, &rec, 0); recnum++ ) { if( rec.rectype == RECTYPE_DIR ) { diff -urN gnupg-0.9.7/g10/tdbio.c gnupg-0.9.8/g10/tdbio.c --- gnupg-0.9.7/g10/tdbio.c Fri Apr 16 12:01:37 1999 +++ gnupg-0.9.8/g10/tdbio.c Fri Jun 25 17:18:07 1999 @@ -1627,7 +1627,7 @@ tdbio_invalid(void) { log_error(_( - "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n") ); + "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n") ); g10_exit(2); } diff -urN gnupg-0.9.7/include/ChangeLog gnupg-0.9.8/include/ChangeLog --- gnupg-0.9.7/include/ChangeLog Sun Apr 18 09:59:33 1999 +++ gnupg-0.9.8/include/ChangeLog Sat Jun 26 12:15:59 1999 @@ -1,3 +1,8 @@ +Sat Jun 26 12:15:59 CEST 1999 Werner Koch + + + * cipher.h (MD_HANDLE): Assigned a structure name. + Fri Apr 9 12:26:25 CEST 1999 Werner Koch * cipher.h (BLOWFISH160): Removed. diff -urN gnupg-0.9.7/include/cipher.h gnupg-0.9.8/include/cipher.h --- gnupg-0.9.7/include/cipher.h Sun Apr 18 09:59:33 1999 +++ gnupg-0.9.8/include/cipher.h Fri Jun 18 10:14:07 1999 @@ -72,17 +72,21 @@ #define CIPHER_MODE_PHILS_CFB 3 #define CIPHER_MODE_AUTO_CFB 4 #define CIPHER_MODE_DUMMY 5 /* used with algo DUMMY for no encryption */ +#define CIPHER_MODE_CBC 6 struct md_digest_list_s; -typedef struct { +struct gcry_md_context { int secure; FILE *debug; + int finalized; struct md_digest_list_s *list; int bufcount; int bufsize; byte buffer[1]; -} *MD_HANDLE; +}; + +typedef struct gcry_md_context *MD_HANDLE; int g10c_debug_mode; diff -urN gnupg-0.9.7/include/iobuf.h gnupg-0.9.8/include/iobuf.h --- gnupg-0.9.7/include/iobuf.h Sun Apr 18 09:59:34 1999 +++ gnupg-0.9.8/include/iobuf.h Tue Jun 1 15:36:22 1999 @@ -56,6 +56,7 @@ IOBUF chain, byte *buf, size_t *len); void *filter_ov; /* value for opaque */ int filter_ov_owner; + char *real_fname; IOBUF chain; /* next iobuf used for i/o if any (passed to filter) */ int no, subno; const char *desc; @@ -114,6 +115,7 @@ void iobuf_unget_and_close_temp( IOBUF a, IOBUF temp ); u32 iobuf_get_filelength( IOBUF a ); +const char *iobuf_get_real_fname( IOBUF a ); const char *iobuf_get_fname( IOBUF a ); void iobuf_set_block_mode( IOBUF a, size_t n ); diff -urN gnupg-0.9.7/include/ttyio.h gnupg-0.9.8/include/ttyio.h --- gnupg-0.9.7/include/ttyio.h Sun Apr 18 09:59:34 1999 +++ gnupg-0.9.8/include/ttyio.h Tue Jun 15 11:40:32 1999 @@ -27,6 +27,7 @@ char *tty_get_hidden( const char *prompt ); void tty_kill_prompt(void); int tty_get_answer_is_yes( const char *prompt ); +int tty_no_terminal(int onoff); #endif /*G10_TTYIO_H*/ diff -urN gnupg-0.9.7/include/util.h gnupg-0.9.8/include/util.h --- gnupg-0.9.7/include/util.h Fri May 21 17:19:13 1999 +++ gnupg-0.9.8/include/util.h Thu May 27 08:37:47 1999 @@ -152,8 +152,9 @@ const char *strtimevalue( u32 stamp ); const char *strtimestamp( u32 stamp ); /* GMT */ const char *asctimestamp( u32 stamp ); /* localized */ -void print_string( FILE *fp, byte *p, size_t n, int delim ); +void print_string( FILE *fp, const byte *p, size_t n, int delim ); int answer_is_yes( const char *s ); +int answer_is_yes_no_quit( const char *s ); /*-- strgutil.c --*/ void free_strlist( STRLIST sl ); diff -urN gnupg-0.9.7/mpi/ChangeLog gnupg-0.9.8/mpi/ChangeLog --- gnupg-0.9.7/mpi/ChangeLog Sun May 23 14:20:28 1999 +++ gnupg-0.9.8/mpi/ChangeLog Tue Jun 1 16:01:50 1999 @@ -1,3 +1,7 @@ +Tue Jun 1 16:01:46 CEST 1999 Werner Koch + + * config.links (i[56]86*-*-freebsdelf*): New. + Sun May 23 14:20:22 CEST 1999 Werner Koch * config.links (sysdep.h): Not any more conditionally created. diff -urN gnupg-0.9.7/mpi/Makefile.in gnupg-0.9.8/mpi/Makefile.in --- gnupg-0.9.7/mpi/Makefile.in Sun May 23 20:02:25 1999 +++ gnupg-0.9.8/mpi/Makefile.in Sat Jun 26 13:07:08 1999 @@ -70,6 +70,7 @@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@ DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ diff -urN gnupg-0.9.7/mpi/config.links gnupg-0.9.8/mpi/config.links --- gnupg-0.9.7/mpi/config.links Mon Mar 8 18:51:20 1999 +++ gnupg-0.9.8/mpi/config.links Mon May 31 20:07:55 1999 @@ -12,12 +12,12 @@ if test "$try_asm_modules" = "yes" ; then case "${target}" in - i[34]86*-*-freebsd*-elf | i[34]86*-*-freebsd[34]*) + i[34]86*-*-freebsd*-elf | i[34]86*-*-freebsd[34]* | i[34]86*-*-freebsdelf*) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i386" ;; - i[56]86*-*-freebsd*-elf | i[56]86*-*-freebsd[34]*) + i[56]86*-*-freebsd*-elf | i[56]86*-*-freebsd[34]* | i[56]86*-*-freebsdelf*) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i586 i386" diff -urN gnupg-0.9.7/mpi/mpiutil.c gnupg-0.9.8/mpi/mpiutil.c --- gnupg-0.9.7/mpi/mpiutil.c Tue May 4 14:51:50 1999 +++ gnupg-0.9.8/mpi/mpiutil.c Tue Jun 1 09:41:17 1999 @@ -103,6 +103,12 @@ } +#if 0 +static void *unused_limbs_5; +static void *unused_limbs_32; +static void *unused_limbs_64; +#endif + mpi_ptr_t #ifdef M_DEBUG mpi_debug_alloc_limb_space( unsigned nlimbs, int secure, const char *info ) @@ -111,14 +117,37 @@ #endif { size_t len = nlimbs * sizeof(mpi_limb_t); + mpi_ptr_t p; if( DBG_MEMORY ) log_debug("mpi_alloc_limb_space(%u)\n", (unsigned)len*8 ); + #if 0 + if( !secure ) { + if( nlimbs == 5 && unused_limbs_5 ) { /* DSA 160 bits */ + p = unused_limbs_5; + unused_limbs_5 = *p; + return p; + } + else if( nlimbs == 32 && unused_limbs_32 ) { /* DSA 1024 bits */ + p = unused_limbs_32; + unused_limbs_32 = *p; + return p; + } + else if( nlimbs == 64 && unused_limbs_64 ) { /* DSA 2*1024 bits */ + p = unused_limbs_64; + unused_limbs_64 = *p; + return p; + } + } + #endif + #ifdef M_DEBUG - return secure? m_debug_alloc_secure(len, info):m_debug_alloc( len, info ); + p = secure? m_debug_alloc_secure(len, info):m_debug_alloc( len, info ); #else - return secure? m_alloc_secure( len ):m_alloc( len ); + p = secure? m_alloc_secure( len ):m_alloc( len ); #endif + + return p; } void @@ -132,6 +161,31 @@ return; if( DBG_MEMORY ) log_debug("mpi_free_limb_space of size %lu\n", (ulong)m_size(a)*8 ); + + #if 0 + if( !m_is_secure(a) ) { + size_t nlimbs = m_size(a) / 4 ; + void *p = a; + + if( nlimbs == 5 ) { /* DSA 160 bits */ + *a = unused_limbs_5; + unused_limbs_5 = a; + return; + } + else if( nlimbs == 32 ) { /* DSA 1024 bits */ + *a = unused_limbs_32; + unused_limbs_32 = a; + return; + } + else if( nlimbs == 64 ) { /* DSA 2*1024 bits */ + *a = unused_limbs_64; + unused_limbs_64 = a; + return; + } + } + #endif + + m_free(a); } diff -urN gnupg-0.9.7/po/ChangeLog gnupg-0.9.8/po/ChangeLog --- gnupg-0.9.7/po/ChangeLog Mon May 17 21:54:49 1999 +++ gnupg-0.9.8/po/ChangeLog Sat Jun 26 12:16:00 1999 @@ -1,3 +1,28 @@ +Sat Jun 26 12:15:59 CEST 1999 Werner Koch + + + * pt_BR.po: Updated (Thiago). + +Thu Jun 10 14:18:23 CEST 1999 Werner Koch + + * it.po: Updated (Marco). + + * es_ES.po: Updated (Urko). + +Wed Jun 2 14:17:19 CEST 1999 Werner Koch + + * es_ES.po: Some patches (Urko Lusa). + +Mon May 31 19:41:10 CEST 1999 Werner Koch + + * de.po: New version (Walter). + + * pl.po: New version (Alex). + +Tue May 25 19:50:32 CEST 1999 Werner Koch + + * fr.po: Imported new version. + Mon May 17 21:54:43 CEST 1999 Werner Koch * de.po, de.glo: New version from Walter. diff -urN gnupg-0.9.7/po/cat-id-tbl.c gnupg-0.9.8/po/cat-id-tbl.c --- gnupg-0.9.7/po/cat-id-tbl.c Sat May 22 22:26:57 1999 +++ gnupg-0.9.8/po/cat-id-tbl.c Sat Jun 26 10:51:54 1999 @@ -13,140 +13,145 @@ {"(you may have used the wrong program for this task)\n", 4}, {"yes", 5}, {"yY", 6}, - {"general error", 7}, - {"unknown packet type", 8}, - {"unknown version", 9}, - {"unknown pubkey algorithm", 10}, - {"unknown digest algorithm", 11}, - {"bad public key", 12}, - {"bad secret key", 13}, - {"bad signature", 14}, - {"checksum error", 15}, - {"bad passphrase", 16}, - {"public key not found", 17}, - {"unknown cipher algorithm", 18}, - {"can't open the keyring", 19}, - {"invalid packet", 20}, - {"invalid armor", 21}, - {"no such user id", 22}, - {"secret key not available", 23}, - {"wrong secret key used", 24}, - {"not supported", 25}, - {"bad key", 26}, - {"file read error", 27}, - {"file write error", 28}, - {"unknown compress algorithm", 29}, - {"file open error", 30}, - {"file create error", 31}, - {"invalid passphrase", 32}, - {"unimplemented pubkey algorithm", 33}, - {"unimplemented cipher algorithm", 34}, - {"unknown signature class", 35}, - {"trust database error", 36}, - {"bad MPI", 37}, - {"resource limit", 38}, - {"invalid keyring", 39}, - {"bad certificate", 40}, - {"malformed user id", 41}, - {"file close error", 42}, - {"file rename error", 43}, - {"file delete error", 44}, - {"unexpected data", 45}, - {"timestamp conflict", 46}, - {"unusable pubkey algorithm", 47}, - {"file exists", 48}, - {"weak key", 49}, - {"invalid argument", 50}, - {"bad URI", 51}, - {"unsupported URI", 52}, - {"network error", 53}, - {"not encrypted", 54}, - {"... this is a bug (%s:%d:%s)\n", 55}, - {"you found a bug ... (%s:%d)\n", 56}, - {"WARNING: using insecure random number generator!!\n", 57}, + {"quit", 7}, + {"qQ", 8}, + {"general error", 9}, + {"unknown packet type", 10}, + {"unknown version", 11}, + {"unknown pubkey algorithm", 12}, + {"unknown digest algorithm", 13}, + {"bad public key", 14}, + {"bad secret key", 15}, + {"bad signature", 16}, + {"checksum error", 17}, + {"bad passphrase", 18}, + {"public key not found", 19}, + {"unknown cipher algorithm", 20}, + {"can't open the keyring", 21}, + {"invalid packet", 22}, + {"invalid armor", 23}, + {"no such user id", 24}, + {"secret key not available", 25}, + {"wrong secret key used", 26}, + {"not supported", 27}, + {"bad key", 28}, + {"file read error", 29}, + {"file write error", 30}, + {"unknown compress algorithm", 31}, + {"file open error", 32}, + {"file create error", 33}, + {"invalid passphrase", 34}, + {"unimplemented pubkey algorithm", 35}, + {"unimplemented cipher algorithm", 36}, + {"unknown signature class", 37}, + {"trust database error", 38}, + {"bad MPI", 39}, + {"resource limit", 40}, + {"invalid keyring", 41}, + {"bad certificate", 42}, + {"malformed user id", 43}, + {"file close error", 44}, + {"file rename error", 45}, + {"file delete error", 46}, + {"unexpected data", 47}, + {"timestamp conflict", 48}, + {"unusable pubkey algorithm", 49}, + {"file exists", 50}, + {"weak key", 51}, + {"invalid argument", 52}, + {"bad URI", 53}, + {"unsupported URI", 54}, + {"network error", 55}, + {"not encrypted", 56}, + {"... this is a bug (%s:%d:%s)\n", 57}, + {"you found a bug ... (%s:%d)\n", 58}, + {"WARNING: using insecure random number generator!!\n", 59}, {"\ The random number generator is only a kludge to let\n\ it run - it is in no way a strong RNG!\n\ \n\ DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n\ -\n", 58}, +\n", 60}, {"\ \n\ Not enough random bytes available. Please do some other work to give\n\ -the OS a chance to collect more entropy! (Need %d more bytes)\n", 59}, +the OS a chance to collect more entropy! (Need %d more bytes)\n", 61}, {"\ @Commands:\n\ - ", 60}, - {"|[file]|make a signature", 61}, - {"|[file]|make a clear text signature", 62}, - {"make a detached signature", 63}, - {"encrypt data", 64}, - {"encryption only with symmetric cipher", 65}, - {"store only", 66}, - {"decrypt data (default)", 67}, - {"verify a signature", 68}, - {"list keys", 69}, - {"list keys and signatures", 70}, - {"check key signatures", 71}, - {"list keys and fingerprints", 72}, - {"list secret keys", 73}, - {"generate a new key pair", 74}, - {"remove key from the public keyring", 75}, - {"sign or edit a key", 76}, - {"generate a revocation certificate", 77}, - {"export keys", 78}, - {"export keys to a key server", 79}, - {"import keys from a key server", 80}, - {"import/merge keys", 81}, - {"list only the sequence of packets", 82}, - {"export the ownertrust values", 83}, - {"import ownertrust values", 84}, - {"|[NAMES]|update the trust database", 85}, - {"|[NAMES]|check the trust database", 86}, - {"fix a corrupted trust database", 87}, - {"De-Armor a file or stdin", 88}, - {"En-Armor a file or stdin", 89}, - {"|algo [files]|print message digests", 90}, - {"print all message digests", 91}, + ", 62}, + {"|[file]|make a signature", 63}, + {"|[file]|make a clear text signature", 64}, + {"make a detached signature", 65}, + {"encrypt data", 66}, + {"encryption only with symmetric cipher", 67}, + {"store only", 68}, + {"decrypt data (default)", 69}, + {"verify a signature", 70}, + {"list keys", 71}, + {"list keys and signatures", 72}, + {"check key signatures", 73}, + {"list keys and fingerprints", 74}, + {"list secret keys", 75}, + {"generate a new key pair", 76}, + {"remove key from the public keyring", 77}, + {"sign or edit a key", 78}, + {"generate a revocation certificate", 79}, + {"export keys", 80}, + {"export keys to a key server", 81}, + {"import keys from a key server", 82}, + {"import/merge keys", 83}, + {"list only the sequence of packets", 84}, + {"export the ownertrust values", 85}, + {"import ownertrust values", 86}, + {"|[NAMES]|update the trust database", 87}, + {"|[NAMES]|check the trust database", 88}, + {"fix a corrupted trust database", 89}, + {"De-Armor a file or stdin", 90}, + {"En-Armor a file or stdin", 91}, + {"|algo [files]|print message digests", 92}, + {"print all message digests", 93}, {"\ @\n\ Options:\n\ - ", 92}, - {"create ascii armored output", 93}, - {"|NAME|encrypt for NAME", 94}, - {"use this user-id to sign or decrypt", 95}, - {"|N|set compress level N (0 disables)", 96}, - {"use canonical text mode", 97}, - {"use as output file", 98}, - {"verbose", 99}, - {"be somewhat more quiet", 100}, - {"force v3 signatures", 101}, - {"always use a MDC for encryption", 102}, - {"do not make any changes", 103}, - {"batch mode: never ask", 104}, - {"assume yes on most questions", 105}, - {"assume no on most questions", 106}, - {"add this keyring to the list of keyrings", 107}, - {"add this secret keyring to the list", 108}, - {"|NAME|use NAME as default secret key", 109}, - {"|HOST|use this keyserver to lookup keys", 110}, - {"|NAME|set terminal charset to NAME", 111}, - {"read options from file", 112}, - {"set debugging flags", 113}, - {"enable full debugging", 114}, - {"|FD|write status info to this FD", 115}, - {"do not write comment packets", 116}, - {"(default is 1)", 117}, - {"(default is 3)", 118}, - {"|FILE|load extension module FILE", 119}, - {"emulate the mode described in RFC1991", 120}, - {"|N|use passphrase mode N", 121}, - {"|NAME|use message digest algorithm NAME for passphrases", 122}, - {"|NAME|use cipher algorithm NAME for passphrases", 123}, - {"|NAME|use cipher algorithm NAME", 124}, - {"|NAME|use message digest algorithm NAME", 125}, - {"|N|use compress algorithm N", 126}, - {"throw keyid field of encrypted packets", 127}, + ", 94}, + {"create ascii armored output", 95}, + {"|NAME|encrypt for NAME", 96}, + {"use this user-id to sign or decrypt", 97}, + {"|N|set compress level N (0 disables)", 98}, + {"use canonical text mode", 99}, + {"use as output file", 100}, + {"verbose", 101}, + {"be somewhat more quiet", 102}, + {"don't use the terminal at all", 103}, + {"force v3 signatures", 104}, + {"always use a MDC for encryption", 105}, + {"do not make any changes", 106}, + {"batch mode: never ask", 107}, + {"assume yes on most questions", 108}, + {"assume no on most questions", 109}, + {"add this keyring to the list of keyrings", 110}, + {"add this secret keyring to the list", 111}, + {"|NAME|use NAME as default secret key", 112}, + {"|HOST|use this keyserver to lookup keys", 113}, + {"|NAME|set terminal charset to NAME", 114}, + {"read options from file", 115}, + {"set debugging flags", 116}, + {"enable full debugging", 117}, + {"|FD|write status info to this FD", 118}, + {"do not write comment packets", 119}, + {"(default is 1)", 120}, + {"(default is 3)", 121}, + {"|FILE|load extension module FILE", 122}, + {"emulate the mode described in RFC1991", 123}, + {"set all packet, cipher and digest options to OpenPGP behavior", 124}, + {"|N|use passphrase mode N", 125}, + {"|NAME|use message digest algorithm NAME for passphrases", 126}, + {"|NAME|use cipher algorithm NAME for passphrases", 127}, + {"|NAME|use cipher algorithm NAME", 128}, + {"|NAME|use message digest algorithm NAME", 129}, + {"|N|use compress algorithm N", 130}, + {"throw keyid field of encrypted packets", 131}, + {"|NAME=VALUE|use this notation data", 132}, {"\ @\n\ Examples:\n\ @@ -155,70 +160,78 @@ --clearsign [file] make a clear text signature\n\ --detach-sign [file] make a detached signature\n\ --list-keys [names] show keys\n\ - --fingerprint [names] show fingerprints\n", 128}, - {"Please report bugs to .\n", 129}, - {"Usage: gpg [options] [files] (-h for help)", 130}, + --fingerprint [names] show fingerprints\n", 133}, + {"Please report bugs to .\n", 134}, + {"Usage: gpg [options] [files] (-h for help)", 135}, {"\ Syntax: gpg [options] [files]\n\ sign, check, encrypt or decrypt\n\ -default operation depends on the input data\n", 131}, +default operation depends on the input data\n", 136}, {"\ \n\ -Supported algorithms:\n", 132}, - {"usage: gpg [options] ", 133}, - {"conflicting commands\n", 134}, - {"NOTE: no default option file `%s'\n", 135}, - {"option file `%s': %s\n", 136}, - {"reading options from `%s'\n", 137}, - {"%s is not a valid character set\n", 138}, - {"selected cipher algorithm is invalid\n", 139}, - {"selected digest algorithm is invalid\n", 140}, - {"compress algorithm must be in range %d..%d\n", 141}, - {"completes-needed must be greater than 0\n", 142}, - {"marginals-needed must be greater than 1\n", 143}, - {"max-cert-depth must be in range 1 to 255\n", 144}, - {"NOTE: simple S2K mode (0) is strongly discouraged\n", 145}, - {"invalid S2K mode; must be 0, 1 or 3\n", 146}, - {"failed to initialize the TrustDB: %s\n", 147}, - {"--store [filename]", 148}, - {"--symmetric [filename]", 149}, - {"--encrypt [filename]", 150}, - {"--sign [filename]", 151}, - {"--sign --encrypt [filename]", 152}, - {"--clearsign [filename]", 153}, - {"--decrypt [filename]", 154}, - {"--edit-key username [commands]", 155}, - {"--delete-secret-key username", 156}, - {"--delete-key username", 157}, - {"can't open %s: %s\n", 158}, - {"-k[v][v][v][c] [userid] [keyring]", 159}, - {"dearmoring failed: %s\n", 160}, - {"enarmoring failed: %s\n", 161}, - {"invalid hash algorithm `%s'\n", 162}, - {"[filename]", 163}, - {"Go ahead and type your message ...\n", 164}, - {"can't open `%s'\n", 165}, - {"armor: %s\n", 166}, - {"invalid armor header: ", 167}, - {"armor header: ", 168}, - {"invalid clearsig header\n", 169}, - {"nested clear text signatures\n", 170}, - {"invalid dash escaped line: ", 171}, - {"unexpected armor:", 172}, - {"invalid radix64 character %02x skipped\n", 173}, - {"premature eof (no CRC)\n", 174}, - {"premature eof (in CRC)\n", 175}, - {"malformed CRC\n", 176}, - {"CRC error; %06lx - %06lx\n", 177}, - {"premature eof (in Trailer)\n", 178}, - {"error in trailer line\n", 179}, - {"no valid OpenPGP data found.\n", 180}, - {"invalid armor: line longer than %d characters\n", 181}, +Supported algorithms:\n", 137}, + {"usage: gpg [options] ", 138}, + {"conflicting commands\n", 139}, + {"NOTE: no default option file `%s'\n", 140}, + {"option file `%s': %s\n", 141}, + {"reading options from `%s'\n", 142}, + {"%s is not a valid character set\n", 143}, + {"selected cipher algorithm is invalid\n", 144}, + {"selected digest algorithm is invalid\n", 145}, + {"the given policy URL is invalid\n", 146}, + {"compress algorithm must be in range %d..%d\n", 147}, + {"completes-needed must be greater than 0\n", 148}, + {"marginals-needed must be greater than 1\n", 149}, + {"max-cert-depth must be in range 1 to 255\n", 150}, + {"NOTE: simple S2K mode (0) is strongly discouraged\n", 151}, + {"invalid S2K mode; must be 0, 1 or 3\n", 152}, + {"failed to initialize the TrustDB: %s\n", 153}, + {"--store [filename]", 154}, + {"--symmetric [filename]", 155}, + {"--encrypt [filename]", 156}, + {"--sign [filename]", 157}, + {"--sign --encrypt [filename]", 158}, + {"--clearsign [filename]", 159}, + {"--decrypt [filename]", 160}, + {"--edit-key username [commands]", 161}, + {"--delete-secret-key username", 162}, + {"--delete-key username", 163}, + {"can't open %s: %s\n", 164}, + {"-k[v][v][v][c] [userid] [keyring]", 165}, + {"dearmoring failed: %s\n", 166}, + {"enarmoring failed: %s\n", 167}, + {"invalid hash algorithm `%s'\n", 168}, + {"[filename]", 169}, + {"Go ahead and type your message ...\n", 170}, + {"can't open `%s'\n", 171}, + {"\ +the first character of a notation name must be a letter or an underscore\n", 172}, + {"\ +a notation name must have only letters, digits, dots or underscores and end \ +with an '='\n", 173}, + {"dots in a notation name must be surrounded by other characters\n", 174}, + {"a notation value must not use any control characters\n", 175}, + {"armor: %s\n", 176}, + {"invalid armor header: ", 177}, + {"armor header: ", 178}, + {"invalid clearsig header\n", 179}, + {"nested clear text signatures\n", 180}, + {"invalid dash escaped line: ", 181}, + {"unexpected armor:", 182}, + {"invalid radix64 character %02x skipped\n", 183}, + {"premature eof (no CRC)\n", 184}, + {"premature eof (in CRC)\n", 185}, + {"malformed CRC\n", 186}, + {"CRC error; %06lx - %06lx\n", 187}, + {"premature eof (in Trailer)\n", 188}, + {"error in trailer line\n", 189}, + {"no valid OpenPGP data found.\n", 190}, + {"invalid armor: line longer than %d characters\n", 191}, {"\ -quoted printable character in armor - probably a buggy MTA has been used\n", 182}, +quoted printable character in armor - probably a buggy MTA has been used\n", 192}, {"\ No trust value assigned to %lu:\n\ -%4u%c/%08lX %s \"", 183}, +%4u%c/%08lX %s \"", 193}, {"\ Please decide how far you trust this user to correctly\n\ verify other users' keys (by looking at passports,\n\ @@ -228,556 +241,571 @@ 2 = I do NOT trust\n\ 3 = I trust marginally\n\ 4 = I trust fully\n\ - s = please show me more information\n", 184}, - {" m = back to the main menu\n", 185}, - {" q = quit\n", 186}, - {"sSmMqQ", 187}, - {"Your decision? ", 188}, - {"Certificates leading to an ultimately trusted key:\n", 189}, + s = please show me more information\n", 194}, + {" m = back to the main menu\n", 195}, + {" q = quit\n", 196}, + {"sSmMqQ", 197}, + {"Your decision? ", 198}, + {"Certificates leading to an ultimately trusted key:\n", 199}, {"\ Could not find a valid trust path to the key. Let's see whether we\n\ can assign some missing owner trust values.\n\ -\n", 190}, +\n", 200}, {"\ No path leading to one of our keys found.\n\ -\n", 191}, +\n", 201}, {"\ No certificates with undefined trust found.\n\ -\n", 192}, +\n", 202}, {"\ No trust values changed.\n\ -\n", 193}, - {"key %08lX: key has been revoked!\n", 194}, - {"Use this key anyway? ", 195}, - {"key %08lX: subkey has been revoked!\n", 196}, - {"%08lX: key has expired\n", 197}, - {"%08lX: no info to calculate a trust probability\n", 198}, - {"%08lX: We do NOT trust this key\n", 199}, +\n", 203}, + {"key %08lX: key has been revoked!\n", 204}, + {"Use this key anyway? ", 205}, + {"key %08lX: subkey has been revoked!\n", 206}, + {"%08lX: key has expired\n", 207}, + {"%08lX: no info to calculate a trust probability\n", 208}, + {"%08lX: We do NOT trust this key\n", 209}, {"\ %08lX: It is not sure that this key really belongs to the owner\n\ -but it is accepted anyway\n", 200}, - {"This key probably belongs to the owner\n", 201}, - {"This key belongs to us\n", 202}, +but it is accepted anyway\n", 210}, + {"This key probably belongs to the owner\n", 211}, + {"This key belongs to us\n", 212}, {"\ It is NOT certain that the key belongs to its owner.\n\ If you *really* know what you are doing, you may answer\n\ the next question with yes\n\ -\n", 203}, - {"WARNING: Using untrusted key!\n", 204}, - {"WARNING: This key has been revoked by its owner!\n", 205}, - {" This could mean that the signature is forgery.\n", 206}, - {"WARNING: This subkey has been revoked by its owner!\n", 207}, - {"Note: This key has expired!\n", 208}, - {"WARNING: This key is not certified with a trusted signature!\n", 209}, - {"\ - There is no indication that the signature belongs to the owner.\n", 210}, - {"WARNING: We do NOT trust this key!\n", 211}, - {" The signature is probably a FORGERY.\n", 212}, - {"\ -WARNING: This key is not certified with sufficiently trusted signatures!\n", 213}, - {" It is not certain that the signature belongs to the owner.\n", 214}, - {"%s: skipped: %s\n", 215}, +\n", 213}, + {"WARNING: Using untrusted key!\n", 214}, + {"WARNING: This key has been revoked by its owner!\n", 215}, + {" This could mean that the signature is forgery.\n", 216}, + {"WARNING: This subkey has been revoked by its owner!\n", 217}, + {"Note: This key has expired!\n", 218}, + {"WARNING: This key is not certified with a trusted signature!\n", 219}, + {"\ + There is no indication that the signature belongs to the owner.\n", 220}, + {"WARNING: We do NOT trust this key!\n", 221}, + {" The signature is probably a FORGERY.\n", 222}, + {"\ +WARNING: This key is not certified with sufficiently trusted signatures!\n", 223}, + {" It is not certain that the signature belongs to the owner.\n", 224}, + {"%s: skipped: %s\n", 225}, + {"%s: skipped: public key already present\n", 226}, {"\ You did not specify a user ID. (you may use \"-r\")\n\ -\n", 216}, - {"Enter the user ID: ", 217}, - {"No such user ID.\n", 218}, - {"%s: error checking key: %s\n", 219}, - {"no valid addressees\n", 220}, - {"writing self signature\n", 221}, - {"writing key binding signature\n", 222}, - {"Please select what kind of key you want:\n", 223}, - {" (%d) DSA and ElGamal (default)\n", 224}, - {" (%d) DSA (sign only)\n", 225}, - {" (%d) ElGamal (encrypt only)\n", 226}, - {" (%d) ElGamal (sign and encrypt)\n", 227}, - {" (%d) ElGamal in a v3 packet\n", 228}, - {"Your selection? ", 229}, - {"Do you really want to create a sign and encrypt key? ", 230}, - {"Invalid selection.\n", 231}, +\n", 227}, + {"Enter the user ID: ", 228}, + {"No such user ID.\n", 229}, + {"%s: error checking key: %s\n", 230}, + {"no valid addressees\n", 231}, + {"writing self signature\n", 232}, + {"writing key binding signature\n", 233}, + {"Please select what kind of key you want:\n", 234}, + {" (%d) DSA and ElGamal (default)\n", 235}, + {" (%d) DSA (sign only)\n", 236}, + {" (%d) ElGamal (encrypt only)\n", 237}, + {" (%d) ElGamal (sign and encrypt)\n", 238}, + {" (%d) ElGamal in a v3 packet\n", 239}, + {"Your selection? ", 240}, + {"Do you really want to create a sign and encrypt key? ", 241}, + {"Invalid selection.\n", 242}, {"\ About to generate a new %s keypair.\n\ minimum keysize is 768 bits\n\ default keysize is 1024 bits\n\ - highest suggested keysize is 2048 bits\n", 232}, - {"What keysize do you want? (1024) ", 233}, - {"DSA only allows keysizes from 512 to 1024\n", 234}, - {"keysize too small; 768 is smallest value allowed.\n", 235}, - {"keysize too large; %d is largest value allowed.\n", 236}, + highest suggested keysize is 2048 bits\n", 243}, + {"What keysize do you want? (1024) ", 244}, + {"DSA only allows keysizes from 512 to 1024\n", 245}, + {"keysize too small; 768 is smallest value allowed.\n", 246}, + {"keysize too large; %d is largest value allowed.\n", 247}, {"\ Keysizes larger than 2048 are not suggested because\n\ -computations take REALLY long!\n", 237}, - {"Are you sure that you want this keysize? ", 238}, +computations take REALLY long!\n", 248}, + {"Are you sure that you want this keysize? ", 249}, {"\ Okay, but keep in mind that your monitor and keyboard radiation is also very \ -vulnerable to attacks!\n", 239}, - {"Do you really need such a large keysize? ", 240}, - {"Requested keysize is %u bits\n", 241}, - {"rounded up to %u bits\n", 242}, +vulnerable to attacks!\n", 250}, + {"Do you really need such a large keysize? ", 251}, + {"Requested keysize is %u bits\n", 252}, + {"rounded up to %u bits\n", 253}, {"\ Please specify how long the key should be valid.\n\ 0 = key does not expire\n\ = key expires in n days\n\ w = key expires in n weeks\n\ m = key expires in n months\n\ - y = key expires in n years\n", 243}, - {"Key is valid for? (0) ", 244}, - {"invalid value\n", 245}, - {"Key does not expire at all\n", 246}, - {"Key expires at %s\n", 247}, - {"Is this correct (y/n)? ", 248}, + y = key expires in n years\n", 254}, + {"Key is valid for? (0) ", 255}, + {"invalid value\n", 256}, + {"Key does not expire at all\n", 257}, + {"Key expires at %s\n", 258}, + {"Is this correct (y/n)? ", 259}, {"\ \n\ You need a User-ID to identify your key; the software constructs the user \ id\n\ from Real Name, Comment and Email Address in this form:\n\ \"Heinrich Heine (Der Dichter) \"\n\ -\n", 249}, - {"Real name: ", 250}, - {"Invalid character in name\n", 251}, - {"Name may not start with a digit\n", 252}, - {"Name must be at least 5 characters long\n", 253}, - {"Email address: ", 254}, - {"Not a valid email address\n", 255}, - {"Comment: ", 256}, - {"Invalid character in comment\n", 257}, - {"You are using the `%s' character set.\n", 258}, +\n", 260}, + {"Real name: ", 261}, + {"Invalid character in name\n", 262}, + {"Name may not start with a digit\n", 263}, + {"Name must be at least 5 characters long\n", 264}, + {"Email address: ", 265}, + {"Not a valid email address\n", 266}, + {"Comment: ", 267}, + {"Invalid character in comment\n", 268}, + {"You are using the `%s' character set.\n", 269}, {"\ You selected this USER-ID:\n\ \"%s\"\n\ -\n", 259}, - {"NnCcEeOoQq", 260}, - {"Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? ", 261}, +\n", 270}, + {"NnCcEeOoQq", 271}, + {"Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? ", 272}, {"\ You need a Passphrase to protect your secret key.\n\ -\n", 262}, - {"passphrase not correctly repeated; try again.\n", 263}, +\n", 273}, + {"passphrase not correctly repeated; try again.\n", 274}, {"\ You don't want a passphrase - this is probably a *bad* idea!\n\ I will do it anyway. You can change your passphrase at any time,\n\ using this program with the option \"--edit-key\".\n\ -\n", 264}, +\n", 275}, {"\ We need to generate a lot of random bytes. It is a good idea to perform\n\ some other action (type on the keyboard, move the mouse, utilize the\n\ disks) during the prime generation; this gives the random number\n\ -generator a better chance to gain enough entropy.\n", 265}, - {"Key generation can only be used in interactive mode\n", 266}, - {"DSA keypair will have 1024 bits.\n", 267}, - {"Key generation cancelled.\n", 268}, - {"writing public certificate to `%s'\n", 269}, - {"writing secret certificate to `%s'\n", 270}, - {"public and secret key created and signed.\n", 271}, +generator a better chance to gain enough entropy.\n", 276}, + {"Key generation can only be used in interactive mode\n", 277}, + {"DSA keypair will have 1024 bits.\n", 278}, + {"Key generation canceled.\n", 279}, + {"writing public certificate to `%s'\n", 280}, + {"writing secret certificate to `%s'\n", 281}, + {"public and secret key created and signed.\n", 282}, {"\ Note that this key cannot be used for encryption. You may want to use\n\ -the command \"--edit-key\" to generate a secondary key for this purpose.\n", 272}, - {"Key generation failed: %s\n", 273}, +the command \"--edit-key\" to generate a secondary key for this purpose.\n", 283}, + {"Key generation failed: %s\n", 284}, {"\ -key has been created %lu second in future (time warp or clock problem)\n", 274}, +key has been created %lu second in future (time warp or clock problem)\n", 285}, {"\ -key has been created %lu seconds in future (time warp or clock problem)\n", 275}, - {"Really create? ", 276}, - {"%s: can't open: %s\n", 277}, - {"error creating passphrase: %s\n", 278}, - {"%s: WARNING: empty file\n", 279}, - {"reading from `%s'\n", 280}, - {"%s/%s encrypted for: %s\n", 281}, - {"%s: user not found: %s\n", 282}, - {"certificate read problem: %s\n", 283}, - {"key %08lX: not a rfc2440 key - skipped\n", 284}, - {"WARNING: nothing exported\n", 285}, - {"too many entries in pk cache - disabled\n", 286}, - {"too many entries in unk cache - disabled\n", 287}, - {"using secondary key %08lX instead of primary key %08lX\n", 288}, - {"can't open `%s': %s\n", 289}, - {"skipping block of type %d\n", 290}, - {"%lu keys so far processed\n", 291}, - {"error reading `%s': %s\n", 292}, - {"Total number processed: %lu\n", 293}, - {" w/o user IDs: %lu\n", 294}, - {" imported: %lu", 295}, - {" unchanged: %lu\n", 296}, - {" new user IDs: %lu\n", 297}, - {" new subkeys: %lu\n", 298}, - {" new signatures: %lu\n", 299}, - {" new key revocations: %lu\n", 300}, - {" secret keys read: %lu\n", 301}, - {" secret keys imported: %lu\n", 302}, - {" secret keys unchanged: %lu\n", 303}, - {"key %08lX: no user id\n", 304}, - {"key %08lX: no valid user ids\n", 305}, - {"this may be caused by a missing self-signature\n", 306}, - {"key %08lX: public key not found: %s\n", 307}, - {"no default public keyring\n", 308}, - {"writing to `%s'\n", 309}, - {"can't lock keyring `%': %s\n", 310}, - {"error writing keyring `%': %s\n", 311}, - {"key %08lX: public key imported\n", 312}, - {"key %08lX: doesn't match our copy\n", 313}, - {"key %08lX: can't locate original keyblock: %s\n", 314}, - {"key %08lX: can't read original keyblock: %s\n", 315}, - {"error writing keyring `%s': %s\n", 316}, - {"key %08lX: 1 new user-id\n", 317}, - {"key %08lX: %d new user-ids\n", 318}, - {"key %08lX: 1 new signature\n", 319}, - {"key %08lX: %d new signatures\n", 320}, - {"key %08lX: 1 new subkey\n", 321}, - {"key %08lX: %d new subkeys\n", 322}, - {"key %08lX: not changed\n", 323}, - {"can't lock keyring `%s': %s\n", 324}, - {"key %08lX: secret key imported\n", 325}, - {"key %08lX: already in secret keyring\n", 326}, - {"key %08lX: secret key not found: %s\n", 327}, - {"key %08lX: no public key - can't apply revocation certificate\n", 328}, - {"key %08lX: invalid revocation certificate: %s - rejected\n", 329}, - {"key %08lX: revocation certificate imported\n", 330}, - {"key %08lX: no user-id for signature\n", 331}, - {"key %08lX: unsupported public key algorithm\n", 332}, - {"key %08lX: invalid self-signature\n", 333}, - {"key %08lX: no subkey for key binding\n", 334}, - {"key %08lX: invalid subkey binding\n", 335}, - {"key %08lX: skipped userid '", 336}, - {"key %08lX: skipped subkey\n", 337}, - {"key %08lX: non exportable signature (class %02x) - skipped\n", 338}, - {"key %08lX: revocation certificate at wrong place - skipped\n", 339}, - {"key %08lX: invalid revocation certificate: %s - skipped\n", 340}, - {"key %08lX: duplicated user ID detected - merged\n", 341}, - {"key %08lX: revocation certificate added\n", 342}, - {"key %08lX: our copy has no self-signature\n", 343}, - {"%s: user not found\n", 344}, - {"[revocation]", 345}, - {"[self-signature]", 346}, - {"1 bad signature\n", 347}, - {"%d bad signatures\n", 348}, - {"1 signature not checked due to a missing key\n", 349}, - {"%d signatures not checked due to missing keys\n", 350}, - {"1 signature not checked due to an error\n", 351}, - {"%d signatures not checked due to errors\n", 352}, - {"1 user id without valid self-signature detected\n", 353}, - {"%d user ids without valid self-signatures detected\n", 354}, - {"Already signed by key %08lX\n", 355}, - {"Nothing to sign with key %08lX\n", 356}, +key has been created %lu seconds in future (time warp or clock problem)\n", 286}, + {"Really create? ", 287}, + {"%s: can't open: %s\n", 288}, + {"error creating passphrase: %s\n", 289}, + {"%s: WARNING: empty file\n", 290}, + {"reading from `%s'\n", 291}, + {"%s/%s encrypted for: %s\n", 292}, + {"%s: user not found: %s\n", 293}, + {"certificate read problem: %s\n", 294}, + {"key %08lX: not a rfc2440 key - skipped\n", 295}, + {"WARNING: nothing exported\n", 296}, + {"too many entries in pk cache - disabled\n", 297}, + {"too many entries in unk cache - disabled\n", 298}, + {"using secondary key %08lX instead of primary key %08lX\n", 299}, + {"can't open `%s': %s\n", 300}, + {"skipping block of type %d\n", 301}, + {"%lu keys so far processed\n", 302}, + {"error reading `%s': %s\n", 303}, + {"Total number processed: %lu\n", 304}, + {" w/o user IDs: %lu\n", 305}, + {" imported: %lu", 306}, + {" unchanged: %lu\n", 307}, + {" new user IDs: %lu\n", 308}, + {" new subkeys: %lu\n", 309}, + {" new signatures: %lu\n", 310}, + {" new key revocations: %lu\n", 311}, + {" secret keys read: %lu\n", 312}, + {" secret keys imported: %lu\n", 313}, + {" secret keys unchanged: %lu\n", 314}, + {"key %08lX: no user id\n", 315}, + {"key %08lX: no valid user ids\n", 316}, + {"this may be caused by a missing self-signature\n", 317}, + {"key %08lX: public key not found: %s\n", 318}, + {"no default public keyring\n", 319}, + {"writing to `%s'\n", 320}, + {"can't lock keyring `%s': %s\n", 321}, + {"error writing keyring `%s': %s\n", 322}, + {"key %08lX: public key imported\n", 323}, + {"key %08lX: doesn't match our copy\n", 324}, + {"key %08lX: can't locate original keyblock: %s\n", 325}, + {"key %08lX: can't read original keyblock: %s\n", 326}, + {"key %08lX: 1 new user-id\n", 327}, + {"key %08lX: %d new user-ids\n", 328}, + {"key %08lX: 1 new signature\n", 329}, + {"key %08lX: %d new signatures\n", 330}, + {"key %08lX: 1 new subkey\n", 331}, + {"key %08lX: %d new subkeys\n", 332}, + {"key %08lX: not changed\n", 333}, + {"key %08lX: secret key imported\n", 334}, + {"key %08lX: already in secret keyring\n", 335}, + {"key %08lX: secret key not found: %s\n", 336}, + {"key %08lX: no public key - can't apply revocation certificate\n", 337}, + {"key %08lX: invalid revocation certificate: %s - rejected\n", 338}, + {"key %08lX: revocation certificate imported\n", 339}, + {"key %08lX: no user-id for signature\n", 340}, + {"key %08lX: unsupported public key algorithm\n", 341}, + {"key %08lX: invalid self-signature\n", 342}, + {"key %08lX: no subkey for key binding\n", 343}, + {"key %08lX: invalid subkey binding\n", 344}, + {"key %08lX: skipped userid '", 345}, + {"key %08lX: skipped subkey\n", 346}, + {"key %08lX: non exportable signature (class %02x) - skipped\n", 347}, + {"key %08lX: revocation certificate at wrong place - skipped\n", 348}, + {"key %08lX: invalid revocation certificate: %s - skipped\n", 349}, + {"key %08lX: duplicated user ID detected - merged\n", 350}, + {"key %08lX: revocation certificate added\n", 351}, + {"key %08lX: our copy has no self-signature\n", 352}, + {"%s: user not found\n", 353}, + {"[revocation]", 354}, + {"[self-signature]", 355}, + {"1 bad signature\n", 356}, + {"%d bad signatures\n", 357}, + {"1 signature not checked due to a missing key\n", 358}, + {"%d signatures not checked due to missing keys\n", 359}, + {"1 signature not checked due to an error\n", 360}, + {"%d signatures not checked due to errors\n", 361}, + {"1 user id without valid self-signature detected\n", 362}, + {"%d user ids without valid self-signatures detected\n", 363}, + {"Already signed by key %08lX\n", 364}, + {"Nothing to sign with key %08lX\n", 365}, {"\ Are you really sure that you want to sign this key\n\ -with your key: \"", 357}, +with your key: \"", 366}, {"\ The signature will be marked as non-exportable.\n\ -\n", 358}, - {"Really sign? ", 359}, - {"signing failed: %s\n", 360}, - {"This key is not protected.\n", 361}, - {"Key is protected.\n", 362}, - {"Can't edit this key: %s\n", 363}, +\n", 367}, + {"Really sign? ", 368}, + {"signing failed: %s\n", 369}, + {"This key is not protected.\n", 370}, + {"Key is protected.\n", 371}, + {"Can't edit this key: %s\n", 372}, {"\ Enter the new passphrase for this secret key.\n\ -\n", 364}, +\n", 373}, {"\ You don't want a passphrase - this is probably a *bad* idea!\n\ -\n", 365}, - {"Do you really want to do this? ", 366}, - {"moving a key signature to the correct place\n", 367}, - {"quit", 368}, - {"quit this menu", 369}, - {"q", 370}, - {"save", 371}, - {"save and quit", 372}, - {"help", 373}, - {"show this help", 374}, - {"fpr", 375}, - {"show fingerprint", 376}, - {"list", 377}, - {"list key and user ids", 378}, - {"l", 379}, - {"uid", 380}, - {"select user id N", 381}, - {"key", 382}, - {"select secondary key N", 383}, - {"check", 384}, - {"list signatures", 385}, - {"c", 386}, - {"sign", 387}, - {"sign the key", 388}, - {"s", 389}, - {"lsign", 390}, - {"sign the key locally", 391}, - {"debug", 392}, - {"adduid", 393}, - {"add a user id", 394}, - {"deluid", 395}, - {"delete user id", 396}, - {"addkey", 397}, - {"add a secondary key", 398}, - {"delkey", 399}, - {"delete a secondary key", 400}, - {"expire", 401}, - {"change the expire date", 402}, - {"toggle", 403}, - {"toggle between secret and public key listing", 404}, - {"t", 405}, - {"pref", 406}, - {"list preferences", 407}, - {"passwd", 408}, - {"change the passphrase", 409}, - {"trust", 410}, - {"change the ownertrust", 411}, - {"revsig", 412}, - {"revoke signatures", 413}, - {"revkey", 414}, - {"revoke a secondary key", 415}, - {"can't do that in batchmode\n", 416}, - {"Secret key is available.\n", 417}, - {"Command> ", 418}, - {"Need the secret key to do this.\n", 419}, - {"Save changes? ", 420}, - {"Quit without saving? ", 421}, - {"update failed: %s\n", 422}, - {"update secret failed: %s\n", 423}, - {"Key not changed so no update needed.\n", 424}, - {"update of trustdb failed: %s\n", 425}, - {"Really sign all user ids? ", 426}, - {"Hint: Select the user ids to sign\n", 427}, - {"You must select at least one user id.\n", 428}, - {"You can't delete the last user id!\n", 429}, - {"Really remove all selected user ids? ", 430}, - {"Really remove this user id? ", 431}, - {"You must select at least one key.\n", 432}, - {"Do you really want to delete the selected keys? ", 433}, - {"Do you really want to delete this key? ", 434}, - {"Do you really want to revoke the selected keys? ", 435}, - {"Do you really want to revoke this key? ", 436}, - {"Invalid command (try \"help\")\n", 437}, - {"Please remove selections from the secret keys.\n", 438}, - {"Please select at most one secondary key.\n", 439}, - {"Changing exiration time for a secondary key.\n", 440}, - {"Changing exiration time for the primary key.\n", 441}, - {"You can't change the expiration date of a v3 key\n", 442}, - {"No corresponding signature in secret ring\n", 443}, - {"No user id with index %d\n", 444}, - {"No secondary key with index %d\n", 445}, - {"user ID: \"", 446}, +\n", 374}, + {"Do you really want to do this? ", 375}, + {"moving a key signature to the correct place\n", 376}, + {"quit this menu", 377}, + {"q", 378}, + {"save", 379}, + {"save and quit", 380}, + {"help", 381}, + {"show this help", 382}, + {"fpr", 383}, + {"show fingerprint", 384}, + {"list", 385}, + {"list key and user ids", 386}, + {"l", 387}, + {"uid", 388}, + {"select user id N", 389}, + {"key", 390}, + {"select secondary key N", 391}, + {"check", 392}, + {"list signatures", 393}, + {"c", 394}, + {"sign", 395}, + {"sign the key", 396}, + {"s", 397}, + {"lsign", 398}, + {"sign the key locally", 399}, + {"debug", 400}, + {"adduid", 401}, + {"add a user id", 402}, + {"deluid", 403}, + {"delete user id", 404}, + {"addkey", 405}, + {"add a secondary key", 406}, + {"delkey", 407}, + {"delete a secondary key", 408}, + {"delsig", 409}, + {"delete signatures", 410}, + {"expire", 411}, + {"change the expire date", 412}, + {"toggle", 413}, + {"toggle between secret and public key listing", 414}, + {"t", 415}, + {"pref", 416}, + {"list preferences", 417}, + {"passwd", 418}, + {"change the passphrase", 419}, + {"trust", 420}, + {"change the ownertrust", 421}, + {"revsig", 422}, + {"revoke signatures", 423}, + {"revkey", 424}, + {"revoke a secondary key", 425}, + {"can't do that in batchmode\n", 426}, + {"Secret key is available.\n", 427}, + {"Command> ", 428}, + {"Need the secret key to do this.\n", 429}, + {"Save changes? ", 430}, + {"Quit without saving? ", 431}, + {"update failed: %s\n", 432}, + {"update secret failed: %s\n", 433}, + {"Key not changed so no update needed.\n", 434}, + {"update of trustdb failed: %s\n", 435}, + {"Really sign all user ids? ", 436}, + {"Hint: Select the user ids to sign\n", 437}, + {"You must select at least one user id.\n", 438}, + {"You can't delete the last user id!\n", 439}, + {"Really remove all selected user ids? ", 440}, + {"Really remove this user id? ", 441}, + {"You must select at least one key.\n", 442}, + {"Do you really want to delete the selected keys? ", 443}, + {"Do you really want to delete this key? ", 444}, + {"Do you really want to revoke the selected keys? ", 445}, + {"Do you really want to revoke this key? ", 446}, + {"Invalid command (try \"help\")\n", 447}, + {"Delete this good signature? (y/N/q)", 448}, + {"Delete this invalid signature? (y/N/q)", 449}, + {"Delete this unknown signature? (y/N/q)", 450}, + {"Really delete this self-signature? (y/N)", 451}, + {"Deleted %d signature.\n", 452}, + {"Deleted %d signatures.\n", 453}, + {"Nothing deleted.\n", 454}, + {"Please remove selections from the secret keys.\n", 455}, + {"Please select at most one secondary key.\n", 456}, + {"Changing expiration time for a secondary key.\n", 457}, + {"Changing expiration time for the primary key.\n", 458}, + {"You can't change the expiration date of a v3 key\n", 459}, + {"No corresponding signature in secret ring\n", 460}, + {"No user id with index %d\n", 461}, + {"No secondary key with index %d\n", 462}, + {"user ID: \"", 463}, {"\ \"\n\ -signed with your key %08lX at %s\n", 447}, - {"Create a revocation certificate for this signature? (y/N)", 448}, - {"Really create the revocation certificates? (y/N)", 449}, - {"no secret key\n", 450}, - {"public key is %08lX\n", 451}, - {"public key encrypted data: good DEK\n", 452}, - {"public key decryption failed: %s\n", 453}, - {"decryption okay\n", 454}, - {"WARNING: encrypted message has been manipulated!\n", 455}, - {"decryption failed: %s\n", 456}, - {"NOTE: sender requested \"for-your-eyes-only\"\n", 457}, - {"original file name='%.*s'\n", 458}, - {"signature verification suppressed\n", 459}, - {"Signature made %.*s using %s key ID %08lX\n", 460}, - {"BAD signature from \"", 461}, - {"Good signature from \"", 462}, - {" aka \"", 463}, - {"Can't check signature: %s\n", 464}, - {"old style (PGP 2.x) signature\n", 465}, - {"invalid root packet detected in proc_tree()\n", 466}, - {"can't disable core dumps: %s\n", 467}, - {"WARNING: program may create a core file!\n", 468}, - {"Experimental algorithms should not be used!\n", 469}, +signed with your key %08lX at %s\n", 464}, + {"Create a revocation certificate for this signature? (y/N)", 465}, + {"Really create the revocation certificates? (y/N)", 466}, + {"no secret key\n", 467}, + {"public key is %08lX\n", 468}, + {"public key encrypted data: good DEK\n", 469}, + {"public key decryption failed: %s\n", 470}, + {"decryption okay\n", 471}, + {"WARNING: encrypted message has been manipulated!\n", 472}, + {"decryption failed: %s\n", 473}, + {"NOTE: sender requested \"for-your-eyes-only\"\n", 474}, + {"original file name='%.*s'\n", 475}, + {"WARNING: invalid notation data found\n", 476}, + {"Notation: ", 477}, + {"Policy: ", 478}, + {"signature verification suppressed\n", 479}, + {"Signature made %.*s using %s key ID %08lX\n", 480}, + {"BAD signature from \"", 481}, + {"Good signature from \"", 482}, + {" aka \"", 483}, + {"Can't check signature: %s\n", 484}, + {"old style (PGP 2.x) signature\n", 485}, + {"invalid root packet detected in proc_tree()\n", 486}, + {"can't disable core dumps: %s\n", 487}, + {"WARNING: program may create a core file!\n", 488}, + {"Experimental algorithms should not be used!\n", 489}, {"\ RSA keys are deprecated; please consider creating a new key and use this key \ -in the future\n", 470}, - {"this cipher algorithm is depreciated; please use a more standard one!\n", 471}, - {"can't handle public key algorithm %d\n", 472}, - {"subpacket of type %d has critical bit set\n", 473}, +in the future\n", 490}, + {"this cipher algorithm is depreciated; please use a more standard one!\n", 491}, + {"can't handle public key algorithm %d\n", 492}, + {"subpacket of type %d has critical bit set\n", 493}, {"\ \n\ You need a passphrase to unlock the secret key for\n\ -user: \"", 474}, - {"%u-bit %s key, ID %08lX, created %s", 475}, - {" (main key ID %08lX)", 476}, - {"Enter passphrase: ", 477}, - {"Repeat passphrase: ", 478}, - {"data not saved; use option \"--output\" to save it\n", 479}, - {"Please enter name of data file: ", 480}, - {"reading stdin ...\n", 481}, - {"can't open signed data `%s'\n", 482}, - {"anonymous receiver; trying secret key %08lX ...\n", 483}, - {"okay, we are the anonymous recipient.\n", 484}, - {"old encoding of the DEK is not supported\n", 485}, - {"NOTE: cipher algorithm %d not found in preferences\n", 486}, - {"protection algorithm %d is not supported\n", 487}, - {"Invalid passphrase; please try again ...\n", 488}, - {"WARNING: Weak key detected - please change passphrase again.\n", 489}, - {"assuming bad MDC due to an unknown critical bit\n", 490}, - {"\ -this is a PGP generated ElGamal key which is NOT secure for signatures!\n", 491}, - {"public key is %lu second newer than the signature\n", 492}, - {"public key is %lu seconds newer than the signature\n", 493}, - {"NOTE: signature key expired %s\n", 494}, - {"assuming bad signature due to an unknown critical bit\n", 495}, - {"%s signature from: %s\n", 496}, - {"can't create %s: %s\n", 497}, - {"signing:", 498}, - {"WARNING: `%s' is an empty file\n", 499}, - {"can't handle text lines longer than %d characters\n", 500}, - {"input line longer than %d characters\n", 501}, - {"trustdb rec %lu: lseek failed: %s\n", 502}, - {"trustdb rec %lu: write failed (n=%d): %s\n", 503}, - {"trustdb transaction too large\n", 504}, - {"%s: can't access: %s\n", 505}, - {"%s: can't create directory: %s\n", 506}, - {"%s: directory created\n", 507}, - {"%s: directory does not exist!\n", 508}, - {"%s: can't create: %s\n", 509}, - {"%s: can't create lock\n", 510}, - {"%s: failed to create version record: %s", 511}, - {"%s: invalid trustdb created\n", 512}, - {"%s: trustdb created\n", 513}, - {"%s: invalid trustdb\n", 514}, - {"%s: failed to create hashtable: %s\n", 515}, - {"%s: error updating version record: %s\n", 516}, - {"%s: error reading version record: %s\n", 517}, - {"%s: error writing version record: %s\n", 518}, - {"trustdb: lseek failed: %s\n", 519}, - {"trustdb: read failed (n=%d): %s\n", 520}, - {"%s: not a trustdb file\n", 521}, - {"%s: version record with recnum %lu\n", 522}, - {"%s: invalid file version %d\n", 523}, - {"%s: error reading free record: %s\n", 524}, - {"%s: error writing dir record: %s\n", 525}, - {"%s: failed to zero a record: %s\n", 526}, - {"%s: failed to append a record: %s\n", 527}, - {"The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n", 528}, - {"trust record %lu, req type %d: read failed: %s\n", 529}, - {"trust record %lu, type %d: write failed: %s\n", 530}, - {"trust record %lu: delete failed: %s\n", 531}, - {"trustdb: sync failed: %s\n", 532}, - {"error reading dir record for LID %lu: %s\n", 533}, - {"lid %lu: expected dir record, got type %d\n", 534}, - {"no primary key for LID %lu\n", 535}, - {"error reading primary key for LID %lu: %s\n", 536}, - {"get_dir_record: search_record failed: %s\n", 537}, - {"NOTE: secret key %08lX is NOT protected.\n", 538}, - {"key %08lX: secret key without public key - skipped\n", 539}, - {"key %08lX: secret and public key don't match\n", 540}, - {"key %08lX: can't put it into the trustdb\n", 541}, - {"key %08lX: query record failed\n", 542}, - {"key %08lX: already in trusted key table\n", 543}, - {"key %08lX: accepted as trusted key.\n", 544}, - {"enumerate secret keys failed: %s\n", 545}, - {"NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n", 546}, - {"NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n", 547}, - {"sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n", 548}, - {"lid %lu: no primary key\n", 549}, - {"lid %lu: user id not found in keyblock\n", 550}, - {"lid %lu: user id without signature\n", 551}, - {"lid %lu: self-signature in hintlist\n", 552}, - {"Valid certificate revocation", 553}, - {"Good certificate", 554}, - {"very strange: no public key\n", 555}, - {"hintlist %lu[%d] of %lu does not point to a dir record\n", 556}, - {"lid %lu does not have a key\n", 557}, - {"lid %lu: can't get keyblock: %s\n", 558}, - {"tdbio_search_dir failed: %s\n", 559}, - {"key %08lX.%lu: Good subkey binding\n", 560}, - {"key %08lX.%lu: Invalid subkey binding: %s\n", 561}, - {"key %08lX.%lu: Valid key revocation\n", 562}, - {"key %08lX.%lu: Invalid key revocation: %s\n", 563}, - {"key %08lX.%lu: Valid subkey revocation\n", 564}, - {"Good self-signature", 565}, - {"Invalid self-signature", 566}, - {"Valid user ID revocation skipped due to a newer self signature\n", 567}, - {"Valid user ID revocation\n", 568}, - {"Invalid user ID revocation", 569}, - {"Too many preferences", 570}, - {"Too many preference items", 571}, - {"WARNING: can't yet handle long pref records\n", 572}, - {"duplicated certificate - deleted", 573}, - {"public key not anymore available", 574}, - {"Invalid certificate revocation", 575}, - {"Invalid certificate", 576}, - {"uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n", 577}, - {"sig record %lu[%d] points to wrong record.\n", 578}, - {"insert_trust_record: keyblock not found: %s\n", 579}, - {"Ooops, no keys\n", 580}, - {"Ooops, no user ids\n", 581}, - {"lid ?: insert failed: %s\n", 582}, - {"lid %lu: insert failed: %s\n", 583}, - {"lid %lu: inserted\n", 584}, - {"lid %lu: update failed: %s\n", 585}, - {"lid %lu: updated\n", 586}, - {"lid %lu: okay\n", 587}, - {"%lu keys processed\n", 588}, - {"\t%lu keys with errors\n", 589}, - {"\t%lu keys updated\n", 590}, - {"\t%lu keys inserted\n", 591}, - {"enumerate keyblocks failed: %s\n", 592}, - {"%s: keyblock read problem: %s\n", 593}, - {"%s: update failed: %s\n", 594}, - {"%s: updated\n", 595}, - {"%s: okay\n", 596}, - {"lid %lu: dir record w/o key - skipped\n", 597}, - {"lid %lu: keyblock not found: %s\n", 598}, - {"\t%lu keys skipped\n", 599}, - {"check_trust: search dir record failed: %s\n", 600}, - {"key %08lX: insert trust record failed: %s\n", 601}, - {"key %08lX.%lu: inserted into trustdb\n", 602}, - {"key %08lX.%lu: created in future (time warp or clock problem)\n", 603}, - {"key %08lX.%lu: expired at %s\n", 604}, - {"key %08lX.%lu: trust check failed: %s\n", 605}, - {"user '%s' not found: %s\n", 606}, - {"problem finding '%s' in trustdb: %s\n", 607}, - {"user '%s' not in trustdb - inserting\n", 608}, - {"failed to put '%s' into trustdb: %s\n", 609}, - {"%s: can't create keyring: %s\n", 610}, - {"%s: keyring created\n", 611}, - {"WARNING: 2 files with confidential information exists.\n", 612}, - {"%s is the unchanged one\n", 613}, - {"%s is the new one\n", 614}, - {"Please fix this possible security flaw\n", 615}, - {"key is not flagged as insecure - can't use it with the faked RNG!\n", 616}, - {"skipped `%s': %s\n", 617}, +user: \"", 494}, + {"%u-bit %s key, ID %08lX, created %s", 495}, + {" (main key ID %08lX)", 496}, + {"Enter passphrase: ", 497}, + {"Repeat passphrase: ", 498}, + {"data not saved; use option \"--output\" to save it\n", 499}, + {"Please enter name of data file: ", 500}, + {"reading stdin ...\n", 501}, + {"can't open signed data `%s'\n", 502}, + {"anonymous receiver; trying secret key %08lX ...\n", 503}, + {"okay, we are the anonymous recipient.\n", 504}, + {"old encoding of the DEK is not supported\n", 505}, + {"NOTE: cipher algorithm %d not found in preferences\n", 506}, + {"protection algorithm %d is not supported\n", 507}, + {"Invalid passphrase; please try again ...\n", 508}, + {"WARNING: Weak key detected - please change passphrase again.\n", 509}, + {"assuming bad MDC due to an unknown critical bit\n", 510}, + {"\ +this is a PGP generated ElGamal key which is NOT secure for signatures!\n", 511}, + {"public key is %lu second newer than the signature\n", 512}, + {"public key is %lu seconds newer than the signature\n", 513}, + {"NOTE: signature key expired %s\n", 514}, + {"assuming bad signature due to an unknown critical bit\n", 515}, + {"%s signature from: %s\n", 516}, + {"can't create %s: %s\n", 517}, + {"signing:", 518}, + {"WARNING: `%s' is an empty file\n", 519}, + {"can't handle text lines longer than %d characters\n", 520}, + {"input line longer than %d characters\n", 521}, + {"trustdb rec %lu: lseek failed: %s\n", 522}, + {"trustdb rec %lu: write failed (n=%d): %s\n", 523}, + {"trustdb transaction too large\n", 524}, + {"%s: can't access: %s\n", 525}, + {"%s: can't create directory: %s\n", 526}, + {"%s: directory created\n", 527}, + {"%s: directory does not exist!\n", 528}, + {"%s: can't create: %s\n", 529}, + {"%s: can't create lock\n", 530}, + {"%s: failed to create version record: %s", 531}, + {"%s: invalid trustdb created\n", 532}, + {"%s: trustdb created\n", 533}, + {"%s: invalid trustdb\n", 534}, + {"%s: failed to create hashtable: %s\n", 535}, + {"%s: error updating version record: %s\n", 536}, + {"%s: error reading version record: %s\n", 537}, + {"%s: error writing version record: %s\n", 538}, + {"trustdb: lseek failed: %s\n", 539}, + {"trustdb: read failed (n=%d): %s\n", 540}, + {"%s: not a trustdb file\n", 541}, + {"%s: version record with recnum %lu\n", 542}, + {"%s: invalid file version %d\n", 543}, + {"%s: error reading free record: %s\n", 544}, + {"%s: error writing dir record: %s\n", 545}, + {"%s: failed to zero a record: %s\n", 546}, + {"%s: failed to append a record: %s\n", 547}, + {"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n", 548}, + {"trust record %lu, req type %d: read failed: %s\n", 549}, + {"trust record %lu, type %d: write failed: %s\n", 550}, + {"trust record %lu: delete failed: %s\n", 551}, + {"trustdb: sync failed: %s\n", 552}, + {"error reading dir record for LID %lu: %s\n", 553}, + {"lid %lu: expected dir record, got type %d\n", 554}, + {"no primary key for LID %lu\n", 555}, + {"error reading primary key for LID %lu: %s\n", 556}, + {"get_dir_record: search_record failed: %s\n", 557}, + {"NOTE: secret key %08lX is NOT protected.\n", 558}, + {"key %08lX: secret key without public key - skipped\n", 559}, + {"key %08lX: secret and public key don't match\n", 560}, + {"key %08lX: can't put it into the trustdb\n", 561}, + {"key %08lX: query record failed\n", 562}, + {"key %08lX: already in trusted key table\n", 563}, + {"key %08lX: accepted as trusted key.\n", 564}, + {"enumerate secret keys failed: %s\n", 565}, + {"NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n", 566}, + {"NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n", 567}, + {"sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n", 568}, + {"lid %lu: no primary key\n", 569}, + {"lid %lu: user id not found in keyblock\n", 570}, + {"lid %lu: user id without signature\n", 571}, + {"lid %lu: self-signature in hintlist\n", 572}, + {"Valid certificate revocation", 573}, + {"Good certificate", 574}, + {"very strange: no public key\n", 575}, + {"hintlist %lu[%d] of %lu does not point to a dir record\n", 576}, + {"lid %lu does not have a key\n", 577}, + {"lid %lu: can't get keyblock: %s\n", 578}, + {"tdbio_search_dir failed: %s\n", 579}, + {"key %08lX.%lu: Good subkey binding\n", 580}, + {"key %08lX.%lu: Invalid subkey binding: %s\n", 581}, + {"key %08lX.%lu: Valid key revocation\n", 582}, + {"key %08lX.%lu: Invalid key revocation: %s\n", 583}, + {"key %08lX.%lu: Valid subkey revocation\n", 584}, + {"Good self-signature", 585}, + {"Invalid self-signature", 586}, + {"Valid user ID revocation skipped due to a newer self signature\n", 587}, + {"Valid user ID revocation\n", 588}, + {"Invalid user ID revocation", 589}, + {"Too many preferences", 590}, + {"Too many preference items", 591}, + {"WARNING: can't yet handle long pref records\n", 592}, + {"duplicated certificate - deleted", 593}, + {"public key not anymore available", 594}, + {"Invalid certificate revocation", 595}, + {"Invalid certificate", 596}, + {"uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n", 597}, + {"sig record %lu[%d] points to wrong record.\n", 598}, + {"insert_trust_record: keyblock not found: %s\n", 599}, + {"Ooops, no keys\n", 600}, + {"Ooops, no user ids\n", 601}, + {"lid ?: insert failed: %s\n", 602}, + {"lid %lu: insert failed: %s\n", 603}, + {"lid %lu: inserted\n", 604}, + {"lid %lu: update failed: %s\n", 605}, + {"lid %lu: updated\n", 606}, + {"lid %lu: okay\n", 607}, + {"%lu keys processed\n", 608}, + {"\t%lu keys with errors\n", 609}, + {"\t%lu keys updated\n", 610}, + {"\t%lu keys inserted\n", 611}, + {"enumerate keyblocks failed: %s\n", 612}, + {"%s: keyblock read problem: %s\n", 613}, + {"%s: update failed: %s\n", 614}, + {"%s: updated\n", 615}, + {"%s: okay\n", 616}, + {"lid %lu: dir record w/o key - skipped\n", 617}, + {"lid %lu: keyblock not found: %s\n", 618}, + {"\t%lu keys skipped\n", 619}, + {"check_trust: search dir record failed: %s\n", 620}, + {"key %08lX: insert trust record failed: %s\n", 621}, + {"key %08lX.%lu: inserted into trustdb\n", 622}, + {"key %08lX.%lu: created in future (time warp or clock problem)\n", 623}, + {"key %08lX.%lu: expired at %s\n", 624}, + {"key %08lX.%lu: trust check failed: %s\n", 625}, + {"user '%s' not found: %s\n", 626}, + {"problem finding '%s' in trustdb: %s\n", 627}, + {"user '%s' not in trustdb - inserting\n", 628}, + {"failed to put '%s' into trustdb: %s\n", 629}, + {"%s: can't create keyring: %s\n", 630}, + {"%s: keyring created\n", 631}, + {"WARNING: 2 files with confidential information exists.\n", 632}, + {"%s is the unchanged one\n", 633}, + {"%s is the new one\n", 634}, + {"Please fix this possible security flaw\n", 635}, + {"key is not flagged as insecure - can't use it with the faked RNG!\n", 636}, + {"skipped `%s': %s\n", 637}, {"\ skipped `%s': this is a PGP generated ElGamal key which is not secure for \ -signatures!\n", 618}, - {"File `%s' exists. ", 619}, - {"Overwrite (y/N)? ", 620}, - {"writing to stdout\n", 621}, - {"assuming signed data in `%s'\n", 622}, - {"%s: new options file created\n", 623}, - {"%s encrypted data\n", 624}, - {"encrypted with unknown algorithm %d\n", 625}, - {"\ -WARNING: message was encrypted with a weak key in the symmetric cipher.\n", 626}, - {"weak key created - retrying\n", 627}, - {"cannot avoid weak key for symmetric cipher; tried %d times!\n", 628}, - {"edit_ownertrust.value", 629}, - {"revoked_key.override", 630}, - {"untrusted_key.override", 631}, - {"pklist.user_id.enter", 632}, - {"keygen.algo", 633}, - {"keygen.algo.elg_se", 634}, - {"keygen.size", 635}, - {"keygen.size.huge.okay", 636}, - {"keygen.size.large.okay", 637}, - {"keygen.valid", 638}, - {"keygen.valid.okay", 639}, - {"keygen.name", 640}, - {"keygen.email", 641}, - {"keygen.comment", 642}, - {"keygen.userid.cmd", 643}, - {"keygen.sub.okay", 644}, - {"sign_uid.okay", 645}, - {"change_passwd.empty.okay", 646}, - {"keyedit.cmd", 647}, - {"keyedit.save.okay", 648}, - {"keyedit.cancel.okay", 649}, - {"keyedit.sign_all.okay", 650}, - {"keyedit.remove.uid.okay", 651}, - {"keyedit.remove.subkey.okay", 652}, - {"passphrase.enter", 653}, - {"passphrase.repeat", 654}, - {"detached_signature.filename", 655}, - {"openfile.overwrite.okay", 656}, - {"No help available", 657}, - {"No help available for `%s'", 658}, +signatures!\n", 638}, + {"File `%s' exists. ", 639}, + {"Overwrite (y/N)? ", 640}, + {"%s: unknown suffix\n", 641}, + {"writing to stdout\n", 642}, + {"assuming signed data in `%s'\n", 643}, + {"%s: new options file created\n", 644}, + {"%s encrypted data\n", 645}, + {"encrypted with unknown algorithm %d\n", 646}, + {"\ +WARNING: message was encrypted with a weak key in the symmetric cipher.\n", 647}, + {"weak key created - retrying\n", 648}, + {"cannot avoid weak key for symmetric cipher; tried %d times!\n", 649}, + {"edit_ownertrust.value", 650}, + {"revoked_key.override", 651}, + {"untrusted_key.override", 652}, + {"pklist.user_id.enter", 653}, + {"keygen.algo", 654}, + {"keygen.algo.elg_se", 655}, + {"keygen.size", 656}, + {"keygen.size.huge.okay", 657}, + {"keygen.size.large.okay", 658}, + {"keygen.valid", 659}, + {"keygen.valid.okay", 660}, + {"keygen.name", 661}, + {"keygen.email", 662}, + {"keygen.comment", 663}, + {"keygen.userid.cmd", 664}, + {"keygen.sub.okay", 665}, + {"sign_uid.okay", 666}, + {"change_passwd.empty.okay", 667}, + {"keyedit.cmd", 668}, + {"keyedit.save.okay", 669}, + {"keyedit.cancel.okay", 670}, + {"keyedit.sign_all.okay", 671}, + {"keyedit.remove.uid.okay", 672}, + {"keyedit.remove.subkey.okay", 673}, + {"keyedit.delsig.valid", 674}, + {"keyedit.delsig.unknown", 675}, + {"keyedit.delsig.invalid", 676}, + {"keyedit.delsig.selfsig", 677}, + {"passphrase.enter", 678}, + {"passphrase.repeat", 679}, + {"detached_signature.filename", 680}, + {"openfile.overwrite.okay", 681}, + {"No help available", 682}, + {"No help available for `%s'", 683}, }; -int _msg_tbl_length = 658; +int _msg_tbl_length = 683; diff -urN gnupg-0.9.7/po/de.po gnupg-0.9.8/po/de.po --- gnupg-0.9.7/po/de.po Sun May 23 20:02:45 1999 +++ gnupg-0.9.8/po/de.po Sat Jun 26 13:07:25 1999 @@ -3,8 +3,8 @@ # Walter Koch , 1998. msgid "" msgstr "" -"POT-Creation-Date: 1999-05-23 15:36+0200\n" -"PO-Revision-Date: 1999-05-08 20:24+0200\n" +"POT-Creation-Date: 1999-06-26 11:22+0200\n" +"PO-Revision-Date: 1999-05-30 21:56+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -26,14 +26,22 @@ msgstr "" "(mЖglicherweise haben Sie das falsche Programm fЭr diese Aufgabe benutzt)\n" -#: util/miscutil.c:156 +#: util/miscutil.c:156 util/miscutil.c:173 msgid "yes" msgstr "ja" -#: util/miscutil.c:157 +#: util/miscutil.c:157 util/miscutil.c:175 msgid "yY" msgstr "jJyY" +#: g10/keyedit.c:559 util/miscutil.c:174 +msgid "quit" +msgstr "quit" + +#: util/miscutil.c:176 +msgid "qQ" +msgstr "qQ" + #: util/errors.c:54 msgid "general error" msgstr "Allgemeiner Fehler" @@ -254,7 +262,7 @@ "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n" "\n" -#: cipher/rndlinux.c:110 +#: cipher/rndlinux.c:135 #, c-format msgid "" "\n" @@ -266,7 +274,7 @@ "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte benЖtigt.)\n" -#: g10/g10.c:165 +#: g10/g10.c:174 msgid "" "@Commands:\n" " " @@ -274,131 +282,131 @@ "@Befehle:\n" " " -#: g10/g10.c:167 +#: g10/g10.c:176 msgid "|[file]|make a signature" -msgstr "|[file]|Eine Unterschrift erzeugen" +msgstr "|[Datei]|Eine Unterschrift erzeugen" -#: g10/g10.c:168 +#: g10/g10.c:177 msgid "|[file]|make a clear text signature" -msgstr "|[file]|Eine Klartextunterschrift erzeugen" +msgstr "|[Datei]|Eine Klartextunterschrift erzeugen" -#: g10/g10.c:169 +#: g10/g10.c:178 msgid "make a detached signature" msgstr "Eine abgetrennte Unterschrift erzeugen" -#: g10/g10.c:170 +#: g10/g10.c:179 msgid "encrypt data" msgstr "Daten verschlЭsseln" -#: g10/g10.c:171 +#: g10/g10.c:180 msgid "encryption only with symmetric cipher" msgstr "Daten symmetrisch verschlЭsseln" -#: g10/g10.c:172 +#: g10/g10.c:181 msgid "store only" msgstr "Nur speichern" -#: g10/g10.c:173 +#: g10/g10.c:182 msgid "decrypt data (default)" msgstr "Daten entschlЭsseln (Voreinstellung)" -#: g10/g10.c:174 +#: g10/g10.c:183 msgid "verify a signature" msgstr "Signatur prЭfen" -#: g10/g10.c:175 +#: g10/g10.c:184 msgid "list keys" msgstr "Liste der SchlЭssel" -#: g10/g10.c:177 +#: g10/g10.c:186 msgid "list keys and signatures" msgstr "Liste der SchlЭssel und ihrer Signaturen" -#: g10/g10.c:178 +#: g10/g10.c:187 msgid "check key signatures" msgstr "Signaturen der SchlЭssel prЭfen" -#: g10/g10.c:179 +#: g10/g10.c:188 msgid "list keys and fingerprints" msgstr "Liste der SchlЭssel und ihrer \"FingerabdrЭcke\"" -#: g10/g10.c:180 +#: g10/g10.c:189 msgid "list secret keys" msgstr "Liste der geheimen SchlЭssel" -#: g10/g10.c:181 +#: g10/g10.c:190 msgid "generate a new key pair" msgstr "Ein neues SchlЭsselpaar erzeugen" -#: g10/g10.c:182 +#: g10/g10.c:191 msgid "remove key from the public keyring" msgstr "SchlЭssel entfernen" -#: g10/g10.c:183 +#: g10/g10.c:192 msgid "sign or edit a key" msgstr "Unterschreiben oder Bearbeiten eines SchlЭssels" -#: g10/g10.c:184 +#: g10/g10.c:193 msgid "generate a revocation certificate" msgstr "Ein SchlЭsselwiderruf-Zertifikat erzeugen" -#: g10/g10.c:185 +#: g10/g10.c:194 msgid "export keys" msgstr "SchlЭssel exportieren" -#: g10/g10.c:186 +#: g10/g10.c:195 msgid "export keys to a key server" msgstr "SchlЭssel zu einem SchlЭsselserver exportieren" -#: g10/g10.c:187 +#: g10/g10.c:196 msgid "import keys from a key server" msgstr "SchlЭssel von einem SchlЭsselserver importieren" -#: g10/g10.c:190 +#: g10/g10.c:199 msgid "import/merge keys" msgstr "SchlЭssel importieren/kombinieren" -#: g10/g10.c:192 +#: g10/g10.c:201 msgid "list only the sequence of packets" msgstr "Lediglich die Struktur der Datenpakete anzeigen" -#: g10/g10.c:194 +#: g10/g10.c:203 msgid "export the ownertrust values" msgstr "Exportieren der \"Owner trust\" Werte" -#: g10/g10.c:196 +#: g10/g10.c:205 msgid "import ownertrust values" msgstr "Importieren der \"Owner trust\" Werte" -#: g10/g10.c:198 +#: g10/g10.c:207 msgid "|[NAMES]|update the trust database" -msgstr "|[NAMES]|дndern der \"Trust\"-Datenbank" +msgstr "|[NAMEN]|дndern der \"Trust\"-Datenbank" -#: g10/g10.c:200 +#: g10/g10.c:209 msgid "|[NAMES]|check the trust database" -msgstr "|[NAMES]|эberprЭfen der \"Trust\"-Datenbank" +msgstr "|[NAMEN]|эberprЭfen der \"Trust\"-Datenbank" -#: g10/g10.c:201 +#: g10/g10.c:210 msgid "fix a corrupted trust database" msgstr "Reparieren einer beschДdigten \"Trust\"-Datenbank" -#: g10/g10.c:202 +#: g10/g10.c:211 msgid "De-Armor a file or stdin" msgstr "Datei oder stdin von der ASCII-HЭlle befreien" -#: g10/g10.c:203 +#: g10/g10.c:212 msgid "En-Armor a file or stdin" msgstr "Datei oder stdin in eine ASCII-HЭlle einpacken" -#: g10/g10.c:204 +#: g10/g10.c:213 msgid "|algo [files]|print message digests" -msgstr "|algo [files]|Message-Digests fЭr die Dateien ausgeben" +msgstr "|algo [Dateien]|Message-Digests fЭr die Dateien ausgeben" -#: g10/g10.c:205 +#: g10/g10.c:214 msgid "print all message digests" msgstr "Message-Digests fЭr die Eingabedaten ausgeben" -#: g10/g10.c:211 +#: g10/g10.c:220 msgid "" "@\n" "Options:\n" @@ -408,148 +416,160 @@ "Optionen:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:222 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-HЭlle versehen" -#: g10/g10.c:214 +#: g10/g10.c:223 msgid "|NAME|encrypt for NAME" -msgstr "|NAME|verschlЭsseln fЭr NAME" +msgstr "|NAME|VerschlЭsseln fЭr NAME" -#: g10/g10.c:218 +#: g10/g10.c:227 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:219 +#: g10/g10.c:228 msgid "|N|set compress level N (0 disables)" msgstr "Kompressionsstufe auf N setzen (0=keine Kompr.)" -#: g10/g10.c:221 +#: g10/g10.c:230 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:222 +#: g10/g10.c:231 msgid "use as output file" msgstr "Als Ausgabedatei benutzen" -#: g10/g10.c:223 +#: g10/g10.c:232 msgid "verbose" msgstr "Detaillierte Informationen" -#: g10/g10.c:224 +#: g10/g10.c:233 msgid "be somewhat more quiet" msgstr "Etwas weniger Infos" -#: g10/g10.c:225 +#: g10/g10.c:234 +msgid "don't use the terminal at all" +msgstr "" + +#: g10/g10.c:235 msgid "force v3 signatures" msgstr "v3 Signaturen erzwingen" -#: g10/g10.c:226 +#: g10/g10.c:236 msgid "always use a MDC for encryption" -msgstr "Beim VerschlЭssen ein Siegel (MDC) verwenden" +msgstr "Beim VerschlЭsseln ein Siegel (MDC) verwenden" -#: g10/g10.c:227 +#: g10/g10.c:237 msgid "do not make any changes" msgstr "Keine wirklichen дnderungen durchfЭhren" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:229 +#: g10/g10.c:239 msgid "batch mode: never ask" msgstr "Stapelmodus: Keine Abfragen" -#: g10/g10.c:230 +#: g10/g10.c:240 msgid "assume yes on most questions" msgstr "\"Ja\" als Standardantwort annehmen" -#: g10/g10.c:231 +#: g10/g10.c:241 msgid "assume no on most questions" msgstr "\"Nein\" als Standardantwort annehmen" -#: g10/g10.c:232 +#: g10/g10.c:242 msgid "add this keyring to the list of keyrings" msgstr "Als Жffentlichen SchlЭsselbund mitbenutzen" -#: g10/g10.c:233 +#: g10/g10.c:243 msgid "add this secret keyring to the list" msgstr "Als geheimen SchlЭsselbund mitbenutzen" -#: g10/g10.c:234 +#: g10/g10.c:244 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|NAME als voreingestellten SchlЭssel benutzen" -#: g10/g10.c:235 +#: g10/g10.c:245 msgid "|HOST|use this keyserver to lookup keys" -msgstr "|HOST|SchlЭssel bei diesen Server nachschlagen" +msgstr "|HOST|SchlЭssel bei diesem Server nachschlagen" -#: g10/g10.c:236 +#: g10/g10.c:246 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|Terminalzeichensatz NAME benutzen" -#: g10/g10.c:237 +#: g10/g10.c:247 msgid "read options from file" msgstr "Optionen aus der Datei lesen" -#: g10/g10.c:239 +#: g10/g10.c:249 msgid "set debugging flags" msgstr "Debug-Flags einschalten" -#: g10/g10.c:240 +#: g10/g10.c:250 msgid "enable full debugging" msgstr "Alle Debug-Flags einschalten" -#: g10/g10.c:241 +#: g10/g10.c:251 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben" -#: g10/g10.c:242 +#: g10/g10.c:252 msgid "do not write comment packets" msgstr "Keine Kommentarpakete schreiben" -#: g10/g10.c:243 +#: g10/g10.c:253 msgid "(default is 1)" msgstr "BenЖtigte Vollvertrauen (Voreinstellung 1)" -#: g10/g10.c:244 +#: g10/g10.c:254 msgid "(default is 3)" msgstr "BenЖtigte Teilvertrauen (Voreinstellung 3)" -#: g10/g10.c:246 +#: g10/g10.c:256 msgid "|FILE|load extension module FILE" -msgstr "|FILE|Erweiterungsmodul DATEI laden" +msgstr "|DATEI|Erweiterungsmodul DATEI laden" -#: g10/g10.c:247 +#: g10/g10.c:257 msgid "emulate the mode described in RFC1991" msgstr "Den in RFC1991 beschriebenen Modus nachahmen" -#: g10/g10.c:248 +#: g10/g10.c:258 +msgid "set all packet, cipher and digest options to OpenPGP behavior" +msgstr "" + +#: g10/g10.c:259 msgid "|N|use passphrase mode N" msgstr "|N|Verwenden des Mantra-Modus N" -#: g10/g10.c:250 +#: g10/g10.c:261 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|Das Hashverfahren NAME fЭr Mantras benutzen" -#: g10/g10.c:252 +#: g10/g10.c:263 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|Das VerschlЭ.verfahren NAME fЭr Mantras benutzen" -#: g10/g10.c:253 +#: g10/g10.c:264 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|Das VerschlЭ.verfahren NAME benutzen" -#: g10/g10.c:254 +#: g10/g10.c:265 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|Das Hashverfahren NAME benutzen" -#: g10/g10.c:255 +#: g10/g10.c:266 msgid "|N|use compress algorithm N" msgstr "|N|Die Komprimierverfahren N benutzen" -#: g10/g10.c:256 +#: g10/g10.c:267 msgid "throw keyid field of encrypted packets" -msgstr "entferne die Absender-ID verschlЭsselter Pakete" +msgstr "Entferne die Absender-ID verschlЭsselter Pakete" -#: g10/g10.c:258 +#: g10/g10.c:268 +msgid "|NAME=VALUE|use this notation data" +msgstr "|NAME=WERT|verwende diese \"notation\"-Daten" + +#: g10/g10.c:270 msgid "" "@\n" "Examples:\n" @@ -569,15 +589,15 @@ " --list-keys [Namen] SchlЭssel anzeigen\n" " --fingerprint [Namen] \"FingerabdrЭcke\" anzeigen\n" -#: g10/g10.c:327 +#: g10/g10.c:347 msgid "Please report bugs to .\n" msgstr "Berichte Эber Bugs (Programmfehler) bitte an .\n" -#: g10/g10.c:331 +#: g10/g10.c:351 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h fЭr Hilfe)" -#: g10/g10.c:334 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -587,7 +607,7 @@ "Signieren, prЭfen, verschlЭsseln, entschlЭsseln\n" "Die voreingestellte Operation ist abhДngig von den Eingabedaten\n" -#: g10/g10.c:339 +#: g10/g10.c:359 msgid "" "\n" "Supported algorithms:\n" @@ -595,149 +615,177 @@ "\n" "UnterstЭtzte Verfahren:\n" -#: g10/g10.c:413 +#: g10/g10.c:433 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:453 +#: g10/g10.c:473 msgid "conflicting commands\n" msgstr "WidersprЭchliche Befehle\n" -#: g10/g10.c:580 +#: g10/g10.c:605 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:584 +#: g10/g10.c:609 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:591 +#: g10/g10.c:616 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:737 +#: g10/g10.c:782 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gЭltiger Zeichensatz.\n" -#: g10/g10.c:780 g10/g10.c:792 +#: g10/g10.c:827 g10/g10.c:839 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewДhlte VerschlЭsslungsverfahren ist ungЭltig\n" -#: g10/g10.c:786 g10/g10.c:798 +#: g10/g10.c:833 g10/g10.c:845 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewДhlte Hashverfahren ist ungЭltig\n" -#: g10/g10.c:801 +#: g10/g10.c:849 +msgid "the given policy URL is invalid\n" +msgstr "Die angegebene URL fЭr Richtlinien ist ungЭltig\n" + +#: g10/g10.c:852 #, 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:803 +#: g10/g10.c:854 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed mЭssen grЖъer als 0 sein\n" -#: g10/g10.c:805 +#: g10/g10.c:856 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed mЭssen grЖъer als 1 sein\n" -#: g10/g10.c:807 +#: g10/g10.c:858 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:810 +#: g10/g10.c:861 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:814 +#: g10/g10.c:865 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:891 +#: g10/g10.c:942 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:897 +#: g10/g10.c:948 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:904 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:912 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:925 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:938 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:952 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:964 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:973 +#: g10/g10.c:1024 msgid "--edit-key username [commands]" msgstr "--edit-key Username [Befehle]" -#: g10/g10.c:987 +#: g10/g10.c:1038 msgid "--delete-secret-key username" msgstr "--delete-secret-key Username" -#: g10/g10.c:990 +#: g10/g10.c:1041 msgid "--delete-key username" msgstr "--delete-key Benutzername" -#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311 +#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "'%s' kann nicht geЖffnet werden: %s\n" -#: g10/g10.c:1024 +#: g10/g10.c:1075 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [Benutzername] [Keyring]" -#: g10/g10.c:1083 +#: g10/g10.c:1134 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-HЭlle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1091 +#: g10/g10.c:1142 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-HЭlle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1157 +#: g10/g10.c:1208 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "UngЭltiges Hashverfahren '%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1283 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:1236 +#: g10/g10.c:1287 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "'%s' kann nicht geЖffnet werden\n" +#: g10/g10.c:1457 +msgid "" +"the first character of a notation name must be a letter or an underscore\n" +msgstr "" +"Das erste Zeichen eines \"notation\"-Namens muъ ein Buchstabe oder\n" +"ein Unterstrich sein\n" + +#: g10/g10.c:1463 +msgid "" +"a notation name must have only letters, digits, dots or underscores and end " +"with an '='\n" +msgstr "" +"Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " +"enthalten und muъ mit einem '=' enden\n" + +#: g10/g10.c:1469 +msgid "dots in a notation name must be surrounded by other characters\n" +msgstr "" +"Punkte in einem \"notation\"-Namen mЭssen von anderen Zeichen umgeben sein\n" + +#: g10/g10.c:1477 +msgid "a notation value must not use any control characters\n" +msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" + #: g10/armor.c:296 #, c-format msgid "armor: %s\n" @@ -1016,12 +1064,17 @@ " Es ist nicht sicher, daъ die Signatur wirklich dem vorgeblichen " "Besitzer gehЖrt.\n" -#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673 +#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: Эbersprungen: %s\n" -#: g10/pkclist.c:591 +#: g10/pkclist.c:588 g10/pkclist.c:687 +#, fuzzy, c-format +msgid "%s: skipped: public key already present\n" +msgstr "%s: SchlЭsselblock Leseproblem: %s\n" + +#: g10/pkclist.c:611 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1029,20 +1082,20 @@ "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n" "\n" -#: g10/pkclist.c:596 +#: g10/pkclist.c:616 msgid "Enter the user ID: " msgstr "Geben Sie die User-ID ein: " -#: g10/pkclist.c:607 +#: g10/pkclist.c:627 msgid "No such user ID.\n" msgstr "Keine solche User-ID vorhanden.\n" -#: g10/pkclist.c:653 +#: g10/pkclist.c:673 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: Fehler beim PrЭfen des SchlЭssels: %s\n" -#: g10/pkclist.c:679 +#: g10/pkclist.c:711 msgid "no valid addressees\n" msgstr "Keine gЭltigen Adressaten\n" @@ -1287,7 +1340,7 @@ "Sie benЖtigen ein Mantra, um den geheimen SchlЭssel zu schЭtzen.\n" "\n" -#: g10/keyedit.c:433 g10/keygen.c:748 +#: g10/keyedit.c:455 g10/keygen.c:748 msgid "passphrase not correctly repeated; try again.\n" msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n" @@ -1325,7 +1378,8 @@ msgstr "Der DSA SchlЭssel wird 1024 Bits haben.\n" #: g10/keygen.c:859 -msgid "Key generation cancelled.\n" +#, fuzzy +msgid "Key generation canceled.\n" msgstr "SchlЭsselerzeugung abgebrochen.\n" #: g10/keygen.c:869 @@ -1356,7 +1410,7 @@ msgid "Key generation failed: %s\n" msgstr "SchlЭsselerzeugung fehlgeschlagen: %s\n" -#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52 +#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1364,7 +1418,7 @@ "Der SchlЭssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren " "stimmen nicht Эberein)\n" -#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54 +#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1376,7 +1430,7 @@ msgid "Really create? " msgstr "Wirklich erzeugen? " -#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467 +#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467 #: g10/tdbio.c:528 #, c-format msgid "%s: can't open: %s\n" @@ -1397,7 +1451,7 @@ msgid "reading from `%s'\n" msgstr "Lesen von '%s'\n" -#: g10/encode.c:417 +#: g10/encode.c:431 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s verschlЭsselt fЭr: %s\n" @@ -1436,7 +1490,7 @@ "der ZweitschlЭssel %08lX wird anstelle des HauptschlЭssels %08lX verwendet\n" #: g10/import.c:116 -#, fuzzy, c-format +#, c-format msgid "can't open `%s': %s\n" msgstr "'%s' kann nicht geЖffnet werden: %s\n" @@ -1451,9 +1505,9 @@ msgstr "%lu SchlЭssel bislang bearbeitet\n" #: g10/import.c:172 -#, fuzzy, c-format +#, c-format msgid "error reading `%s': %s\n" -msgstr "Fehler beim Lesen des Schl.Satzes: %s\n" +msgstr "Fehler beim Lesen von `%s': %s\n" #: g10/import.c:175 #, c-format @@ -1533,20 +1587,20 @@ msgid "no default public keyring\n" msgstr "Kein voreingestellter Жffentlicher SchlЭsselbund\n" -#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501 +#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "Schreiben nach '%s'\n" -#: g10/import.c:379 g10/import.c:435 -#, fuzzy -msgid "can't lock keyring `%': %s\n" -msgstr "kann Жffentlichen SchlЭsselbund nicht sperren: %s\n" +#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#, c-format +msgid "can't lock keyring `%s': %s\n" +msgstr "kann SchlЭsselbund `%s' nicht sperren: %s\n" -#: g10/import.c:382 -#, fuzzy -msgid "error writing keyring `%': %s\n" -msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n" +#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648 +#, c-format +msgid "error writing keyring `%s': %s\n" +msgstr "Fehler beim Schreiben des SchlЭsselbundes `%s': %s\n" #: g10/import.c:387 #, c-format @@ -1571,11 +1625,6 @@ msgstr "" "SchlЭssel %08lX: Lesefehler im lokalen originalen SchlЭsselblocks: %s\n" -#: g10/import.c:438 g10/import.c:547 g10/import.c:648 -#, fuzzy, c-format -msgid "error writing keyring `%s': %s\n" -msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n" - #: g10/import.c:444 #, c-format msgid "key %08lX: 1 new user-id\n" @@ -1611,11 +1660,6 @@ msgid "key %08lX: not changed\n" msgstr "SchlЭssel %08lX: Nicht geДndert\n" -#: g10/import.c:544 g10/import.c:645 -#, fuzzy, c-format -msgid "can't lock keyring `%s': %s\n" -msgstr "kann Жffentlichen SchlЭsselbund nicht sperren: %s\n" - #: g10/import.c:552 #, c-format msgid "key %08lX: secret key imported\n" @@ -1706,7 +1750,7 @@ #: g10/import.c:915 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "" +msgstr "SchlЭssel %08lX: Doppelte User-ID entdeckt - zusammengefЭhrt\n" #: g10/import.c:966 #, c-format @@ -1718,68 +1762,68 @@ msgid "key %08lX: our copy has no self-signature\n" msgstr "SchlЭssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n" -#: g10/keyedit.c:91 +#: g10/keyedit.c:92 #, c-format msgid "%s: user not found\n" msgstr "%s: Benutzer nicht gefunden\n" -#: g10/keyedit.c:177 +#: g10/keyedit.c:153 msgid "[revocation]" msgstr "[Widerruf]" -#: g10/keyedit.c:178 +#: g10/keyedit.c:154 msgid "[self-signature]" msgstr "[Eigenbeglaubigung]" -#: g10/keyedit.c:196 +#: g10/keyedit.c:218 msgid "1 bad signature\n" msgstr "1 falsche Beglaubigung\n" -#: g10/keyedit.c:198 +#: g10/keyedit.c:220 #, c-format msgid "%d bad signatures\n" msgstr "%d falsche Beglaubigungen\n" -#: g10/keyedit.c:200 +#: g10/keyedit.c:222 msgid "1 signature not checked due to a missing key\n" msgstr "1 Beglaubigung wegen fehlendem SchlЭssel nicht geprЭft\n" -#: g10/keyedit.c:202 +#: g10/keyedit.c:224 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d Beglaubigungen wegen fehlenden SchlЭsseln nicht geprЭft\n" -#: g10/keyedit.c:204 +#: g10/keyedit.c:226 msgid "1 signature not checked due to an error\n" msgstr "1 Beglaubigung aufgrund von Fehler nicht geprЭft\n" -#: g10/keyedit.c:206 +#: g10/keyedit.c:228 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d Beglaubigungen aufgrund von Fehlern nicht geprЭft\n" -#: g10/keyedit.c:208 +#: g10/keyedit.c:230 msgid "1 user id without valid self-signature detected\n" msgstr "Eine User-ID ohne gЭltige Eigenbeglaubigung entdeckt\n" -#: g10/keyedit.c:210 +#: g10/keyedit.c:232 #, c-format msgid "%d user ids without valid self-signatures detected\n" msgstr "%d User-IDs ohne gЭltige Eigenbeglaubigung entdeckt\n" #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. -#: g10/keyedit.c:290 +#: g10/keyedit.c:312 #, c-format msgid "Already signed by key %08lX\n" msgstr "Ist bereits durch SchlЭssel %08lX beglaubigt.\n" -#: g10/keyedit.c:298 +#: g10/keyedit.c:320 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nichts zu beglaubigen fЭr SchlЭssel %08lX\n" -#: g10/keyedit.c:307 +#: g10/keyedit.c:329 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -1787,7 +1831,7 @@ "Sind Sie wirklich sicher, daъ Sie vorstehenden SchlЭssel mit Ihrem\n" "SchlЭssel beglaubigen wollen: \"" -#: g10/keyedit.c:316 +#: g10/keyedit.c:338 msgid "" "The signature will be marked as non-exportable.\n" "\n" @@ -1795,29 +1839,29 @@ "Die Unterschrift wird als nicht exportfДhig markiert werden.\n" "\n" -#: g10/keyedit.c:321 +#: g10/keyedit.c:343 msgid "Really sign? " msgstr "Wirklich unterschreiben? " -#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75 +#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "Beglaubigung fehlgeschlagen: %s\n" -#: g10/keyedit.c:400 +#: g10/keyedit.c:422 msgid "This key is not protected.\n" msgstr "Dieser SchlЭssel ist nicht geschЭtzt.\n" -#: g10/keyedit.c:403 +#: g10/keyedit.c:425 msgid "Key is protected.\n" msgstr "SchlЭssel ist geschЭtzt.\n" -#: g10/keyedit.c:420 +#: g10/keyedit.c:442 #, c-format msgid "Can't edit this key: %s\n" msgstr "Dieser SchlЭssel kann nicht editiert werden: %s\n" -#: g10/keyedit.c:425 +#: g10/keyedit.c:447 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -1825,7 +1869,7 @@ "Geben Sie das neue Mantra fЭr diesen geheimen SchlЭssel ein.\n" "\n" -#: g10/keyedit.c:437 +#: g10/keyedit.c:459 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -1833,341 +1877,376 @@ "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n" "\n" -#: g10/keyedit.c:440 +#: g10/keyedit.c:462 msgid "Do you really want to do this? " msgstr "MЖchten Sie dies wirklich tun? " -#: g10/keyedit.c:501 +#: g10/keyedit.c:523 msgid "moving a key signature to the correct place\n" msgstr "schiebe eine Beglaubigung an die richtige Stelle\n" -#: g10/keyedit.c:537 -msgid "quit" -msgstr "quit" - -#: g10/keyedit.c:537 +#: g10/keyedit.c:559 msgid "quit this menu" msgstr "MenЭ verlassen" -#: g10/keyedit.c:538 +#: g10/keyedit.c:560 msgid "q" msgstr "q" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save" msgstr "save" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save and quit" msgstr "speichern und MenЭ verlassen" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "help" msgstr "help" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "show this help" msgstr "Diese Hilfe zeigen" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "show fingerprint" msgstr "\"Fingerabdruck\" anzeigen" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list" msgstr "Liste der SchlЭssel" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list key and user ids" msgstr "SchlЭssel und User-ID auflisten" -#: g10/keyedit.c:544 +#: g10/keyedit.c:566 msgid "l" msgstr "l" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "uid" msgstr "uid" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "select user id N" msgstr "User-ID N auswДhlen" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "key" msgstr "key" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "select secondary key N" msgstr "ZweitschlЭssel N auswДhlen" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "check" msgstr "check" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "list signatures" msgstr "Liste der Signaturen" -#: g10/keyedit.c:548 +#: g10/keyedit.c:570 msgid "c" msgstr "c" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign" msgstr "sign" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign the key" msgstr "Den SchlЭssel signieren" -#: g10/keyedit.c:550 +#: g10/keyedit.c:572 msgid "s" msgstr "s" -#: g10/keyedit.c:551 +#: g10/keyedit.c:573 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:551 +#: g10/keyedit.c:573 msgid "sign the key locally" msgstr "Den SchlЭssel nur auf diesem Rechner signieren" -#: g10/keyedit.c:552 +#: g10/keyedit.c:574 msgid "debug" msgstr "debug" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "add a user id" msgstr "Eine User-ID hinzufЭgen" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "delete user id" msgstr "User-ID entfernen" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "add a secondary key" msgstr "Einen ZweitschlЭssel hinzufЭgen" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delete a secondary key" msgstr "Einen ZweitschlЭssel entfernen" -#: g10/keyedit.c:557 +#: g10/keyedit.c:579 +msgid "delsig" +msgstr "delsig" + +#: g10/keyedit.c:579 +msgid "delete signatures" +msgstr "Signatur entfernen" + +#: g10/keyedit.c:580 msgid "expire" msgstr "expire" -#: g10/keyedit.c:557 +#: g10/keyedit.c:580 msgid "change the expire date" msgstr "дndern des Verfallsdatums" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle between secret and public key listing" msgstr "Umschalten zwischen Anzeige geheimer und Жffentlicher SchlЭssel" -#: g10/keyedit.c:560 +#: g10/keyedit.c:583 msgid "t" msgstr "t" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "pref" msgstr "pref" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "list preferences" msgstr "Liste der Voreinstellungen" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "change the passphrase" msgstr "Das Mantra Дndern" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "trust" msgstr "trust" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "change the ownertrust" msgstr "Den \"Owner trust\" Дndern" -#: g10/keyedit.c:564 -#, fuzzy +#: g10/keyedit.c:587 msgid "revsig" -msgstr "sign" +msgstr "revsig" -#: g10/keyedit.c:564 +#: g10/keyedit.c:587 msgid "revoke signatures" msgstr "Signaturen widerrufen" -#: g10/keyedit.c:565 -#, fuzzy +#: g10/keyedit.c:588 msgid "revkey" -msgstr "key" +msgstr "revkey" -#: g10/keyedit.c:565 +#: g10/keyedit.c:588 msgid "revoke a secondary key" msgstr "Einen ZweitschlЭssel widerrufen" -#: g10/keyedit.c:584 +#: g10/keyedit.c:607 msgid "can't do that in batchmode\n" msgstr "Dies kann im Batchmodus nicht durchgefЭhrt werden.\n" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:613 +#: g10/keyedit.c:636 msgid "Secret key is available.\n" msgstr "Geheimer SchlЭssel ist vorhanden.\n" -#: g10/keyedit.c:642 +#: g10/keyedit.c:665 msgid "Command> " msgstr "Befehl> " -#: g10/keyedit.c:669 +#: g10/keyedit.c:692 msgid "Need the secret key to do this.\n" msgstr "Hierzu wird der geheime SchlЭssel benЖtigt.\n" -#: g10/keyedit.c:691 +#: g10/keyedit.c:714 msgid "Save changes? " msgstr "дnderungen speichern? " -#: g10/keyedit.c:694 +#: g10/keyedit.c:717 msgid "Quit without saving? " msgstr "Beenden ohne zu speichern? " -#: g10/keyedit.c:704 +#: g10/keyedit.c:727 #, c-format msgid "update failed: %s\n" msgstr "дnderung fehlgeschlagen: %s\n" -#: g10/keyedit.c:711 +#: g10/keyedit.c:734 #, c-format msgid "update secret failed: %s\n" msgstr "дnderung des Geheimnisses fehlgeschlagen: %s\n" -#: g10/keyedit.c:718 +#: g10/keyedit.c:741 msgid "Key not changed so no update needed.\n" msgstr "SchlЭssel ist nicht geДndert worden, also ist kein Speichern nЖtig.\n" -#: g10/keyedit.c:721 g10/keyedit.c:780 +#: g10/keyedit.c:744 g10/keyedit.c:803 #, c-format msgid "update of trustdb failed: %s\n" msgstr "дnderung der \"Trust-DB\" fehlgeschlagen: %s\n" -#: g10/keyedit.c:754 +#: g10/keyedit.c:777 msgid "Really sign all user ids? " msgstr "Wirklich alle User-IDs beglaubigen? " -#: g10/keyedit.c:755 +#: g10/keyedit.c:778 msgid "Hint: Select the user ids to sign\n" msgstr "Tip: WДhlen Sie die User-ID, die beglaubigt werden soll\n" -#: g10/keyedit.c:791 +#: g10/keyedit.c:814 g10/keyedit.c:835 msgid "You must select at least one user id.\n" msgstr "Zumindestens eine User-ID muъ ausgewДhlt werden.\n" -#: g10/keyedit.c:793 +#: g10/keyedit.c:816 msgid "You can't delete the last user id!\n" msgstr "Die letzte User-ID kann nicht gelЖscht werden!\n" -#: g10/keyedit.c:796 +#: g10/keyedit.c:819 msgid "Really remove all selected user ids? " msgstr "MЖchten Sie alle ausgewДhlten User-IDs wirklich entfernen? " -#: g10/keyedit.c:797 +#: g10/keyedit.c:820 msgid "Really remove this user id? " msgstr "Diese User-ID wirklich entfernen? " -#: g10/keyedit.c:820 g10/keyedit.c:842 +#: g10/keyedit.c:858 g10/keyedit.c:880 msgid "You must select at least one key.\n" msgstr "Zumindestens ein SchlЭssel muъ ausgewДhlt werden.\n" -#: g10/keyedit.c:824 +#: g10/keyedit.c:862 msgid "Do you really want to delete the selected keys? " msgstr "MЖchten Sie die ausgewДhlten SchlЭssel wirklich entfernen? " -#: g10/keyedit.c:825 +#: g10/keyedit.c:863 msgid "Do you really want to delete this key? " msgstr "MЖchten Sie diesen SchlЭssel wirklich entfernen? " -#: g10/keyedit.c:846 +#: g10/keyedit.c:884 msgid "Do you really want to revoke the selected keys? " msgstr "MЖchten Sie die ausgewДhlten SchlЭssel wirklich widerrufen? " -#: g10/keyedit.c:847 +#: g10/keyedit.c:885 msgid "Do you really want to revoke this key? " msgstr "MЖchten Sie diesen SchlЭssel wirklich wiederrufen? " -#: g10/keyedit.c:901 +#: g10/keyedit.c:939 msgid "Invalid command (try \"help\")\n" msgstr "UngЭltiger Befehl (versuchen Sie's mal mit \"help\")\n" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 +msgid "Delete this good signature? (y/N/q)" +msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)" + +#: g10/keyedit.c:1298 +msgid "Delete this invalid signature? (y/N/q)" +msgstr "Diese ungЭltige Beglaubigung entfernen= (j/N/q)" + +#: g10/keyedit.c:1302 +#, fuzzy +msgid "Delete this unknown signature? (y/N/q)" +msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)" + +#: g10/keyedit.c:1308 +msgid "Really delete this self-signature? (y/N)" +msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)" + +#: g10/keyedit.c:1322 +#, c-format +msgid "Deleted %d signature.\n" +msgstr "%d Beglaubigungen entfernt.\n" + +#: g10/keyedit.c:1323 +#, c-format +msgid "Deleted %d signatures.\n" +msgstr "%d Beglaubigungen entfernt.\n" + +#: g10/keyedit.c:1326 +msgid "Nothing deleted.\n" +msgstr "Nichts entfernt.\n" + +#: g10/keyedit.c:1395 msgid "Please remove selections from the secret keys.\n" msgstr "Bitte entfernen Sie die Auswahl von den geheimen SchlЭsseln.\n" -#: g10/keyedit.c:1299 +#: g10/keyedit.c:1401 msgid "Please select at most one secondary key.\n" msgstr "Bitte wДhlen Sie hЖchstens einen ZweitschlЭssel aus.\n" -#: g10/keyedit.c:1303 -msgid "Changing exiration time for a secondary key.\n" +#: g10/keyedit.c:1405 +#, fuzzy +msgid "Changing expiration time for a secondary key.\n" msgstr "дndern des Verfallsdatums des ZweitschlЭssels.\n" -#: g10/keyedit.c:1305 -msgid "Changing exiration time for the primary key.\n" +#: g10/keyedit.c:1407 +#, fuzzy +msgid "Changing expiration time for the primary key.\n" msgstr "дndern des Verfallsdatums des HauptschlЭssels.\n" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1448 msgid "You can't change the expiration date of a v3 key\n" msgstr "Sie kЖnnen das Verfallsdatum eines v3-SchlЭssels nicht Дndern\n" -#: g10/keyedit.c:1362 +#: g10/keyedit.c:1464 msgid "No corresponding signature in secret ring\n" msgstr "Keine entsprechende Signatur im geheimen SchlЭsselbund\n" -#: g10/keyedit.c:1422 +#: g10/keyedit.c:1524 #, c-format msgid "No user id with index %d\n" msgstr "Keine User-ID mit Index %d\n" -#: g10/keyedit.c:1468 +#: g10/keyedit.c:1570 #, c-format msgid "No secondary key with index %d\n" msgstr "Kein ZweitschlЭssel mit Index %d\n" -#: g10/keyedit.c:1566 +#: g10/keyedit.c:1668 msgid "user ID: \"" msgstr "User-ID: \"" -#: g10/keyedit.c:1569 -#, fuzzy, c-format +#: g10/keyedit.c:1671 +#, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" @@ -2175,15 +2254,15 @@ "\"\n" "unterschrieben mit Ihrem SchlЭssel %08lX um %s\n" -#: g10/keyedit.c:1573 +#: g10/keyedit.c:1675 msgid "Create a revocation certificate for this signature? (y/N)" msgstr "Ein Widerrufszertifikat fЭr diese Unterschrift erzeugen (j/N)" -#: g10/keyedit.c:1653 +#: g10/keyedit.c:1755 msgid "Really create the revocation certificates? (y/N)" msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1778 msgid "no secret key\n" msgstr "Kein geheimer SchlЭssel\n" @@ -2228,39 +2307,51 @@ msgid "original file name='%.*s'\n" msgstr "UrsprЭnglicher Dateiname='%.*s'\n" -#: g10/mainproc.c:890 +#: g10/mainproc.c:505 g10/mainproc.c:514 +msgid "WARNING: invalid notation data found\n" +msgstr "WARNUNG: UngЭltige \"Notation\"-Daten gefunden\n" + +#: g10/mainproc.c:517 +msgid "Notation: " +msgstr "\"Notation\": " + +#: g10/mainproc.c:524 +msgid "Policy: " +msgstr "Richtlinie: " + +#: g10/mainproc.c:929 msgid "signature verification suppressed\n" msgstr "Unterschriften-эberprЭfung unterdrЭckt\n" # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muъ "ID" rein :-( -#: g10/mainproc.c:896 +#: g10/mainproc.c:935 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Unterschrift vom %.*s, %s SchlЭssel ID %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:922 g10/mainproc.c:933 +#: g10/mainproc.c:961 g10/mainproc.c:972 msgid "BAD signature from \"" msgstr "FALSCHE Unterschrift von \"" -#: g10/mainproc.c:923 g10/mainproc.c:934 +#: g10/mainproc.c:962 g10/mainproc.c:973 msgid "Good signature from \"" msgstr "Korrekte Unterschrift von \"" -#: g10/mainproc.c:925 +#: g10/mainproc.c:964 msgid " aka \"" msgstr " alias \"" -#: g10/mainproc.c:975 +#: g10/mainproc.c:1015 #, c-format msgid "Can't check signature: %s\n" msgstr "Unterschrift kann nicht geprЭft werden: %s\n" -#: g10/mainproc.c:1056 +#: g10/mainproc.c:1109 msgid "old style (PGP 2.x) signature\n" msgstr "Unterschrift nach alter (PGP 2.x) Art\n" -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1114 msgid "invalid root packet detected in proc_tree()\n" msgstr "ungЭltiges root-Paket in proc_tree() entdeckt\n" @@ -2296,7 +2387,7 @@ msgid "can't handle public key algorithm %d\n" msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n" -#: g10/parse-packet.c:872 +#: g10/parse-packet.c:931 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n" @@ -2321,11 +2412,11 @@ msgid " (main key ID %08lX)" msgstr " (HauptschlЭssel-ID %08lX)" -#: g10/passphrase.c:190 +#: g10/passphrase.c:192 msgid "Enter passphrase: " msgstr "Geben Sie das Mantra ein: " -#: g10/passphrase.c:194 +#: g10/passphrase.c:196 msgid "Repeat passphrase: " msgstr "Geben Sie das Mantra nochmal ein: " @@ -2334,15 +2425,15 @@ msgstr "" "Daten wurden nicht gespeichert; verwenden Sie dafЭr die Option \"--output\"\n" -#: g10/plaintext.c:208 +#: g10/plaintext.c:266 msgid "Please enter name of data file: " msgstr "Bitte geben Sie den Namen der Datendatei ein: " -#: g10/plaintext.c:229 +#: g10/plaintext.c:287 msgid "reading stdin ...\n" msgstr "lese stdin ...\n" -#: g10/plaintext.c:302 +#: g10/plaintext.c:360 #, c-format msgid "can't open signed data `%s'\n" msgstr "kann signierte Datei '%s' nicht Жffnen.\n" @@ -2415,21 +2506,21 @@ msgstr "" "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n" -#: g10/sign.c:79 +#: g10/sign.c:132 #, c-format msgid "%s signature from: %s\n" msgstr "%s Unterschrift von: %s\n" -#: g10/sign.c:210 g10/sign.c:496 +#: g10/sign.c:263 g10/sign.c:554 #, c-format msgid "can't create %s: %s\n" msgstr "%s kann nicht erzeugt werden: %s\n" -#: g10/sign.c:306 +#: g10/sign.c:361 msgid "signing:" msgstr "unterschreibe:" -#: g10/sign.c:346 +#: g10/sign.c:401 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "WARNUNG: '%s' ist eine leere Datei.\n" @@ -2478,7 +2569,7 @@ msgid "%s: directory does not exist!\n" msgstr "%s: Verzeichnis existiert nicht!\n" -#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457 +#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: kann nicht erzeugt werden: %s\n" @@ -2575,7 +2666,8 @@ msgstr "%s: konnte Satz nicht anhДngen: %s\n" #: g10/tdbio.c:1630 -msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n" +#, fuzzy +msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" "Die \"Trust\"-Datenbank ist beschДdigt; verwenden Sie \"gpgm " "--fix-trustdb\".\n" @@ -3037,16 +3129,21 @@ msgid "Overwrite (y/N)? " msgstr "эberschreiben (j/N)? " -#: g10/openfile.c:92 +#: g10/openfile.c:97 +#, c-format +msgid "%s: unknown suffix\n" +msgstr "" + +#: g10/openfile.c:122 msgid "writing to stdout\n" msgstr "Schreiben auf die Standardausgabe\n" -#: g10/openfile.c:149 +#: g10/openfile.c:181 #, c-format msgid "assuming signed data in `%s'\n" msgstr "die unterzeichneten Daten sind wohl in '%s'\n" -#: g10/openfile.c:199 +#: g10/openfile.c:231 #, c-format msgid "%s: new options file created\n" msgstr "%s: neue Optionendatei erstellt\n" @@ -3265,10 +3362,62 @@ msgstr "" "Geben Sie \"Ja\" (oder nur \"j\") ein, um diesen UnterschlЭssel zu lЖschen" +# ("keyedit.delsig.valid"), +# "This is a valid signature on the key; you normally don't want\n" +# "to delete this signature may be important to establish a trust\n" +# "connection to the key or another key certified by this key." +#: g10/helptext.c:176 +msgid "keyedit.delsig.valid" +msgstr "" +"Dies ist eine gЭltige Beglaubigung fЭr den SchlЭssel. Es ist normalerweise\n" +"unnЖtig sie zu lЖschen. Sie ist mЖglicherweise sogar notwendig, um einen\n" +"Trust-Weg zu diesem oder einem durch diesen SchlЭssel beglaubigten " +"SchlЭssel\n" +"herzustellen" + +# ("keyedit.delsig.invalid"), +# "The signature is not valid. It does make sense to remove it from\n" +# "your keyring if it is really invalid and not just unchecked due to\n" +# "a missing public key (marked by \"sig?\")." +#: g10/helptext.c:181 +#, fuzzy +msgid "keyedit.delsig.unknown" +msgstr "" +"Diese Beglaubigung ist ungЭltig. Es ist sinnvoll sie aus Ihrem\n" +"SchlЭsselbund zu entfernen, sofern sie wirklich ungЭltig ist und nicht nur\n" +"wegen eines fehlenden Жff.SchlЭssel (\"sig?\") unkontrollierbar ist." + +# ("keyedit.delsig.invalid"), +# "The signature is not valid. It does make sense to remove it from\n" +# "your keyring if it is really invalid and not just unchecked due to\n" +# "a missing public key (marked by \"sig?\")." +#: g10/helptext.c:187 +msgid "keyedit.delsig.invalid" +msgstr "" +"Diese Beglaubigung ist ungЭltig. Es ist sinnvoll sie aus Ihrem\n" +"SchlЭsselbund zu entfernen, sofern sie wirklich ungЭltig ist und nicht nur\n" +"wegen eines fehlenden Жff.SchlЭssel (\"sig?\") unkontrollierbar ist." + +# ("keyedit.delsig.selfsig") +# "This is a signature which binds the user ID to the key. It is\n" +# "usually not a good idea to remove such a signature. Actually\n" +# "GnuPG might not be able to use this key anymore. So do this\n" +# "only if this self-signature is for some reason not valid and\n" +# "a second one is available." +#: g10/helptext.c:191 +msgid "keyedit.delsig.selfsig" +msgstr "" +"Diese Beglaubigung bindet die User-ID an den SchlЭssel. Normalerweise ist\n" +"es nicht gut, solche Beglaubigungen zu entfernen. Um ehrlich zu sein:\n" +"Es kann sein, daъ GnuPG solche SchlЭssel gar nicht mehr benutzen kann.\n" +"Sie sollten diese Eigenbeglaubigung also nur dann entfernen, wenn sie aus\n" +"irgendeinem Grund nicht gЭltig ist und eine zweite Beglaubigung verfЭgbar " +"ist." + # ################################ # ####### Help msgids ############ # ################################ -#: g10/helptext.c:175 +#: g10/helptext.c:200 msgid "passphrase.enter" msgstr "" "Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz, der aus\n" @@ -3283,7 +3432,7 @@ "werden,\n" "sind i.d.R. eine gute Wahl" -#: g10/helptext.c:182 +#: g10/helptext.c:207 msgid "passphrase.repeat" msgstr "" "Um sicher zu gehen, daъ Sie sich bei der Eingabe des Mantras nicht\n" @@ -3291,21 +3440,21 @@ "Эbereinstimmen, wird das Mantra akzeptiert." # "Give the name fo the file to which the signature applies" -#: g10/helptext.c:186 +#: g10/helptext.c:211 msgid "detached_signature.filename" msgstr "" "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift gehЖrt" # "Answer \"yes\" if it is okay to overwrite the file" -#: g10/helptext.c:190 +#: g10/helptext.c:215 msgid "openfile.overwrite.okay" msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei Эberschreiben mЖchten" -#: g10/helptext.c:204 +#: g10/helptext.c:229 msgid "No help available" msgstr "Keine Hilfe vorhanden." -#: g10/helptext.c:216 +#: g10/helptext.c:241 #, c-format msgid "No help available for `%s'" msgstr "Keine Hilfe fЭr '%s' vorhanden." diff -urN gnupg-0.9.7/po/es_ES.po gnupg-0.9.8/po/es_ES.po --- gnupg-0.9.7/po/es_ES.po Sun May 23 20:02:46 1999 +++ gnupg-0.9.8/po/es_ES.po Sat Jun 26 13:07:26 1999 @@ -3,12 +3,15 @@ # I've tried to mantain the terminology used by Armando Ramos # is his PGP 2.3.6i translation. # I also got inspiration from it.po by Marco d'Itri +# +# GPG version: 0.9.7 msgid "" msgstr "" -"POT-Creation-Date: 1999-05-23 15:36+0200\n" +"POT-Creation-Date: 1999-06-26 11:22+0200\n" +"PO-Revision-Date: 1999-06-06 18:33+0200\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-13 10:49:25+0100\n" -"From: Urko Lusa \n" +"From: Urko Lusa \n" "Updated: 1998-01-12\n" "By: Luca Olivetti \n" "Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments " @@ -21,24 +24,32 @@ #: util/secmem.c:76 msgid "Warning: using insecure memory!\n" -msgstr "Aviso: ║se estА usando memoria insegura!\n" +msgstr "ATENCIсN: ║se estА usando memoria insegura!\n" #: util/secmem.c:249 msgid "operation is not possible without initialized secure memory\n" -msgstr "" +msgstr "operaciСn imposible sin memoria segura inicializada\n" #: util/secmem.c:250 msgid "(you may have used the wrong program for this task)\n" -msgstr "" +msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n" -#: util/miscutil.c:156 +#: util/miscutil.c:156 util/miscutil.c:173 msgid "yes" msgstr "sМ" -#: util/miscutil.c:157 +#: util/miscutil.c:157 util/miscutil.c:175 msgid "yY" msgstr "sS" +#: g10/keyedit.c:559 util/miscutil.c:174 +msgid "quit" +msgstr "" + +#: util/miscutil.c:176 +msgid "qQ" +msgstr "" + #: util/errors.c:54 msgid "general error" msgstr "Error general" @@ -125,7 +136,7 @@ #: util/errors.c:75 msgid "file write error" -msgstr "Error de escritura" +msgstr "error de escritura" #: util/errors.c:76 msgid "unknown compress algorithm" @@ -212,34 +223,29 @@ msgstr "Clave dИbil" #: util/errors.c:97 -#, fuzzy msgid "invalid argument" -msgstr "Armadura no vАlida" +msgstr "argumento no vАlido" #: util/errors.c:98 -#, fuzzy msgid "bad URI" -msgstr "MPI incorrecto" +msgstr "URI incorrecto" #: util/errors.c:99 -#, fuzzy msgid "unsupported URI" -msgstr "No soportado" +msgstr "URI no soportado" #: util/errors.c:100 -#, fuzzy msgid "network error" -msgstr "Error general" +msgstr "error de red" #: util/errors.c:102 -#, fuzzy msgid "not encrypted" -msgstr "datos cifrados %s\n" +msgstr "no cifrado" #: util/logger.c:218 #, c-format msgid "... this is a bug (%s:%d:%s)\n" -msgstr "║Oh! vaya... esto es un bug (%s:%d:%s)\n" +msgstr "... esto es un bug (%s:%d:%s)\n" #: util/logger.c:224 #, c-format @@ -248,7 +254,8 @@ #: 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" +msgstr "" +"ATENCIсN: ║se estА usando un generador de nЗmeros aleatorios inseguro!\n" #: cipher/random.c:413 msgid "" @@ -264,7 +271,7 @@ "║NO USE NINGзN DATO GENERADO POR ESTE PROGRAMA!\n" "\n" -#: cipher/rndlinux.c:110 +#: cipher/rndlinux.c:135 #, c-format msgid "" "\n" @@ -276,7 +283,7 @@ "otro trabajo para que el sistema pueda recolectar mАs entropМa\n" "(se necesitan %d bytes mАs).\n" -#: g10/g10.c:165 +#: g10/g10.c:174 msgid "" "@Commands:\n" " " @@ -284,131 +291,131 @@ "@Comandos:\n" " " -#: g10/g10.c:167 +#: g10/g10.c:176 msgid "|[file]|make a signature" msgstr "|[file]|hace una firma" -#: g10/g10.c:168 +#: g10/g10.c:177 msgid "|[file]|make a clear text signature" msgstr "|[file]|hace una firma en texto claro" -#: g10/g10.c:169 +#: g10/g10.c:178 msgid "make a detached signature" msgstr "hace una firma separada" -#: g10/g10.c:170 +#: g10/g10.c:179 msgid "encrypt data" msgstr "cifra datos" -#: g10/g10.c:171 +#: g10/g10.c:180 msgid "encryption only with symmetric cipher" msgstr "cifra sСlo con un cifrado simИtrico" -#: g10/g10.c:172 +#: g10/g10.c:181 msgid "store only" msgstr "sСlo almacenar" -#: g10/g10.c:173 +#: g10/g10.c:182 msgid "decrypt data (default)" msgstr "descifra datos (predefinido)" -#: g10/g10.c:174 +#: g10/g10.c:183 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:175 +#: g10/g10.c:184 msgid "list keys" -msgstr "lista las claves" +msgstr "lista claves" -#: g10/g10.c:177 +#: g10/g10.c:186 msgid "list keys and signatures" -msgstr "lista las claves y firmas" +msgstr "lista claves y firmas" -#: g10/g10.c:178 +#: g10/g10.c:187 msgid "check key signatures" msgstr "comprueba las firmas de las claves" -#: g10/g10.c:179 +#: g10/g10.c:188 msgid "list keys and fingerprints" -msgstr "lista las claves y huellas dactilares" +msgstr "lista claves y huellas dactilares" -#: g10/g10.c:180 +#: g10/g10.c:189 msgid "list secret keys" -msgstr "lista las claves secretas" +msgstr "lista claves secretas" -#: g10/g10.c:181 +#: g10/g10.c:190 msgid "generate a new key pair" msgstr "genera un nuevo par de claves" -#: g10/g10.c:182 +#: g10/g10.c:191 msgid "remove key from the public keyring" msgstr "elimina la clave del anillo pЗblico" -#: g10/g10.c:183 +#: g10/g10.c:192 msgid "sign or edit a key" msgstr "firma o modifica una clave" -#: g10/g10.c:184 +#: g10/g10.c:193 msgid "generate a revocation certificate" msgstr "genera un certificado de revocaciСn" -#: g10/g10.c:185 +#: g10/g10.c:194 msgid "export keys" -msgstr "exporta las claves" +msgstr "exporta claves" -#: g10/g10.c:186 +#: g10/g10.c:195 msgid "export keys to a key server" -msgstr "" +msgstr "exporta claves a un servidor de claves" -#: g10/g10.c:187 +#: g10/g10.c:196 msgid "import keys from a key server" -msgstr "" +msgstr "importa claves desde un servidor de claves" -#: g10/g10.c:190 +#: g10/g10.c:199 msgid "import/merge keys" -msgstr "importa/fusiona las claves" +msgstr "importa/fusiona claves" -#: g10/g10.c:192 +#: g10/g10.c:201 msgid "list only the sequence of packets" msgstr "lista sСlo la secuencia de paquetes" -#: g10/g10.c:194 +#: g10/g10.c:203 msgid "export the ownertrust values" msgstr "exporta los valores de confianza" -#: g10/g10.c:196 +#: g10/g10.c:205 msgid "import ownertrust values" msgstr "importa los valores de confianza" -#: g10/g10.c:198 +#: g10/g10.c:207 msgid "|[NAMES]|update the trust database" msgstr "|[NOMBRES]|actualiza la base de datos de confianza" -#: g10/g10.c:200 +#: g10/g10.c:209 msgid "|[NAMES]|check the trust database" msgstr "|[NOMBRES]|comprueba la base de datos de confianza" -#: g10/g10.c:201 +#: g10/g10.c:210 msgid "fix a corrupted trust database" msgstr "arregla una base de datos de confianza daЯada" -#: g10/g10.c:202 +#: g10/g10.c:211 msgid "De-Armor a file or stdin" msgstr "quita la armadura de un fichero o stdin" -#: g10/g10.c:203 +#: g10/g10.c:212 msgid "En-Armor a file or stdin" msgstr "crea la armadura a un fichero o stdin" -#: g10/g10.c:204 +#: g10/g10.c:213 msgid "|algo [files]|print message digests" -msgstr "|algo [files]|imprime resЗmenes de mensaje" +msgstr "|algo [ficheros]|imprime resЗmenes de mensaje" -#: g10/g10.c:205 +#: g10/g10.c:214 msgid "print all message digests" msgstr "imprime todos los resЗmenes de mensaje" -#: g10/g10.c:211 +#: g10/g10.c:220 msgid "" "@\n" "Options:\n" @@ -418,154 +425,164 @@ "Opciones:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:222 msgid "create ascii armored output" msgstr "crea una salida ascii con armadura" -#: g10/g10.c:214 -#, fuzzy +#: g10/g10.c:223 msgid "|NAME|encrypt for NAME" -msgstr "|NOMBRE|usa el juego de caracteres NOMBRE" +msgstr "|NOMBRE|cifra para NOMBRE" -#: g10/g10.c:218 +#: g10/g10.c:227 msgid "use this user-id to sign or decrypt" msgstr "usa este usuario para firmar o descifrar" -#: g10/g10.c:219 +#: g10/g10.c:228 msgid "|N|set compress level N (0 disables)" msgstr "|N|establece nivel de compresiСn N (0 no comprime)" -#: g10/g10.c:221 +#: g10/g10.c:230 msgid "use canonical text mode" msgstr "usa modo de texto canСnico" -#: g10/g10.c:222 +#: g10/g10.c:231 msgid "use as output file" msgstr "usa como fichero de salida" -#: g10/g10.c:223 +#: g10/g10.c:232 msgid "verbose" msgstr "prolijo" -#: g10/g10.c:224 +#: g10/g10.c:233 msgid "be somewhat more quiet" msgstr "algo mАs discreto" -#: g10/g10.c:225 +#: g10/g10.c:234 +msgid "don't use the terminal at all" +msgstr "" + +#: g10/g10.c:235 msgid "force v3 signatures" msgstr "fuerza firmas v3" -#: g10/g10.c:226 -#, fuzzy +#: g10/g10.c:236 msgid "always use a MDC for encryption" -msgstr "usa este usuario para cifrar" +msgstr "siempre usa un MCD para cifrar" -#: g10/g10.c:227 +#: g10/g10.c:237 msgid "do not make any changes" -msgstr "" +msgstr "no hace ningЗn cambio" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:229 +#: g10/g10.c:239 msgid "batch mode: never ask" msgstr "proceso por lotes: nunca preguntar" -#: g10/g10.c:230 +#: g10/g10.c:240 msgid "assume yes on most questions" msgstr "asume \"sМ\" en casi todas las preguntas" -#: g10/g10.c:231 +#: g10/g10.c:241 msgid "assume no on most questions" msgstr "asume \"no\" en casi todas las preguntas" -#: g10/g10.c:232 +#: g10/g10.c:242 msgid "add this keyring to the list of keyrings" msgstr "aЯade este anillo a la lista de anillos" -#: g10/g10.c:233 +#: g10/g10.c:243 msgid "add this secret keyring to the list" msgstr "aЯade este anillo secreto a la lista" -#: g10/g10.c:234 +#: g10/g10.c:244 msgid "|NAME|use NAME as default secret key" msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" -#: g10/g10.c:235 +#: g10/g10.c:245 msgid "|HOST|use this keyserver to lookup keys" -msgstr "" +msgstr "|SERVIDOR|usa este servidor de claves" -#: g10/g10.c:236 +#: g10/g10.c:246 msgid "|NAME|set terminal charset to NAME" msgstr "|NOMBRE|usa el juego de caracteres NOMBRE" -#: g10/g10.c:237 +#: g10/g10.c:247 msgid "read options from file" msgstr "lee opciones del fichero" -#: g10/g10.c:239 +#: g10/g10.c:249 msgid "set debugging flags" msgstr "establece los parАmetros de depuraciСn" -#: g10/g10.c:240 +#: g10/g10.c:250 msgid "enable full debugging" msgstr "habilita depuraciСn completa" -#: g10/g10.c:241 +#: g10/g10.c:251 msgid "|FD|write status info to this FD" msgstr "|DF|escribe informaciСn de estado en descriptor DF" -#: g10/g10.c:242 +#: g10/g10.c:252 msgid "do not write comment packets" msgstr "no escribe paquetes de comentario" -#: g10/g10.c:243 +#: g10/g10.c:253 msgid "(default is 1)" msgstr "(por defecto es 1)" -#: g10/g10.c:244 +#: g10/g10.c:254 msgid "(default is 3)" msgstr "(por defecto es 3)" -#: g10/g10.c:246 +#: g10/g10.c:256 msgid "|FILE|load extension module FILE" msgstr "|FICHERO|carga mСdulo de extensiones FICHERO" -#: g10/g10.c:247 +#: g10/g10.c:257 msgid "emulate the mode described in RFC1991" msgstr "emula el modo descrito en la RFC1991" -#: g10/g10.c:248 +#: g10/g10.c:258 +msgid "set all packet, cipher and digest options to OpenPGP behavior" +msgstr "" + +#: g10/g10.c:259 msgid "|N|use passphrase mode N" msgstr "|N|usa modo de contraseЯa N" -#: g10/g10.c:250 +#: g10/g10.c:261 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:252 +#: g10/g10.c:263 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n" "contraseЯas" -#: g10/g10.c:253 +#: g10/g10.c:264 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE" -#: g10/g10.c:254 +#: g10/g10.c:265 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE" -#: g10/g10.c:255 +#: g10/g10.c:266 msgid "|N|use compress algorithm N" msgstr "|N|usa el algoritmo de compresiСn N" -#: g10/g10.c:256 +#: g10/g10.c:267 msgid "throw keyid field of encrypted packets" msgstr "elimina el campo keyid de los paquetes cifrados" -#: g10/g10.c:258 +#: g10/g10.c:268 +msgid "|NAME=VALUE|use this notation data" +msgstr "" + +#: g10/g10.c:270 msgid "" "@\n" "Examples:\n" @@ -585,25 +602,25 @@ " --list-keys [nombres] muestra las claves\n" " --fingerprint [nombres] muestra las huellas dactilares\n" -#: g10/g10.c:327 +#: g10/g10.c:347 msgid "Please report bugs to .\n" msgstr "Por favor, informe de posibles \"bugs\" a .\n" -#: g10/g10.c:331 +#: g10/g10.c:351 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:334 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" msgstr "" "Sintaxis: gpg [opciones] [ficheros]\n" -"firma, comprueba, cifra o descifra\n" -"la operaciСn por defecto depende del tipo de datos de entrada\n" +"Firma, comprueba, cifra o descifra.\n" +"La operaciСn por defecto depende del tipo de datos de entrada.\n" -#: g10/g10.c:339 +#: g10/g10.c:359 msgid "" "\n" "Supported algorithms:\n" @@ -611,149 +628,172 @@ "\n" "Algoritmos soportados:\n" -#: g10/g10.c:413 +#: g10/g10.c:433 msgid "usage: gpg [options] " msgstr "uso: gpg [opciones] " -#: g10/g10.c:453 +#: g10/g10.c:473 msgid "conflicting commands\n" msgstr "comandos incompatibles\n" -#: g10/g10.c:580 +#: g10/g10.c:605 #, c-format msgid "NOTE: no default option file `%s'\n" -msgstr "nota: no existe fichero de opciones predefinido `%s'\n" +msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/g10.c:584 +#: g10/g10.c:609 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/g10.c:591 +#: g10/g10.c:616 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:737 +#: g10/g10.c:782 #, c-format msgid "%s is not a valid character set\n" msgstr "%s no es un juego de caracteres vАlido\n" -#: g10/g10.c:780 g10/g10.c:792 +#: g10/g10.c:827 g10/g10.c:839 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado no es vАlido\n" -#: g10/g10.c:786 g10/g10.c:798 +#: g10/g10.c:833 g10/g10.c:845 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no es vАlido\n" -#: g10/g10.c:801 +#: g10/g10.c:849 +msgid "the given policy URL is invalid\n" +msgstr "" + +#: g10/g10.c:852 #, 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:803 +#: g10/g10.c:854 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:805 +#: g10/g10.c:856 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:807 +#: g10/g10.c:858 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth debe estar en el rango 1-255\n" -#: g10/g10.c:810 +#: g10/g10.c:861 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" -msgstr "nota: el modo S2K simple (0) no es nada recomendable\n" +msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n" -#: g10/g10.c:814 +#: g10/g10.c:865 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:891 +#: g10/g10.c:942 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicializaciСn de la base de datos de confianza fallida: %s\n" -#: g10/g10.c:897 +#: g10/g10.c:948 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:904 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:912 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:925 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:938 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:952 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:964 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:973 +#: g10/g10.c:1024 msgid "--edit-key username [commands]" -msgstr "--edit-key nombre_usuario" +msgstr "--edit-key nombre_usuario [comandos]" -#: g10/g10.c:987 +#: g10/g10.c:1038 msgid "--delete-secret-key username" msgstr "--delete-secret-key nombre_usuario" -#: g10/g10.c:990 +#: g10/g10.c:1041 msgid "--delete-key username" msgstr "--delete-key nombre_usuario" -#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311 +#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "no puede abrirse `%s': %s\n" -#: g10/g10.c:1024 +#: g10/g10.c:1075 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [id_usuario] [anillo]" -#: g10/g10.c:1083 +#: g10/g10.c:1134 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminaciСn de armadura fallida: %s\n" -#: g10/g10.c:1091 +#: g10/g10.c:1142 #, c-format msgid "enarmoring failed: %s\n" msgstr "creaciСn de armadura fallida: %s\n" -#: g10/g10.c:1157 +#: g10/g10.c:1208 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribuciСn no vАlido `%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1283 msgid "[filename]" msgstr "[nombre_fichero]" -#: g10/g10.c:1236 +#: g10/g10.c:1287 msgid "Go ahead and type your message ...\n" -msgstr "Adelante, teclee el mensaje ...\n" +msgstr "Adelante, teclee su mensaje ...\n" -#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "no puede abrirse `%s'\n" +#: g10/g10.c:1457 +msgid "" +"the first character of a notation name must be a letter or an underscore\n" +msgstr "" + +#: g10/g10.c:1463 +msgid "" +"a notation name must have only letters, digits, dots or underscores and end " +"with an '='\n" +msgstr "" + +#: g10/g10.c:1469 +msgid "dots in a notation name must be surrounded by other characters\n" +msgstr "" + +#: g10/g10.c:1477 +msgid "a notation value must not use any control characters\n" +msgstr "" + #: g10/armor.c:296 #, c-format msgid "armor: %s\n" @@ -820,12 +860,14 @@ #: g10/armor.c:1005 #, c-format msgid "invalid armor: line longer than %d characters\n" -msgstr "armadura invАlida: lМnea mАs larga de %d caracteres\n" +msgstr "armadura incorrecta: lМnea mАs larga de %d caracteres\n" #: g10/armor.c:1009 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" +"caracter \"quoted printable\" en la armadura - probablemente se usС\n" +"un MTA defectuoso\n" #: g10/pkclist.c:137 #, c-format @@ -901,7 +943,9 @@ msgid "" "No certificates with undefined trust found.\n" "\n" -msgstr "No se ha encontrado ningЗn certificado sin valor de confianza.\n" +msgstr "" +"No se ha encontrado ningЗn certificado sin valor de confianza.\n" +"\n" #: g10/pkclist.c:264 msgid "" @@ -914,21 +958,21 @@ #: g10/pkclist.c:281 #, c-format msgid "key %08lX: key has been revoked!\n" -msgstr "%08lX: ║Esta clave ha sido retirada!\n" +msgstr "clave %08lX: ║esta clave ha sido revocada!\n" #: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403 msgid "Use this key anyway? " msgstr "©Usar esta clave de todas formas? " #: g10/pkclist.c:291 -#, fuzzy, c-format +#, c-format msgid "key %08lX: subkey has been revoked!\n" -msgstr "%08lX: ║Esta clave ha sido retirada!\n" +msgstr "clave %08lX: ║esta subclave ha sido revocada!\n" #: g10/pkclist.c:321 #, c-format msgid "%08lX: key has expired\n" -msgstr "%08lX: ║Esta clave estА caducada!\n" +msgstr "%08lX: clave caducada\n" #: g10/pkclist.c:327 #, c-format @@ -983,7 +1027,6 @@ msgstr " Esto puede significar que la firma estА falsificada.\n" #: g10/pkclist.c:459 -#, fuzzy msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATENCIсN: ║Esta clave ha sido revocada por su propietario!\n" @@ -1013,18 +1056,24 @@ msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" -"AVISO: ║Esta clave no estА certificada con suficientes firmas de confianza!\n" +"ATENCIсN: ║Esta clave no estА certificada con suficientes firmas de " +"confianza!\n" #: g10/pkclist.c:516 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " No es seguro que la firma pertenezca al propietario.\n" -#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673 +#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:591 +#: g10/pkclist.c:588 g10/pkclist.c:687 +#, fuzzy, c-format +msgid "%s: skipped: public key already present\n" +msgstr "%s: problema lectura del bloque de clave: %s\n" + +#: g10/pkclist.c:611 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1032,20 +1081,20 @@ "No se ha especificado un ID de usuario (puede usar \"-r\")\n" "\n" -#: g10/pkclist.c:596 +#: g10/pkclist.c:616 msgid "Enter the user ID: " msgstr "Introduzca el ID de usuario: " -#: g10/pkclist.c:607 +#: g10/pkclist.c:627 msgid "No such user ID.\n" msgstr "ID de usuario inexistente.\n" -#: g10/pkclist.c:653 +#: g10/pkclist.c:673 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: error comprobando la clave: %s\n" -#: g10/pkclist.c:679 +#: g10/pkclist.c:711 msgid "no valid addressees\n" msgstr "no hay direcciones vАlidas\n" @@ -1109,7 +1158,7 @@ "Listo para generar un nuevo par de claves %s.\n" " el tamaЯo mМnimo es 768 bits\n" " el tamaЯo por defecto es 1024 bits\n" -" el tamaЯo mАximo recomendado en 2048 bits\n" +" el tamaЯo mАximo recomendado es 2048 bits\n" #: g10/keygen.c:449 msgid "What keysize do you want? (1024) " @@ -1132,9 +1181,9 @@ #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. #: g10/keygen.c:466 -#, fuzzy, c-format +#, c-format msgid "keysize too large; %d is largest value allowed.\n" -msgstr "tamaЯo insuficiente; 768 es el valor mМnimo permitido\n" +msgstr "tamaЯo excesivo; %d es el mАximo valor permitido.\n" #: g10/keygen.c:471 msgid "" @@ -1262,7 +1311,7 @@ #: g10/keygen.c:669 #, c-format msgid "You are using the `%s' character set.\n" -msgstr "" +msgstr "EstА usando el juego de caracteres `%s'.\n" #: g10/keygen.c:675 #, c-format @@ -1291,7 +1340,7 @@ "Necesita una contraseЯa para proteger su clave secreta.\n" "\n" -#: g10/keyedit.c:433 g10/keygen.c:748 +#: g10/keyedit.c:455 g10/keygen.c:748 msgid "passphrase not correctly repeated; try again.\n" msgstr "contraseЯa repetida incorrecta, intИntelo de nuevo.\n" @@ -1308,7 +1357,6 @@ "\n" #: g10/keygen.c:775 -#, fuzzy msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -1330,7 +1378,8 @@ msgstr "El par de claves DSA tendrА 1024 bits.\n" #: g10/keygen.c:859 -msgid "Key generation cancelled.\n" +#, fuzzy +msgid "Key generation canceled.\n" msgstr "CreaciСn de claves cancelada.\n" #: g10/keygen.c:869 @@ -1348,13 +1397,12 @@ msgstr "Claves pЗblica y secreta creadas y firmadas.\n" #: g10/keygen.c:949 -#, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" 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 " +"el comando \"--edit-key\" para crear una clave secundaria con este " "propСsito.\n" #: g10/keygen.c:963 g10/keygen.c:1062 @@ -1362,27 +1410,27 @@ msgid "Key generation failed: %s\n" msgstr "CreaciСn de la clave fallida: %s\n" -#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52 -#, fuzzy, c-format +#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105 +#, 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" +"clave pЗblica creada %lu segundos en el futuro (salto en el tiempo o\n" +"problemas con el reloj)\n" -#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54 -#, fuzzy, c-format +#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107 +#, 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" +"clave pЗblica creada %lu segundos en el futuro (salto en el tiempo o\n" +"problemas con el reloj)\n" #: g10/keygen.c:1040 msgid "Really create? " msgstr "©Crear de verdad? " -#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467 +#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467 #: g10/tdbio.c:528 #, c-format msgid "%s: can't open: %s\n" @@ -1396,14 +1444,14 @@ #: g10/encode.c:167 g10/encode.c:287 #, c-format msgid "%s: WARNING: empty file\n" -msgstr "%s: atenciСn: fichero vacМo\n" +msgstr "%s: ATENCIсN: fichero vacМo\n" #: g10/encode.c:237 #, c-format msgid "reading from `%s'\n" msgstr "leyendo desde `%s'\n" -#: g10/encode.c:417 +#: g10/encode.c:431 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s cifrado para: %s\n" @@ -1441,7 +1489,7 @@ msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n" #: g10/import.c:116 -#, fuzzy, c-format +#, c-format msgid "can't open `%s': %s\n" msgstr "no puede abrirse `%s': %s\n" @@ -1456,64 +1504,64 @@ msgstr "hasta ahora se han procesado %lu claves\n" #: g10/import.c:172 -#, fuzzy, c-format +#, c-format msgid "error reading `%s': %s\n" -msgstr "error lectura registro de clave: %s\n" +msgstr "error leyendo `%s': %s\n" #: g10/import.c:175 #, c-format msgid "Total number processed: %lu\n" -msgstr " Cantidad total procesada: %lu\n" +msgstr " Cantidad total procesada: %lu\n" #: g10/import.c:177 #, c-format msgid " w/o user IDs: %lu\n" -msgstr " sin identificativo de usuario: %lu\n" +msgstr " sin identificativo: %lu\n" #: g10/import.c:179 #, c-format msgid " imported: %lu" -msgstr " importadas: %lu" +msgstr " importadas: %lu" #: g10/import.c:185 #, c-format msgid " unchanged: %lu\n" -msgstr " sin cambios: %lu\n" +msgstr " sin cambios: %lu\n" #: g10/import.c:187 #, c-format msgid " new user IDs: %lu\n" -msgstr "nuevos identificativos de usuario: %lu\n" +msgstr " nuevos identificativos: %lu\n" #: g10/import.c:189 #, c-format msgid " new subkeys: %lu\n" -msgstr " nuevas sub-claves: %lu\n" +msgstr " nuevas subclaves: %lu\n" #: g10/import.c:191 #, c-format msgid " new signatures: %lu\n" -msgstr " nuevas firmas: %lu\n" +msgstr " nuevas firmas: %lu\n" #: g10/import.c:193 #, c-format msgid " new key revocations: %lu\n" -msgstr " nuevas revocaciones de clave: %lu\n" +msgstr " nuevas revocaciones: %lu\n" #: g10/import.c:195 #, c-format msgid " secret keys read: %lu\n" -msgstr " claves secretas leМdas: %lu\n" +msgstr " claves secretas leМdas: %lu\n" #: g10/import.c:197 #, c-format msgid " secret keys imported: %lu\n" -msgstr " claves secretas importadas: %lu\n" +msgstr " claves secretas importadas: %lu\n" #: g10/import.c:199 #, c-format msgid " secret keys unchanged: %lu\n" -msgstr " claves secretas sin cambios: %lu\n" +msgstr "claves secretas sin cambios: %lu\n" #: g10/import.c:342 g10/import.c:529 #, c-format @@ -1538,20 +1586,20 @@ msgid "no default public keyring\n" msgstr "no hay anillo pЗblico por defecto\n" -#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501 +#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "escribiendo en `%s'\n" -#: g10/import.c:379 g10/import.c:435 -#, fuzzy -msgid "can't lock keyring `%': %s\n" -msgstr "no puede bloquearse el anillo pЗblico: %s\n" +#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#, c-format +msgid "can't lock keyring `%s': %s\n" +msgstr "no puede bloquearse el anillo `%s': %s\n" -#: g10/import.c:382 -#, fuzzy -msgid "error writing keyring `%': %s\n" -msgstr "%s: error escritura registro de versiСn: %s\n" +#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648 +#, c-format +msgid "error writing keyring `%s': %s\n" +msgstr "error escribiendo anillo `%s': %s\n" #: g10/import.c:387 #, c-format @@ -1573,11 +1621,6 @@ 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:438 g10/import.c:547 g10/import.c:648 -#, fuzzy, c-format -msgid "error writing keyring `%s': %s\n" -msgstr "%s: error escritura registro de versiСn: %s\n" - #: g10/import.c:444 #, c-format msgid "key %08lX: 1 new user-id\n" @@ -1601,27 +1644,22 @@ #: g10/import.c:456 #, c-format msgid "key %08lX: 1 new subkey\n" -msgstr "clave %08lX: 1 nueva sub-clave\n" +msgstr "clave %08lX: 1 nueva subclave\n" #: g10/import.c:459 #, c-format msgid "key %08lX: %d new subkeys\n" -msgstr "clave %08lX: %d nuevas sub-claves\n" +msgstr "clave %08lX: %d nuevas subclaves\n" #: g10/import.c:469 #, c-format msgid "key %08lX: not changed\n" msgstr "clave %08lX: sin cambios\n" -#: g10/import.c:544 g10/import.c:645 -#, fuzzy, c-format -msgid "can't lock keyring `%s': %s\n" -msgstr "no puede bloquearse el anillo pЗblico: %s\n" - #: g10/import.c:552 #, c-format msgid "key %08lX: secret key imported\n" -msgstr "clave %08lX: clave secreta importata\n" +msgstr "clave %08lX: clave secreta importada\n" #. we can't merge secret keys #: g10/import.c:556 @@ -1659,7 +1697,7 @@ #: g10/import.c:693 g10/import.c:717 #, c-format msgid "key %08lX: unsupported public key algorithm\n" -msgstr "clave %08lX: algoritmo da clave pЗblica no soportado\n" +msgstr "clave %08lX: algoritmo de clave pЗblica no soportado\n" #: g10/import.c:694 #, c-format @@ -1667,14 +1705,14 @@ msgstr "clave %08lX: autofirma no vАlida\n" #: g10/import.c:709 -#, fuzzy, c-format +#, c-format msgid "key %08lX: no subkey for key binding\n" -msgstr "clave %08lX.%lu: buena uniСn de sub-clave\n" +msgstr "clave %08lX: no hay subclave para unir\n" #: g10/import.c:718 -#, fuzzy, c-format +#, c-format msgid "key %08lX: invalid subkey binding\n" -msgstr "clave %08lX.%lu: uniСn de sub-clave no vАlida\n" +msgstr "clave %08lX.%lu: uniСn de subclave no vАlida\n" #: g10/import.c:750 #, c-format @@ -1682,19 +1720,18 @@ msgstr "clave %08lX: ignorado identificativo de usuario '" #: g10/import.c:773 -#, fuzzy, c-format +#, c-format msgid "key %08lX: skipped subkey\n" -msgstr "clave %08lX: 1 nueva sub-clave\n" +msgstr "clave %08lX: subclave ignorada\n" #. here we violate the rfc a bit by still allowing #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense #: g10/import.c:798 -#, fuzzy, c-format +#, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" -msgstr "" -"clave %08lX: certificado de revocaciСn en lugar equivocado - ignorado\n" +msgstr "clave %08lX: firma no exportable (clase %02x) - ignorada\n" #: g10/import.c:807 #, c-format @@ -1710,7 +1747,7 @@ #: g10/import.c:915 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "" +msgstr "clave %08lX: detectado usuario duplicado - fusionada\n" #: g10/import.c:966 #, c-format @@ -1722,68 +1759,68 @@ msgid "key %08lX: our copy has no self-signature\n" msgstr "clave %08lX: nuestra copia no tiene autofirma\n" -#: g10/keyedit.c:91 +#: g10/keyedit.c:92 #, c-format msgid "%s: user not found\n" msgstr "%s: usuario no encontrado\n" -#: g10/keyedit.c:177 +#: g10/keyedit.c:153 msgid "[revocation]" -msgstr "" +msgstr "[revocaciСn]" -#: g10/keyedit.c:178 +#: g10/keyedit.c:154 msgid "[self-signature]" msgstr "[autofirma]" -#: g10/keyedit.c:196 +#: g10/keyedit.c:218 msgid "1 bad signature\n" msgstr "1 firma incorrecta\n" -#: g10/keyedit.c:198 +#: g10/keyedit.c:220 #, c-format msgid "%d bad signatures\n" msgstr "%d firmas incorrectas\n" -#: g10/keyedit.c:200 +#: g10/keyedit.c:222 msgid "1 signature not checked due to a missing key\n" msgstr "1 firma no comprobada por falta de clave\n" -#: g10/keyedit.c:202 +#: g10/keyedit.c:224 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d firmas no comprobadas por falta de clave\n" -#: g10/keyedit.c:204 +#: g10/keyedit.c:226 msgid "1 signature not checked due to an error\n" msgstr "1 firma no comprobada por causa de un error\n" -#: g10/keyedit.c:206 +#: g10/keyedit.c:228 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d firmas no comprobadas por causa de un error\n" -#: g10/keyedit.c:208 +#: g10/keyedit.c:230 msgid "1 user id without valid self-signature detected\n" msgstr "Detectado 1 identificativo de usuario sin autofirma vАlida\n" -#: g10/keyedit.c:210 +#: g10/keyedit.c:232 #, c-format msgid "%d user ids without valid self-signatures detected\n" msgstr "Detectados %d identificativos de usuario sin autofirma vАlida\n" #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. -#: g10/keyedit.c:290 +#: g10/keyedit.c:312 #, c-format msgid "Already signed by key %08lX\n" msgstr "Ya firmada por la clave %08lX\n" -#: g10/keyedit.c:298 +#: g10/keyedit.c:320 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nada que firmar con la clave %08lX\n" -#: g10/keyedit.c:307 +#: g10/keyedit.c:329 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -1791,35 +1828,37 @@ "©EstА realmente seguro de querer firmar esta clave\n" "con su clave: \"" -#: g10/keyedit.c:316 +#: g10/keyedit.c:338 msgid "" "The signature will be marked as non-exportable.\n" "\n" msgstr "" +"La firma se marcarА como no exportable.\n" +"\n" -#: g10/keyedit.c:321 +#: g10/keyedit.c:343 msgid "Really sign? " msgstr "©Firmar de verdad? " -#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75 +#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "firma fallida: %s\n" -#: g10/keyedit.c:400 +#: g10/keyedit.c:422 msgid "This key is not protected.\n" msgstr "Esta clave no estА protegida.\n" -#: g10/keyedit.c:403 +#: g10/keyedit.c:425 msgid "Key is protected.\n" msgstr "La clave estА protegida.\n" -#: g10/keyedit.c:420 +#: g10/keyedit.c:442 #, c-format msgid "Can't edit this key: %s\n" msgstr "No puede editarse esta clave: %s\n" -#: g10/keyedit.c:425 +#: g10/keyedit.c:447 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -1827,7 +1866,7 @@ "Introduzca la nueva contraseЯa para esta clave secreta.\n" "\n" -#: g10/keyedit.c:437 +#: g10/keyedit.c:459 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -1835,370 +1874,403 @@ "No ha especificado contraseЯa. Esto es probablemente una *mala* idea.\n" "\n" -#: g10/keyedit.c:440 +#: g10/keyedit.c:462 msgid "Do you really want to do this? " msgstr "©Realmente quiere hacer esto? " -#: g10/keyedit.c:501 +#: g10/keyedit.c:523 msgid "moving a key signature to the correct place\n" msgstr "moviendo la firma de la clave al lugar correcto\n" -#: g10/keyedit.c:537 -msgid "quit" -msgstr "" - -#: g10/keyedit.c:537 +#: g10/keyedit.c:559 msgid "quit this menu" msgstr "sale de este menЗ" -#: g10/keyedit.c:538 +#: g10/keyedit.c:560 msgid "q" msgstr "" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save" msgstr "" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save and quit" msgstr "graba y sale" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "help" msgstr "" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "show this help" msgstr "muestra esta ayuda" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "fpr" msgstr "" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "show fingerprint" msgstr "muestra huella dactilar" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list" msgstr "" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list key and user ids" msgstr "lista clave e identificativos de usuario" -#: g10/keyedit.c:544 +#: g10/keyedit.c:566 msgid "l" msgstr "" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "uid" msgstr "" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "select user id N" msgstr "selecciona identificativo de usuario N" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "key" msgstr "" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "select secondary key N" msgstr "selecciona clave secundaria N" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "check" msgstr "" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "list signatures" msgstr "lista firmas" -#: g10/keyedit.c:548 +#: g10/keyedit.c:570 msgid "c" msgstr "" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign" msgstr "" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign the key" msgstr "firma la clave" -#: g10/keyedit.c:550 +#: g10/keyedit.c:572 msgid "s" msgstr "" -#: g10/keyedit.c:551 +#: g10/keyedit.c:573 #, fuzzy msgid "lsign" msgstr "firmando:" -#: g10/keyedit.c:551 -#, fuzzy +#: g10/keyedit.c:573 msgid "sign the key locally" -msgstr "firma la clave" +msgstr "firma la clave localmente" -#: g10/keyedit.c:552 +#: g10/keyedit.c:574 msgid "debug" msgstr "" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "adduid" msgstr "" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "add a user id" msgstr "aЯade un identificativo de usuario" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "deluid" msgstr "" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "delete user id" msgstr "borra un identificativo de usuario" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "addkey" msgstr "" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "add a secondary key" msgstr "aЯade una clave secundaria" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delkey" msgstr "" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delete a secondary key" msgstr "borra una clave secundaria" -#: g10/keyedit.c:557 +#: g10/keyedit.c:579 +#, fuzzy +msgid "delsig" +msgstr "firmando:" + +#: g10/keyedit.c:579 +#, fuzzy +msgid "delete signatures" +msgstr "lista firmas" + +#: g10/keyedit.c:580 msgid "expire" msgstr "" -#: g10/keyedit.c:557 +#: g10/keyedit.c:580 msgid "change the expire date" msgstr "cambia fecha de caducidad" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle" msgstr "" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle between secret and public key listing" msgstr "cambia entre lista de claves secretas y pЗblicas" -#: g10/keyedit.c:560 +#: g10/keyedit.c:583 msgid "t" msgstr "" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "pref" msgstr "" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "list preferences" msgstr "muestra preferencias" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "passwd" msgstr "" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "change the passphrase" msgstr "cambia la contraseЯa" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "trust" msgstr "" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "change the ownertrust" msgstr "cambia valores de confianza" -#: g10/keyedit.c:564 +#: g10/keyedit.c:587 msgid "revsig" msgstr "" -#: g10/keyedit.c:564 -#, fuzzy +#: g10/keyedit.c:587 msgid "revoke signatures" -msgstr "fuerza firmas v3" +msgstr "revoca firmas" -#: g10/keyedit.c:565 +#: g10/keyedit.c:588 msgid "revkey" msgstr "" -#: g10/keyedit.c:565 -#, fuzzy +#: g10/keyedit.c:588 msgid "revoke a secondary key" -msgstr "borra una clave secundaria" +msgstr "revoca una clave secundaria" -#: g10/keyedit.c:584 +#: g10/keyedit.c:607 msgid "can't do that in batchmode\n" msgstr "imposible hacer esto en modo de proceso por lotes\n" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:613 +#: g10/keyedit.c:636 msgid "Secret key is available.\n" msgstr "Clave secreta disponible.\n" -#: g10/keyedit.c:642 +#: g10/keyedit.c:665 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:669 +#: g10/keyedit.c:692 msgid "Need the secret key to do this.\n" -msgstr "Se necesita la clave secreta para hacer esto\n" +msgstr "Se necesita la clave secreta para hacer esto.\n" -#: g10/keyedit.c:691 +#: g10/keyedit.c:714 msgid "Save changes? " msgstr "©Grabar cambios? " -#: g10/keyedit.c:694 +#: g10/keyedit.c:717 msgid "Quit without saving? " msgstr "©Salir sin grabar? " -#: g10/keyedit.c:704 +#: g10/keyedit.c:727 #, c-format msgid "update failed: %s\n" msgstr "actualizaciСn fallida: %s\n" -#: g10/keyedit.c:711 +#: g10/keyedit.c:734 #, c-format msgid "update secret failed: %s\n" msgstr "actualizaciСn de la clave secreta fallida: %s\n" -#: g10/keyedit.c:718 +#: g10/keyedit.c:741 msgid "Key not changed so no update needed.\n" msgstr "Clave sin cambios, no se necesita actualizaciСn.\n" -#: g10/keyedit.c:721 g10/keyedit.c:780 +#: g10/keyedit.c:744 g10/keyedit.c:803 #, c-format msgid "update of trustdb failed: %s\n" msgstr "actualizaciСn de confianza fallida: %s\n" -#: g10/keyedit.c:754 +#: g10/keyedit.c:777 msgid "Really sign all user ids? " msgstr "©Firmar realmente todos los identificativos de usuario? " -#: g10/keyedit.c:755 +#: g10/keyedit.c:778 msgid "Hint: Select the user ids to sign\n" msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n" -#: g10/keyedit.c:791 +#: g10/keyedit.c:814 g10/keyedit.c:835 msgid "You must select at least one user id.\n" msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n" -#: g10/keyedit.c:793 +#: g10/keyedit.c:816 msgid "You can't delete the last user id!\n" msgstr "║No puede borrar el Зltimo identificativo de usuario!\n" -#: g10/keyedit.c:796 +#: g10/keyedit.c:819 msgid "Really remove all selected user ids? " msgstr "©Borrar realmente todos los identificativos seleccionados? " -#: g10/keyedit.c:797 +#: g10/keyedit.c:820 msgid "Really remove this user id? " msgstr "©Borrar realmente este identificativo? " -#: g10/keyedit.c:820 g10/keyedit.c:842 +#: g10/keyedit.c:858 g10/keyedit.c:880 msgid "You must select at least one key.\n" msgstr "Debe seleccionar por lo menos una clave.\n" -#: g10/keyedit.c:824 +#: g10/keyedit.c:862 msgid "Do you really want to delete the selected keys? " msgstr "©Borrar realmente las claves seleccionadas? " -#: g10/keyedit.c:825 +#: g10/keyedit.c:863 msgid "Do you really want to delete this key? " msgstr "©Borrar realmente esta clave? " -#: g10/keyedit.c:846 -#, fuzzy +#: g10/keyedit.c:884 msgid "Do you really want to revoke the selected keys? " -msgstr "©Borrar realmente las claves seleccionadas? " +msgstr "©Revocar realmente las claves seleccionadas? " -#: g10/keyedit.c:847 -#, fuzzy +#: g10/keyedit.c:885 msgid "Do you really want to revoke this key? " -msgstr "©Borrar realmente esta clave? " +msgstr "©Revocar realmente esta clave? " -#: g10/keyedit.c:901 +#: g10/keyedit.c:939 msgid "Invalid command (try \"help\")\n" msgstr "Comando no vАlido (pruebe \"help\")\n" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 +msgid "Delete this good signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1298 +msgid "Delete this invalid signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1302 +msgid "Delete this unknown signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1308 +#, fuzzy +msgid "Really delete this self-signature? (y/N)" +msgstr "©Crear los certificados de revocaciСn realmente? (s/N)" + +#: g10/keyedit.c:1322 +#, fuzzy, c-format +msgid "Deleted %d signature.\n" +msgstr "%d firmas incorrectas\n" + +#: g10/keyedit.c:1323 +#, fuzzy, c-format +msgid "Deleted %d signatures.\n" +msgstr "%d firmas incorrectas\n" + +#: g10/keyedit.c:1326 +#, fuzzy +msgid "Nothing deleted.\n" +msgstr "ATENCIсN: no se ha exportado nada\n" + +#: g10/keyedit.c:1395 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite la selecciСn de las claves secretas.\n" -#: g10/keyedit.c:1299 +#: g10/keyedit.c:1401 msgid "Please select at most one secondary key.\n" -msgstr "Por favor, seleccione como mАximo una clave secundaria\n" +msgstr "Por favor, seleccione como mАximo una clave secundaria.\n" -#: g10/keyedit.c:1303 -msgid "Changing exiration time for a secondary key.\n" +#: g10/keyedit.c:1405 +#, fuzzy +msgid "Changing expiration time for a secondary key.\n" msgstr "Cambiando caducidad de clave secundaria.\n" -#: g10/keyedit.c:1305 -msgid "Changing exiration time for the primary key.\n" +#: g10/keyedit.c:1407 +#, fuzzy +msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando caducidad de clave primaria.\n" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1448 msgid "You can't change the expiration date of a v3 key\n" msgstr "No puede cambiar la fecha de caducidad de una clave v3\n" -#: g10/keyedit.c:1362 +#: g10/keyedit.c:1464 msgid "No corresponding signature in secret ring\n" msgstr "No hay firma correspondiente en anillo secreto\n" -#: g10/keyedit.c:1422 +#: g10/keyedit.c:1524 #, c-format msgid "No user id with index %d\n" msgstr "No hay ningЗn identificativo de usuario con el Мndice %d\n" -#: g10/keyedit.c:1468 +#: g10/keyedit.c:1570 #, c-format msgid "No secondary key with index %d\n" msgstr "No hay ninguna clave secundaria con el Мndice %d\n" -#: g10/keyedit.c:1566 -#, fuzzy +#: g10/keyedit.c:1668 msgid "user ID: \"" -msgstr "Introduzca el ID de usuario: " +msgstr "ID de usuario: \"" -#: g10/keyedit.c:1569 -#, fuzzy, c-format +#: g10/keyedit.c:1671 +#, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" -msgstr "Nada que firmar con la clave %08lX\n" +msgstr "" +"\"\n" +"firmada con su clave %08lX el %s\n" -#: g10/keyedit.c:1573 -#, fuzzy +#: g10/keyedit.c:1675 msgid "Create a revocation certificate for this signature? (y/N)" -msgstr "genera un certificado de revocaciСn" +msgstr "©Crear un certificado de revocaciСn para esta clave (s/N)?" -#: g10/keyedit.c:1653 -#, fuzzy +#: g10/keyedit.c:1755 msgid "Really create the revocation certificates? (y/N)" -msgstr "genera un certificado de revocaciСn" +msgstr "©Crear los certificados de revocaciСn realmente? (s/N)" -#: g10/keyedit.c:1676 -#, fuzzy +#: g10/keyedit.c:1778 msgid "no secret key\n" -msgstr "Clave secreta incorrecta" +msgstr "no hay clave secreta\n" #: g10/mainproc.c:184 -#, fuzzy, c-format +#, c-format msgid "public key is %08lX\n" -msgstr "Clave pЗblica no encontrada" +msgstr "la clave pЗblica es %08lX\n" #: g10/mainproc.c:212 msgid "public key encrypted data: good DEK\n" @@ -2219,7 +2291,7 @@ #: g10/mainproc.c:252 msgid "WARNING: encrypted message has been manipulated!\n" -msgstr "" +msgstr "ATENCIсN: ║el mensaje cifrado ha sido manipulado!\n" #: g10/mainproc.c:257 #, c-format @@ -2228,46 +2300,58 @@ #: g10/mainproc.c:275 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" -msgstr "nota: el remitente solicitС \"sСlo-para-tus-ojos\"\n" +msgstr "NOTA: el remitente solicitС \"sСlo-para-tus-ojos\"\n" #: g10/mainproc.c:277 #, c-format msgid "original file name='%.*s'\n" msgstr "nombre fichero original='%.*s'\n" -#: g10/mainproc.c:890 +#: g10/mainproc.c:505 g10/mainproc.c:514 +#, fuzzy +msgid "WARNING: invalid notation data found\n" +msgstr "no se han encontrados datos OpenPGP vАlidos\n" + +#: g10/mainproc.c:517 +msgid "Notation: " +msgstr "" + +#: g10/mainproc.c:524 +msgid "Policy: " +msgstr "" + +#: g10/mainproc.c:929 msgid "signature verification suppressed\n" msgstr "suprimida la verificaciСn de la firma\n" -#: g10/mainproc.c:896 +#: g10/mainproc.c:935 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:922 g10/mainproc.c:933 +#: g10/mainproc.c:961 g10/mainproc.c:972 msgid "BAD signature from \"" msgstr "Firma INCORRECTA de \"" -#: g10/mainproc.c:923 g10/mainproc.c:934 +#: g10/mainproc.c:962 g10/mainproc.c:973 msgid "Good signature from \"" msgstr "Firma correcta de \"" -#: g10/mainproc.c:925 -#, fuzzy +#: g10/mainproc.c:964 msgid " aka \"" -msgstr " importadas: %lu" +msgstr "tambiИn conocido como \"" -#: g10/mainproc.c:975 +#: g10/mainproc.c:1015 #, c-format msgid "Can't check signature: %s\n" msgstr "Imposible comprobar la firma: %s\n" -#: g10/mainproc.c:1056 +#: g10/mainproc.c:1109 msgid "old style (PGP 2.x) signature\n" msgstr "firma viejo estilo (PGP 2.x)\n" -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1114 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquete raМz no vАlido detectado en proc_tree()\n" @@ -2295,7 +2379,7 @@ #: g10/misc.c:239 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 " +"este algoritmo de cifrado estА en desuso, considere el uso de uno mАs " "estАndar.\n" #: g10/parse-packet.c:112 @@ -2303,10 +2387,10 @@ msgid "can't handle public key algorithm %d\n" msgstr "no puedo manejar el algoritmo de clave pЗblica %d\n" -#: g10/parse-packet.c:872 +#: g10/parse-packet.c:931 #, c-format msgid "subpacket of type %d has critical bit set\n" -msgstr "el sub-paquete de tipo %d tiene el bit crМtico activado\n" +msgstr "el subpaquete de tipo %d tiene el bit crМtico activado\n" #: g10/passphrase.c:157 msgid "" @@ -2328,11 +2412,11 @@ msgid " (main key ID %08lX)" msgstr "(ID clave primaria %08lX)" -#: g10/passphrase.c:190 +#: g10/passphrase.c:192 msgid "Enter passphrase: " msgstr "Introduzca contraseЯa: " -#: g10/passphrase.c:194 +#: g10/passphrase.c:196 msgid "Repeat passphrase: " msgstr "Repita contraseЯa: " @@ -2340,15 +2424,15 @@ 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:208 +#: g10/plaintext.c:266 msgid "Please enter name of data file: " msgstr "Introduzca el nombre del fichero de datos: " -#: g10/plaintext.c:229 +#: g10/plaintext.c:287 msgid "reading stdin ...\n" msgstr "leyendo stdin...\n" -#: g10/plaintext.c:302 +#: g10/plaintext.c:360 #, c-format msgid "can't open signed data `%s'\n" msgstr "imposible abrir datos firmados `%s'\n" @@ -2360,7 +2444,7 @@ #: g10/pubkey-enc.c:85 msgid "okay, we are the anonymous recipient.\n" -msgstr "De acuerdo, somos el destinatario anСnimo.\n" +msgstr "de acuerdo, somos el destinatario anСnimo.\n" #: g10/pubkey-enc.c:137 msgid "old encoding of the DEK is not supported\n" @@ -2369,7 +2453,7 @@ #: g10/pubkey-enc.c:191 #, c-format msgid "NOTE: cipher algorithm %d not found in preferences\n" -msgstr "nota: algoritmo de cifrado %d no encontrado en las preferencias\n" +msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n" #: g10/seckey-cert.c:55 #, c-format @@ -2382,10 +2466,9 @@ #: g10/seckey-cert.c:227 msgid "WARNING: Weak key detected - please change passphrase again.\n" -msgstr "Aviso: detectada clave dИbil - por favor cambie la contraseЯa.\n" +msgstr "ATENCIсN: detectada clave dИbil - por favor cambie la contraseЯa.\n" #: g10/sig-check.c:187 -#, fuzzy msgid "assuming bad MDC due to an unknown critical bit\n" msgstr "asumiendo firma mala debido a un bit crМtico desconocido\n" @@ -2397,52 +2480,52 @@ "firmas!\n" #: g10/sig-check.c:291 -#, fuzzy, c-format +#, c-format msgid "public key is %lu second newer than the signature\n" -msgstr "lid %lu: identificativo de usuario sin firma\n" +msgstr "la clave pЗblica es %lu segundos mАs nueva que la firma\n" #: g10/sig-check.c:292 -#, fuzzy, c-format +#, c-format msgid "public key is %lu seconds newer than the signature\n" -msgstr "lid %lu: identificativo de usuario sin firma\n" +msgstr "la clave pЗblica es %lu segundos mАs nueva que la firma\n" #: g10/sig-check.c:308 #, c-format msgid "NOTE: signature key expired %s\n" -msgstr "atenciСn: clave de la firma caducada el %s\n" +msgstr "NOTA: clave de la firma caducada el %s\n" #: g10/sig-check.c:365 msgid "assuming bad signature due to an unknown critical bit\n" msgstr "asumiendo firma mala debido a un bit crМtico desconocido\n" -#: g10/sign.c:79 +#: g10/sign.c:132 #, c-format msgid "%s signature from: %s\n" msgstr "firma %s de %s\n" -#: g10/sign.c:210 g10/sign.c:496 +#: g10/sign.c:263 g10/sign.c:554 #, c-format msgid "can't create %s: %s\n" -msgstr "no puede crearse `%s': %s\n" +msgstr "no puede crearse %s: %s\n" -#: g10/sign.c:306 +#: g10/sign.c:361 msgid "signing:" msgstr "firmando:" -#: g10/sign.c:346 +#: g10/sign.c:401 #, c-format msgid "WARNING: `%s' is an empty file\n" -msgstr "atenciСn: '%s' es un fichero vacМo\n" +msgstr "ATENCIсN `%s' es un fichero vacМo\n" #: g10/textfilter.c:128 -#, fuzzy, c-format +#, 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" +msgstr "no se pueden manejar lМneas de texto de mАs de %d caracteres\n" #: g10/textfilter.c:197 -#, fuzzy, c-format +#, c-format msgid "input line longer than %d characters\n" -msgstr "armadura invАlida: lМnea mАs larga de %d caracteres\n" +msgstr "lМnea de longitud superior a %d caracteres\n" #: g10/tdbio.c:116 g10/tdbio.c:1505 #, c-format @@ -2472,22 +2555,22 @@ #: g10/ringedit.c:302 g10/tdbio.c:447 #, c-format msgid "%s: directory created\n" -msgstr "%s: se ha creado el directorio\n" +msgstr "%s: directorio creado\n" #: g10/tdbio.c:451 #, c-format msgid "%s: directory does not exist!\n" -msgstr "%s: el directorio no existe\n" +msgstr "%s: ║el directorio no existe!\n" -#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457 +#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: no puede crearse: %s\n" #: g10/tdbio.c:472 g10/tdbio.c:521 -#, fuzzy, c-format +#, c-format msgid "%s: can't create lock\n" -msgstr "%s: no puede crearse: %s\n" +msgstr "%s: no puede crearse bloqueo\n" #: g10/tdbio.c:486 #, c-format @@ -2523,12 +2606,12 @@ #: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465 #, c-format msgid "%s: error reading version record: %s\n" -msgstr "%s: error lectura registro de versiСn: %s\n" +msgstr "%s: error leyendo registro de versiСn: %s\n" #: g10/tdbio.c:600 g10/tdbio.c:659 #, c-format msgid "%s: error writing version record: %s\n" -msgstr "%s: error escritura registro de versiСn: %s\n" +msgstr "%s: error escribiendo registro de versiСn: %s\n" #: g10/tdbio.c:1132 #, c-format @@ -2548,7 +2631,7 @@ #: g10/tdbio.c:1177 #, c-format msgid "%s: version record with recnum %lu\n" -msgstr "%s: registro de versiСn con numero de registro %lu\n" +msgstr "%s: registro de versiСn con nЗmero de registro %lu\n" #: g10/tdbio.c:1182 #, c-format @@ -2558,12 +2641,12 @@ #: g10/tdbio.c:1471 #, c-format msgid "%s: error reading free record: %s\n" -msgstr "%s: error lectura registro libre: %s\n" +msgstr "%s: error leyendo registro libre: %s\n" #: g10/tdbio.c:1479 #, c-format msgid "%s: error writing dir record: %s\n" -msgstr "%s: error escritura registro de directorio: %s\n" +msgstr "%s: error escribiendo registro de directorio: %s\n" #: g10/tdbio.c:1489 #, c-format @@ -2576,7 +2659,8 @@ msgstr "%s: fallo al aЯadir un registro: %s\n" #: g10/tdbio.c:1630 -msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n" +#, fuzzy +msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" "La base de datos de confianza estА daЯada. Por favor, ejecute\n" "\"gpgm --fix-trust-db\".\n" @@ -2604,7 +2688,7 @@ #: g10/trustdb.c:386 #, c-format msgid "error reading dir record for LID %lu: %s\n" -msgstr "error lectura registro de directorio del LID %lu: %s\n" +msgstr "error leyendo registro de directorio del LID %lu: %s\n" #: g10/trustdb.c:393 #, c-format @@ -2619,7 +2703,7 @@ #: g10/trustdb.c:403 #, c-format msgid "error reading primary key for LID %lu: %s\n" -msgstr "error lectura clave primaria para el LID %lu: %s\n" +msgstr "error leyendo clave primaria para el LID %lu: %s\n" #: g10/trustdb.c:442 #, c-format @@ -2747,12 +2831,12 @@ #: g10/trustdb.c:1210 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" -msgstr "clave %08lX.%lu: buena uniСn de sub-clave\n" +msgstr "clave %08lX.%lu: buena uniСn de subclave\n" #: g10/trustdb.c:1216 g10/trustdb.c:1259 #, c-format msgid "key %08lX.%lu: Invalid subkey binding: %s\n" -msgstr "clave %08lX.%lu: uniСn de sub-clave no vАlida\n" +msgstr "clave %08lX.%lu: uniСn de subclave no vАlida\n" #: g10/trustdb.c:1232 #, c-format @@ -2767,20 +2851,20 @@ #: g10/trustdb.c:1253 #, c-format msgid "key %08lX.%lu: Valid subkey revocation\n" -msgstr "clave %08lX.%lu: revocaciСn de sub-clave vАlida\n" +msgstr "clave %08lX.%lu: revocaciСn de subclave vАlida\n" #: g10/trustdb.c:1360 msgid "Good self-signature" -msgstr "autofirma buena" +msgstr "Autofirma buena" #: g10/trustdb.c:1371 msgid "Invalid self-signature" -msgstr "autofirma no vАlida" +msgstr "Autofirma no vАlida" #: g10/trustdb.c:1403 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 " +"RevocaciСn vАlida de identificativo de usuario ignorada debido a una " "autofirma mАs reciente\n" #: g10/trustdb.c:1410 @@ -2788,31 +2872,28 @@ msgstr "RevocaciСn identificativo de usuario vАlida.\n" #: g10/trustdb.c:1417 -#, fuzzy msgid "Invalid user ID revocation" -msgstr "RevocaciСn identificativo de usuario no vАlida.\n" +msgstr "RevocaciСn identificativo de usuario no vАlida." #: g10/trustdb.c:1512 msgid "Too many preferences" -msgstr "demasiadas preferencias" +msgstr "Demasiadas preferencias" #: g10/trustdb.c:1526 msgid "Too many preference items" -msgstr "demasiados items de preferencias" +msgstr "Demasiados Мtems de preferencias" #: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105 msgid "WARNING: can't yet handle long pref records\n" msgstr "ATENCмON: todavМa no puedo tratar registros de preferencias largos\n" #: g10/trustdb.c:1654 -#, fuzzy msgid "duplicated certificate - deleted" -msgstr "Certificado duplicado - eliminado" +msgstr "certificado duplicado - eliminado" #: g10/trustdb.c:1692 -#, fuzzy msgid "public key not anymore available" -msgstr "Clave secreta no disponible" +msgstr "clave pЗblica no disponible" #: g10/trustdb.c:1702 g10/trustdb.c:1791 msgid "Invalid certificate revocation" @@ -3023,7 +3104,7 @@ #: g10/skclist.c:113 #, c-format msgid "skipped `%s': %s\n" -msgstr "'%s' ignorado: %s\n" +msgstr "`%s' ignorado: %s\n" #: g10/skclist.c:119 #, c-format @@ -3031,8 +3112,8 @@ "skipped `%s': this is a PGP generated ElGamal key which is not secure for " "signatures!\n" msgstr "" -"'%s' ignorada: ║esta es una clave ElGamal generada por PGP\n" -" que NO es segura para las firmas!\n" +"`%s' ignorada: esta es una clave ElGamal generada por PGP que NO es segura " +"para las firmas\n" #. do not overwrite #: g10/openfile.c:65 @@ -3044,16 +3125,21 @@ msgid "Overwrite (y/N)? " msgstr "©Sobreescribir (s/N)? " -#: g10/openfile.c:92 +#: g10/openfile.c:97 +#, c-format +msgid "%s: unknown suffix\n" +msgstr "" + +#: g10/openfile.c:122 msgid "writing to stdout\n" msgstr "escribiendo en stdout\n" -#: g10/openfile.c:149 +#: g10/openfile.c:181 #, c-format msgid "assuming signed data in `%s'\n" msgstr "asumiendo que hay datos firmados en `%s'\n" -#: g10/openfile.c:199 +#: g10/openfile.c:231 #, c-format msgid "%s: new options file created\n" msgstr "%s: se ha creado un nuevo fichero de opciones\n" @@ -3182,30 +3268,52 @@ msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/helptext.c:175 +#: g10/helptext.c:176 +msgid "keyedit.delsig.valid" +msgstr "" + +#: g10/helptext.c:181 +msgid "keyedit.delsig.unknown" +msgstr "" + +#: g10/helptext.c:187 +msgid "keyedit.delsig.invalid" +msgstr "" + +#: g10/helptext.c:191 +msgid "keyedit.delsig.selfsig" +msgstr "" + +#: g10/helptext.c:200 msgid "passphrase.enter" msgstr "" -#: g10/helptext.c:182 +#: g10/helptext.c:207 msgid "passphrase.repeat" msgstr "" -#: g10/helptext.c:186 +#: g10/helptext.c:211 msgid "detached_signature.filename" msgstr "" -#: g10/helptext.c:190 +#: g10/helptext.c:215 msgid "openfile.overwrite.okay" msgstr "" -#: g10/helptext.c:204 +#: g10/helptext.c:229 msgid "No help available" msgstr "Ayuda no disponible" -#: g10/helptext.c:216 +#: g10/helptext.c:241 #, c-format msgid "No help available for `%s'" msgstr "Ayuda no disponible para `%s'" + +#~ msgid "can't lock keyring `%': %s\n" +#~ msgstr "no puede bloquearse el anillo pЗblico `%s': %s\n" + +#~ msgid "error writing keyring `%': %s\n" +#~ msgstr "error escribiendo anillo `%s': %s\n" #~ msgid "can't open file: %s\n" #~ msgstr "no puede abrirse el fichero: %s\n" diff -urN gnupg-0.9.7/po/fr.po gnupg-0.9.8/po/fr.po --- gnupg-0.9.7/po/fr.po Sun May 23 20:02:47 1999 +++ gnupg-0.9.8/po/fr.po Sat Jun 26 13:07:27 1999 @@ -4,11 +4,11 @@ # msgid "" msgstr "" -"Project-Id-Version: gnupg 0.9.4a\n" -"POT-Creation-Date: 1999-05-23 15:36+0200\n" -"PO-Revision-Date: 1999-03-20 20:09+01:00\n" +"Project-Id-Version: gnupg 0.9.7\n" +"POT-Creation-Date: 1999-06-26 11:22+0200\n" +"PO-Revision-Date: 1999-05-24 21:48+02:00\n" "Last-Translator: GaКl QuИri \n" -"Language-Team: French \n" +"Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" @@ -27,14 +27,23 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(vous avez peut-Йtre utilisИ le mauvais programme pour cette tache)\n" -#: util/miscutil.c:156 +#: util/miscutil.c:156 util/miscutil.c:173 msgid "yes" msgstr "oui" -#: util/miscutil.c:157 +#: util/miscutil.c:157 util/miscutil.c:175 msgid "yY" msgstr "oO" +#: g10/keyedit.c:559 util/miscutil.c:174 +msgid "quit" +msgstr "quitter" + +#: util/miscutil.c:176 +#, fuzzy +msgid "qQ" +msgstr "q" + #: util/errors.c:54 msgid "general error" msgstr "erreur gИnИrale" @@ -224,9 +233,8 @@ msgstr "erreur de rИseau" #: util/errors.c:102 -#, fuzzy msgid "not encrypted" -msgstr "donnИes chiffrИes avec %s\n" +msgstr "non chiffrИ" #: util/logger.c:218 #, c-format @@ -257,7 +265,7 @@ "N'UTILISEZ PAS LES DONNиES GиNиRиES PAR CE PROGRAMME !!\n" "\n" -#: cipher/rndlinux.c:110 +#: cipher/rndlinux.c:135 #, c-format msgid "" "\n" @@ -268,7 +276,7 @@ "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:165 +#: g10/g10.c:174 msgid "" "@Commands:\n" " " @@ -276,133 +284,132 @@ "@Commandes:\n" " " -#: g10/g10.c:167 +#: g10/g10.c:176 msgid "|[file]|make a signature" msgstr "|[fichier]|faire une signature" -#: g10/g10.c:168 +#: g10/g10.c:177 msgid "|[file]|make a clear text signature" msgstr "|[fichier]|faire une signature en texte clair" -#: g10/g10.c:169 +#: g10/g10.c:178 msgid "make a detached signature" msgstr "faire une signature dИtachИe" -#: g10/g10.c:170 +#: g10/g10.c:179 msgid "encrypt data" msgstr "chiffrer les donnИes" -#: g10/g10.c:171 +#: g10/g10.c:180 msgid "encryption only with symmetric cipher" msgstr "chiffrement symИtrique seulement" -#: g10/g10.c:172 +#: g10/g10.c:181 msgid "store only" msgstr "pas d'action" -#: g10/g10.c:173 +#: g10/g10.c:182 msgid "decrypt data (default)" msgstr "dИchiffrer les donnИes (dИfaut)" -#: g10/g10.c:174 +#: g10/g10.c:183 msgid "verify a signature" msgstr "vИrifier une signature" -#: g10/g10.c:175 +#: g10/g10.c:184 msgid "list keys" msgstr "lister les clИs" -#: g10/g10.c:177 +#: g10/g10.c:186 msgid "list keys and signatures" msgstr "lister les clИs et les signatures" -#: g10/g10.c:178 +#: g10/g10.c:187 msgid "check key signatures" msgstr "vИrifier les signatures des clИs" -#: g10/g10.c:179 +#: g10/g10.c:188 msgid "list keys and fingerprints" msgstr "lister les clИs et les empreintes" -#: g10/g10.c:180 +#: g10/g10.c:189 msgid "list secret keys" msgstr "lister les clИs secrХtes" -#: g10/g10.c:181 +#: g10/g10.c:190 msgid "generate a new key pair" msgstr "gИnИrer une nouvelle paire de clИs" -#: g10/g10.c:182 +#: g10/g10.c:191 msgid "remove key from the public keyring" msgstr "enlever la clИ du porte-clИs public" -#: g10/g10.c:183 +#: g10/g10.c:192 msgid "sign or edit a key" msgstr "signer ou Иditer une clИ" -#: g10/g10.c:184 +#: g10/g10.c:193 msgid "generate a revocation certificate" msgstr "gИnИrer un certificat de rИvocation" -#: g10/g10.c:185 +#: g10/g10.c:194 msgid "export keys" msgstr "exporter les clИs" -#: g10/g10.c:186 +#: g10/g10.c:195 msgid "export keys to a key server" msgstr "exporter les clИs vers un serveur de clИs" -#: g10/g10.c:187 -#, fuzzy +#: g10/g10.c:196 msgid "import keys from a key server" -msgstr "exporter les clИs vers un serveur de clИs" +msgstr "importer les clИs d'un serveur de clИs" -#: g10/g10.c:190 +#: g10/g10.c:199 msgid "import/merge keys" msgstr "importer/fusionner les clИs" -#: g10/g10.c:192 +#: g10/g10.c:201 msgid "list only the sequence of packets" msgstr "ne lister que les paquets" -#: g10/g10.c:194 +#: g10/g10.c:203 msgid "export the ownertrust values" msgstr "exporter les indices de confiance" -#: g10/g10.c:196 +#: g10/g10.c:205 msgid "import ownertrust values" msgstr "importer les indices de confiance" # -#: g10/g10.c:198 +#: g10/g10.c:207 msgid "|[NAMES]|update the trust database" msgstr "|[NOMS]|mettre la base de confiance Ю jour" -#: g10/g10.c:200 +#: g10/g10.c:209 msgid "|[NAMES]|check the trust database" msgstr "|[NOMS]|vИrifier la base de confiance" -#: g10/g10.c:201 +#: g10/g10.c:210 msgid "fix a corrupted trust database" msgstr "rИparer une base de confiance corrompue" -#: g10/g10.c:202 +#: g10/g10.c:211 msgid "De-Armor a file or stdin" msgstr "Enlever l'armure d'un fichier ou de stdin" -#: g10/g10.c:203 +#: g10/g10.c:212 msgid "En-Armor a file or stdin" msgstr "Mettre une armure Ю un fichier ou Ю stdin" -#: g10/g10.c:204 +#: g10/g10.c:213 msgid "|algo [files]|print message digests" msgstr "|alg. [fich.]|indiquer les fonctions de hachage" -#: g10/g10.c:205 +#: g10/g10.c:214 msgid "print all message digests" msgstr "Иcrire toutes les fonctions de hachage" -#: g10/g10.c:211 +#: g10/g10.c:220 msgid "" "@\n" "Options:\n" @@ -412,150 +419,162 @@ "Options:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:222 msgid "create ascii armored output" -msgstr "crИer une sortie ascii armurИe" +msgstr "crИer une sortie ascii avec armure" -#: g10/g10.c:214 +#: g10/g10.c:223 msgid "|NAME|encrypt for NAME" msgstr "|NOM|chiffrer pour NOM" -#: g10/g10.c:218 +#: g10/g10.c:227 msgid "use this user-id to sign or decrypt" msgstr "utiliser ce nom pour signer ou dИchiffrer" -#: g10/g10.c:219 +#: g10/g10.c:228 msgid "|N|set compress level N (0 disables)" msgstr "|N|niveau de compression N (0 dИsactive)" -#: g10/g10.c:221 +#: g10/g10.c:230 msgid "use canonical text mode" -msgstr "utiliser le mode de texte canonique" +msgstr "utiliser le mode texte canonique" -#: g10/g10.c:222 +#: g10/g10.c:231 msgid "use as output file" msgstr "utiliser comme fichier de sortie" -#: g10/g10.c:223 +#: g10/g10.c:232 msgid "verbose" msgstr "bavard" -#: g10/g10.c:224 +#: g10/g10.c:233 msgid "be somewhat more quiet" msgstr "devenir beaucoup plus silencieux" +#: g10/g10.c:234 +msgid "don't use the terminal at all" +msgstr "" + # -#: g10/g10.c:225 +#: g10/g10.c:235 msgid "force v3 signatures" msgstr "forcer les signatures en v3" -#: g10/g10.c:226 +#: g10/g10.c:236 msgid "always use a MDC for encryption" -msgstr "" +msgstr "toujours utiliser un sceau pour le chiffrement" -#: g10/g10.c:227 +#: g10/g10.c:237 msgid "do not make any changes" msgstr "ne rien changer" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:229 +#: g10/g10.c:239 msgid "batch mode: never ask" msgstr "mode automatique : ne jamais rien demander" -#: g10/g10.c:230 +#: g10/g10.c:240 msgid "assume yes on most questions" msgstr "rИpondre oui Ю la plupart des questions" -#: g10/g10.c:231 +#: g10/g10.c:241 msgid "assume no on most questions" msgstr "rИpondre non Ю la plupart des questions" -#: g10/g10.c:232 +#: g10/g10.c:242 msgid "add this keyring to the list of keyrings" msgstr "ajouter ce porte-clИs Ю la liste des porte-clИs" -#: g10/g10.c:233 +#: g10/g10.c:243 msgid "add this secret keyring to the list" msgstr "ajouter ce porte-clИs secret Ю la liste" -#: g10/g10.c:234 +#: g10/g10.c:244 msgid "|NAME|use NAME as default secret key" msgstr "|NOM|utiliser NOM comme clИ secrХte par dИfaut" -#: g10/g10.c:235 +#: g10/g10.c:245 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HтTE|utiliser ce serveur pour chercher des clИs" -#: g10/g10.c:236 +#: g10/g10.c:246 msgid "|NAME|set terminal charset to NAME" msgstr "|NOM|le terminal utilise la table de caractХres NOM" -#: g10/g10.c:237 +#: g10/g10.c:247 msgid "read options from file" msgstr "lire les options du fichier" -#: g10/g10.c:239 +#: g10/g10.c:249 msgid "set debugging flags" msgstr "choisir les attributs de dИboguage" -#: g10/g10.c:240 +#: g10/g10.c:250 msgid "enable full debugging" msgstr "permettre un dИboguage complet" -#: g10/g10.c:241 +#: g10/g10.c:251 msgid "|FD|write status info to this FD" msgstr "|FD|Иcrire l'Иtat sur ce descripteur" -#: g10/g10.c:242 +#: g10/g10.c:252 msgid "do not write comment packets" msgstr "ne pas Иcrire de paquets de commentaire" -#: g10/g10.c:243 +#: g10/g10.c:253 msgid "(default is 1)" -msgstr "(1 par dИfaut)" +msgstr "nombre de signatures complХtes requises (1)" -#: g10/g10.c:244 +#: g10/g10.c:254 msgid "(default is 3)" -msgstr "(3 par dИfaut)" +msgstr "nombre de signatures marginales requises (3)" -#: g10/g10.c:246 +#: g10/g10.c:256 msgid "|FILE|load extension module FILE" msgstr "|FICH|charger le module d'extension FICH" -#: g10/g10.c:247 +#: g10/g10.c:257 msgid "emulate the mode described in RFC1991" msgstr "imiter le mode dИcrit dans la RFC1991" +#: g10/g10.c:258 +msgid "set all packet, cipher and digest options to OpenPGP behavior" +msgstr "" + # FIXMOI : faudra trouver mieux ... -#: g10/g10.c:248 +#: g10/g10.c:259 msgid "|N|use passphrase mode N" msgstr "|N|utiliser le mode de codage des mots de passe N" -#: g10/g10.c:250 +#: g10/g10.c:261 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NOM|utiliser le hachage NOM pour les mots de passe" -#: g10/g10.c:252 +#: g10/g10.c:263 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe" -#: g10/g10.c:253 +#: g10/g10.c:264 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOM|utiliser l'algorithme de chiffrement NOM" -#: g10/g10.c:254 +#: g10/g10.c:265 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOM|utiliser la fonction de hachage NOM" -#: g10/g10.c:255 +#: g10/g10.c:266 msgid "|N|use compress algorithm N" msgstr "|N|utiliser l'algorithme de compression N" -#: g10/g10.c:256 +#: g10/g10.c:267 msgid "throw keyid field of encrypted packets" msgstr "supprimer l'identification des paquets chiffrИs" -#: g10/g10.c:258 +#: g10/g10.c:268 +msgid "|NAME=VALUE|use this notation data" +msgstr "" + +#: g10/g10.c:270 msgid "" "@\n" "Examples:\n" @@ -575,15 +594,15 @@ " --list-keys [utilisateur] montrer les clИs\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:327 +#: g10/g10.c:347 msgid "Please report bugs to .\n" msgstr "Rapporter toutes anomalies Ю .\n" -#: g10/g10.c:331 +#: g10/g10.c:351 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:334 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -593,7 +612,7 @@ "signer, vИrifier, chiffer ou dИchiffrer\n" "l'opИration par dИfaut dИpend des donnИes entrИes\n" -#: g10/g10.c:339 +#: g10/g10.c:359 msgid "" "\n" "Supported algorithms:\n" @@ -601,149 +620,172 @@ "\n" "Algorithmes supportИs:\n" -#: g10/g10.c:413 +#: g10/g10.c:433 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:453 +#: g10/g10.c:473 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:580 +#: g10/g10.c:605 #, 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:584 +#: g10/g10.c:609 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s' : %s\n" -#: g10/g10.c:591 +#: g10/g10.c:616 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:737 +#: g10/g10.c:782 #, 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:780 g10/g10.c:792 +#: g10/g10.c:827 g10/g10.c:839 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sИlectionnИ est invalide\n" -#: g10/g10.c:786 g10/g10.c:798 +#: g10/g10.c:833 g10/g10.c:845 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sИlectionnИe est invalide\n" -#: g10/g10.c:801 +#: g10/g10.c:849 +msgid "the given policy URL is invalid\n" +msgstr "" + +#: g10/g10.c:852 #, 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:803 +#: g10/g10.c:854 msgid "completes-needed must be greater than 0\n" msgstr "╚ completes-needed ╩ doit Йtre supИrieur Ю 0\n" -#: g10/g10.c:805 +#: g10/g10.c:856 msgid "marginals-needed must be greater than 1\n" msgstr "╚ marginals-needed ╩ doit Йtre supИrieur Ю 1\n" -#: g10/g10.c:807 +#: g10/g10.c:858 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:810 +#: g10/g10.c:861 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:814 +#: g10/g10.c:865 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:891 +#: g10/g10.c:942 #, 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:897 +#: g10/g10.c:948 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:904 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:912 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:925 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:938 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:952 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:964 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:973 +#: g10/g10.c:1024 msgid "--edit-key username [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:987 +#: g10/g10.c:1038 msgid "--delete-secret-key username" msgstr "--delete-secret-key utilisateur" -#: g10/g10.c:990 +#: g10/g10.c:1041 msgid "--delete-key username" msgstr "--delete-key utilisateur" -#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311 +#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "ne peut ouvrir %s: %s\n" -#: g10/g10.c:1024 +#: g10/g10.c:1075 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clИs]" -#: g10/g10.c:1083 +#: g10/g10.c:1134 #, c-format msgid "dearmoring failed: %s\n" msgstr "suppression d'armure non rИussie : %s\n" -#: g10/g10.c:1091 +#: g10/g10.c:1142 #, c-format msgid "enarmoring failed: %s\n" msgstr "construction d'armure non rИussie : %s \n" -#: g10/g10.c:1157 +#: g10/g10.c:1208 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:1232 +#: g10/g10.c:1283 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:1236 +#: g10/g10.c:1287 msgid "Go ahead and type your message ...\n" msgstr "Continuez et tapez votre message...\n" -#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "ne peut ouvrir `%s'\n" +#: g10/g10.c:1457 +msgid "" +"the first character of a notation name must be a letter or an underscore\n" +msgstr "" + +#: g10/g10.c:1463 +msgid "" +"a notation name must have only letters, digits, dots or underscores and end " +"with an '='\n" +msgstr "" + +#: g10/g10.c:1469 +msgid "dots in a notation name must be surrounded by other characters\n" +msgstr "" + +#: g10/g10.c:1477 +msgid "a notation value must not use any control characters\n" +msgstr "" + #: g10/armor.c:296 #, c-format msgid "armor: %s\n" @@ -805,7 +847,7 @@ #: g10/armor.c:1001 msgid "no valid OpenPGP data found.\n" -msgstr "aucune de donnИe OpenPGP valide n'a ИtИ trouvИe.\n" +msgstr "aucune donnИe OpenPGP valide n'a ИtИ trouvИe.\n" #: g10/armor.c:1005 #, c-format @@ -840,15 +882,17 @@ " 4 = I trust fully\n" " s = please show me more information\n" msgstr "" -"DИcidez Ю quel point vous avez confiance en cet utilisateur pour vИrifier\n" -"correctement les clИs des autres utilisateurs (en regardant des passeports,\n" -"en vИrifiant les empreintes de diverses sources...)?\n" +"ю quel point avez-vous confiance en cet utilisateur pour vИrifier " +"correctement\n" +"les clИs des autres utilisateurs (vous pouvez vИrifier son passeport, " +"vИrifier\n" +"les empreintes de diverses sources...) ?\n" "\n" " 1 = je ne sais pas\n" " 2 = je ne lui fais pas confiance\n" " 3 = je le crois marginalement\n" " 4 = je le crois totalement\n" -" s = montrez moi plus d'informations\n" +" s = montrez-moi plus d'informations\n" #: g10/pkclist.c:156 msgid " m = back to the main menu\n" @@ -914,9 +958,9 @@ msgstr "Utiliser cette clИ quand-mЙme ? " #: g10/pkclist.c:291 -#, fuzzy, c-format +#, c-format msgid "key %08lX: subkey has been revoked!\n" -msgstr "clИ %08lX : la clИ a ИtИ rИvoquИe !\n" +msgstr "clИ %08lX : la sous-clИ a ИtИ rИvoquИe !\n" #: g10/pkclist.c:321 #, c-format @@ -976,9 +1020,8 @@ msgstr " Cela pourrait signifier que la signature est fausse.\n" #: g10/pkclist.c:459 -#, fuzzy msgid "WARNING: This subkey has been revoked by its owner!\n" -msgstr "ATTENTION : Cette clИ Ю ИtИ rИvoquИe par son propriИtaire !\n" +msgstr "ATTENTION : Cette sous-clИ Ю ИtИ rИvoquИe par son propriИtaire !\n" #: g10/pkclist.c:480 msgid "Note: This key has expired!\n" @@ -1014,12 +1057,17 @@ msgstr "" " Il n'est pas sШr que la signature appartient Ю son propriИtaire.\n" -#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673 +#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705 #, c-format msgid "%s: skipped: %s\n" msgstr "%s : ignorИ : %s\n" -#: g10/pkclist.c:591 +#: g10/pkclist.c:588 g10/pkclist.c:687 +#, fuzzy, c-format +msgid "%s: skipped: public key already present\n" +msgstr "%s : problХme de lecture du bloc de clИs : %s\n" + +#: g10/pkclist.c:611 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1028,20 +1076,20 @@ "\"-r\")\n" "\n" -#: g10/pkclist.c:596 +#: g10/pkclist.c:616 msgid "Enter the user ID: " msgstr "Entrez le nom d'utilisateur : " -#: g10/pkclist.c:607 +#: g10/pkclist.c:627 msgid "No such user ID.\n" msgstr "Pas de tel utilisateur.\n" -#: g10/pkclist.c:653 +#: g10/pkclist.c:673 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s : erreur pendant la vИrification de la clИ : %s\n" -#: g10/pkclist.c:679 +#: g10/pkclist.c:711 msgid "no valid addressees\n" msgstr "pas de destinataire valide\n" @@ -1130,9 +1178,9 @@ #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. #: g10/keygen.c:466 -#, fuzzy, c-format +#, c-format msgid "keysize too large; %d is largest value allowed.\n" -msgstr "taille trop petite ; 768 est la plus petite valeur permise.\n" +msgstr "taille trop importante ; %d est la plus grande valeur permise.\n" #: g10/keygen.c:471 msgid "" @@ -1232,7 +1280,7 @@ #: g10/keygen.c:612 msgid "Name may not start with a digit\n" -msgstr "Le nom ne doit pas commencer avec un chiffre\n" +msgstr "Le nom ne doit pas commencer par un chiffre\n" #: g10/keygen.c:614 msgid "Name must be at least 5 characters long\n" @@ -1286,7 +1334,7 @@ "Vous avez besoin d'un mot de passe pour protИger votre clИ secrХte.\n" "\n" -#: g10/keyedit.c:433 g10/keygen.c:748 +#: g10/keyedit.c:455 g10/keygen.c:748 msgid "passphrase not correctly repeated; try again.\n" msgstr "le mot de passe n'a pas ИtИ rИpИtИ Ю l'identique ; recommencez.\n" @@ -1323,7 +1371,8 @@ msgstr "La paire de clИs DSA fera 1024 bits.\n" #: g10/keygen.c:859 -msgid "Key generation cancelled.\n" +#, fuzzy +msgid "Key generation canceled.\n" msgstr "La gИnИration a ИtИ annulИe.\n" #: g10/keygen.c:869 @@ -1355,7 +1404,7 @@ msgstr "La gИnИration de clИ a ИchouИ : %s\n" # on s'amuse comme on peut... -#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52 +#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1363,7 +1412,7 @@ "la clИ a ИtИ crИИe %lu seconde dans le futur (discontinuitИ temporelle ou\n" "problХme d'horloge)\n" -#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54 +#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1375,7 +1424,7 @@ msgid "Really create? " msgstr "CrИer vraiment ? " -#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467 +#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467 #: g10/tdbio.c:528 #, c-format msgid "%s: can't open: %s\n" @@ -1396,7 +1445,7 @@ msgid "reading from `%s'\n" msgstr "lecture de `%s'\n" -#: g10/encode.c:417 +#: g10/encode.c:431 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s chiffrИ pour : %s\n" @@ -1436,9 +1485,9 @@ "principale %08lX\n" #: g10/import.c:116 -#, fuzzy, c-format +#, c-format msgid "can't open `%s': %s\n" -msgstr "ne peut ouvrir %s: %s\n" +msgstr "impossible d'ouvrir `%s': %s\n" #: g10/import.c:160 #, c-format @@ -1451,9 +1500,9 @@ msgstr "%lu clИs traitИes jusqu'ici\n" #: g10/import.c:172 -#, fuzzy, c-format +#, c-format msgid "error reading `%s': %s\n" -msgstr "erreur pendant la crИation du mot de passe : %s\n" +msgstr "erreur pendant la lecture de `%s' : %s\n" #: g10/import.c:175 #, c-format @@ -1533,20 +1582,20 @@ msgid "no default public keyring\n" msgstr "pas de porte-clИs public par dИfaut\n" -#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501 +#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "Иcriture de `%s'\n" -#: g10/import.c:379 g10/import.c:435 -#, fuzzy -msgid "can't lock keyring `%': %s\n" -msgstr "ne peut verrouiller le porte-clИs public : %s\n" +#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#, c-format +msgid "can't lock keyring `%s': %s\n" +msgstr "ne peut verrouiller le porte-clИs `%s' : %s\n" -#: g10/import.c:382 -#, fuzzy -msgid "error writing keyring `%': %s\n" -msgstr "%s : erreur pendant l'Иcriture de l'enregistrement de version : %s\n" +#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648 +#, c-format +msgid "error writing keyring `%s': %s\n" +msgstr "erreur durant l'Иcriture du porte-clИs `%s' : %s\n" #: g10/import.c:387 #, c-format @@ -1568,11 +1617,6 @@ 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:438 g10/import.c:547 g10/import.c:648 -#, fuzzy, c-format -msgid "error writing keyring `%s': %s\n" -msgstr "%s : erreur pendant l'Иcriture de l'enregistrement de version : %s\n" - #: g10/import.c:444 #, c-format msgid "key %08lX: 1 new user-id\n" @@ -1608,11 +1652,6 @@ msgid "key %08lX: not changed\n" msgstr "clИ %08lX : n'a pas changИ\n" -#: g10/import.c:544 g10/import.c:645 -#, fuzzy, c-format -msgid "can't lock keyring `%s': %s\n" -msgstr "ne peut verrouiller le porte-clИs public : %s\n" - #: g10/import.c:552 #, c-format msgid "key %08lX: secret key imported\n" @@ -1703,7 +1742,7 @@ #: g10/import.c:915 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "" +msgstr "clИ %08lX: nom d'utilisateur doublon fusionnИ\n" #: g10/import.c:966 #, c-format @@ -1715,68 +1754,68 @@ msgid "key %08lX: our copy has no self-signature\n" msgstr "clИ %08lX : notre copie n'a pas d'auto-signature\n" -#: g10/keyedit.c:91 +#: g10/keyedit.c:92 #, c-format msgid "%s: user not found\n" msgstr "%s : utilisateur non trouvИ\n" -#: g10/keyedit.c:177 +#: g10/keyedit.c:153 msgid "[revocation]" -msgstr "" +msgstr "[rИvocation]" -#: g10/keyedit.c:178 +#: g10/keyedit.c:154 msgid "[self-signature]" msgstr "[auto-signature]" -#: g10/keyedit.c:196 +#: g10/keyedit.c:218 msgid "1 bad signature\n" msgstr "une mauvaise signature\n" -#: g10/keyedit.c:198 +#: g10/keyedit.c:220 #, c-format msgid "%d bad signatures\n" msgstr "%d mauvaises signatures\n" -#: g10/keyedit.c:200 +#: g10/keyedit.c:222 msgid "1 signature not checked due to a missing key\n" msgstr "une signature non vИrifiИe Ю cause d'une clИ manquante\n" -#: g10/keyedit.c:202 +#: g10/keyedit.c:224 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d signatures non vИrifiИes Ю cause de clИs manquantes\n" -#: g10/keyedit.c:204 +#: g10/keyedit.c:226 msgid "1 signature not checked due to an error\n" msgstr "une signature non vИrifiИe Ю cause d'une erreur\n" -#: g10/keyedit.c:206 +#: g10/keyedit.c:228 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d signatures non vИrifiИes Ю cause d'erreurs\n" -#: g10/keyedit.c:208 +#: g10/keyedit.c:230 msgid "1 user id without valid self-signature detected\n" msgstr "un nom d'utilisateur sans auto-signature valide dИtectИ\n" -#: g10/keyedit.c:210 +#: g10/keyedit.c:232 #, c-format msgid "%d user ids without valid self-signatures detected\n" msgstr "%d nom d'utilisateurs sans auto-signature valide dИtectИ\n" #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. -#: g10/keyedit.c:290 +#: g10/keyedit.c:312 #, c-format msgid "Already signed by key %08lX\n" msgstr "DИjЮ signИ par la clИ %08lX\n" -#: g10/keyedit.c:298 +#: g10/keyedit.c:320 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Rien Ю signer avec la clИ %08lX\n" -#: g10/keyedit.c:307 +#: g10/keyedit.c:329 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -1784,7 +1823,7 @@ "Etes-vous vraiment sШr(e) que vous voulez signer cette clИ\n" "avec la vТtre : \"" -#: g10/keyedit.c:316 +#: g10/keyedit.c:338 msgid "" "The signature will be marked as non-exportable.\n" "\n" @@ -1792,35 +1831,35 @@ "La signature sera marquИe comme non-exportable.\n" "\n" -#: g10/keyedit.c:321 +#: g10/keyedit.c:343 msgid "Really sign? " msgstr "Signer rИellement ? " -#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75 +#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "la signature a ИchouИ : %s\n" -#: g10/keyedit.c:400 +#: g10/keyedit.c:422 msgid "This key is not protected.\n" msgstr "Cette clИ n'est pas protИgИe.\n" -#: g10/keyedit.c:403 +#: g10/keyedit.c:425 msgid "Key is protected.\n" msgstr "La clИ est protИgИe.\n" -#: g10/keyedit.c:420 +#: g10/keyedit.c:442 #, c-format msgid "Can't edit this key: %s\n" msgstr "Ne peut Иditer cette clИ : %s\n" -#: g10/keyedit.c:425 +#: g10/keyedit.c:447 msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "Entrez le nouveau mot de passe pour cette clИ secrХte.\n" -#: g10/keyedit.c:437 +#: g10/keyedit.c:459 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -1829,368 +1868,401 @@ "*mauvaise* idИe\n" "\n" -#: g10/keyedit.c:440 +#: g10/keyedit.c:462 msgid "Do you really want to do this? " msgstr "Voulez-vous vraiment faire cela? " -#: g10/keyedit.c:501 +#: g10/keyedit.c:523 msgid "moving a key signature to the correct place\n" msgstr "replacer la signature d'une clИ Ю l'endroit correct\n" -#: g10/keyedit.c:537 -msgid "quit" -msgstr "quitter" - -#: g10/keyedit.c:537 +#: g10/keyedit.c:559 msgid "quit this menu" msgstr "quitter ce menu" -#: g10/keyedit.c:538 +#: g10/keyedit.c:560 msgid "q" msgstr "q" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save" msgstr "enregistrer" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save and quit" msgstr "enregistrer et quitter" # FIXMOI : si je mets aide Гa va demander de taper "aide"... -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "help" msgstr "help" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "show this help" msgstr "afficher cette aide" # g10/keyedit.c:556 ??? -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "show fingerprint" msgstr "afficher l'empreinte" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list" msgstr "lister" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list key and user ids" msgstr "lister la clИ et les noms d'utilisateurs" -#: g10/keyedit.c:544 +#: g10/keyedit.c:566 msgid "l" msgstr "l" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "uid" msgstr "uid" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "select user id N" msgstr "sИlectionner le nom d'utilisateur N" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "key" msgstr "clИ" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "select secondary key N" msgstr "sИlectionner la clИ secondaire N" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "check" msgstr "vИrifier" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "list signatures" msgstr "lister les signatures" -#: g10/keyedit.c:548 +#: g10/keyedit.c:570 msgid "c" msgstr "c" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign" msgstr "signer" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign the key" msgstr "signer la clИ" -#: g10/keyedit.c:550 +#: g10/keyedit.c:572 msgid "s" msgstr "s" -#: g10/keyedit.c:551 +#: g10/keyedit.c:573 msgid "lsign" msgstr "lsigner" -#: g10/keyedit.c:551 +#: g10/keyedit.c:573 msgid "sign the key locally" msgstr "signer la clИ localement" -#: g10/keyedit.c:552 +#: g10/keyedit.c:574 msgid "debug" msgstr "dИboguer" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "adduid" msgstr "aj.ut" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "add a user id" msgstr "ajouter un utilisateur" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "deluid" msgstr "suppr.ut" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "delete user id" msgstr "enlever un utilisateur" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "addkey" msgstr "aj.clИ" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "add a secondary key" msgstr "ajouter une clИ secondaire" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delkey" msgstr "suppr.clИ" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delete a secondary key" msgstr "enlever une clИ secondaire" -#: g10/keyedit.c:557 +#: g10/keyedit.c:579 +#, fuzzy +msgid "delsig" +msgstr "lsigner" + +#: g10/keyedit.c:579 +#, fuzzy +msgid "delete signatures" +msgstr "lister les signatures" + +#: g10/keyedit.c:580 msgid "expire" msgstr "expire" -#: g10/keyedit.c:557 +#: g10/keyedit.c:580 msgid "change the expire date" msgstr "changer la date d'expiration" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle" msgstr "changer" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle between secret and public key listing" msgstr "passer de la liste des clИs secrХtes aux clИs privИes et inversement" -#: g10/keyedit.c:560 +#: g10/keyedit.c:583 msgid "t" msgstr "t" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "pref" msgstr "prИf" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "list preferences" msgstr "lister les prИfИrences" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "passwd" msgstr "mot.pas" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "change the passphrase" msgstr "changer le mot de passe" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "trust" msgstr "confi." -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "change the ownertrust" msgstr "changer la confiance" -#: g10/keyedit.c:564 -#, fuzzy +#: g10/keyedit.c:587 msgid "revsig" -msgstr "signer" +msgstr "revsig" # -#: g10/keyedit.c:564 -#, fuzzy +#: g10/keyedit.c:587 msgid "revoke signatures" -msgstr "forcer les signatures en v3" +msgstr "rИvoquer les signatures" -#: g10/keyedit.c:565 -#, fuzzy +#: g10/keyedit.c:588 msgid "revkey" -msgstr "clИ" +msgstr "revclИ" -#: g10/keyedit.c:565 -#, fuzzy +#: g10/keyedit.c:588 msgid "revoke a secondary key" -msgstr "enlever une clИ secondaire" +msgstr "rИvoquer une clИ secondaire" -#: g10/keyedit.c:584 +#: g10/keyedit.c:607 msgid "can't do that in batchmode\n" -msgstr "ne peut faire cela en mode automatique\n" +msgstr "impossible de faire cela en mode automatique\n" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:613 +#: g10/keyedit.c:636 msgid "Secret key is available.\n" msgstr "La clИ secrХte est disponible.\n" -#: g10/keyedit.c:642 +#: g10/keyedit.c:665 msgid "Command> " msgstr "Commande> " -#: g10/keyedit.c:669 +#: g10/keyedit.c:692 msgid "Need the secret key to do this.\n" msgstr "Il faut la clИ secrХte pour faire cela.\n" -#: g10/keyedit.c:691 +#: g10/keyedit.c:714 msgid "Save changes? " msgstr "Enregistrer les changements? " -#: g10/keyedit.c:694 +#: g10/keyedit.c:717 msgid "Quit without saving? " msgstr "Quitter sans enregistrer? " -#: g10/keyedit.c:704 +#: g10/keyedit.c:727 #, c-format msgid "update failed: %s\n" msgstr "la mise Ю jour a ИchouИ : %s\n" -#: g10/keyedit.c:711 +#: g10/keyedit.c:734 #, c-format msgid "update secret failed: %s\n" msgstr "la mise Ю jour de la clИ secrХte a ИchouИ : %s\n" -#: g10/keyedit.c:718 +#: g10/keyedit.c:741 msgid "Key not changed so no update needed.\n" msgstr "La clИ n'a pas changИ donc la mise Ю jour est inutile.\n" -#: g10/keyedit.c:721 g10/keyedit.c:780 +#: g10/keyedit.c:744 g10/keyedit.c:803 #, c-format msgid "update of trustdb failed: %s\n" msgstr "la mise Ю jour de la base de confiance a ИchouИ : %s\n" -#: g10/keyedit.c:754 +#: g10/keyedit.c:777 msgid "Really sign all user ids? " msgstr "Signer vraiment tous les utilisateurs ? " -#: g10/keyedit.c:755 +#: g10/keyedit.c:778 msgid "Hint: Select the user ids to sign\n" msgstr "Aide : SИlectionner les utilisateurs Ю signer\n" -#: g10/keyedit.c:791 +#: g10/keyedit.c:814 g10/keyedit.c:835 msgid "You must select at least one user id.\n" msgstr "Vous devez sИlectionner au moins un utilisateur.\n" -#: g10/keyedit.c:793 +#: g10/keyedit.c:816 msgid "You can't delete the last user id!\n" msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n" -#: g10/keyedit.c:796 +#: g10/keyedit.c:819 msgid "Really remove all selected user ids? " msgstr "Enlever rИellement tous les utilisateurs sИlectionnИs ? " -#: g10/keyedit.c:797 +#: g10/keyedit.c:820 msgid "Really remove this user id? " msgstr "Enlever rИellement cet utilisateur ? " -#: g10/keyedit.c:820 g10/keyedit.c:842 +#: g10/keyedit.c:858 g10/keyedit.c:880 msgid "You must select at least one key.\n" msgstr "Vous devez sИlectionner au moins une clИ.\n" -#: g10/keyedit.c:824 +#: g10/keyedit.c:862 msgid "Do you really want to delete the selected keys? " msgstr "Voulez-vous vraiment supprimer les clИs sИlectionnИes ? " -#: g10/keyedit.c:825 +#: g10/keyedit.c:863 msgid "Do you really want to delete this key? " msgstr "Voulez-vous vraiment supprimer cette clИ ? " -#: g10/keyedit.c:846 -#, fuzzy +#: g10/keyedit.c:884 msgid "Do you really want to revoke the selected keys? " -msgstr "Voulez-vous vraiment supprimer les clИs sИlectionnИes ? " +msgstr "Voulez-vous vraiment rИvoquer les clИs sИlectionnИes ? " -#: g10/keyedit.c:847 -#, fuzzy +#: g10/keyedit.c:885 msgid "Do you really want to revoke this key? " -msgstr "Voulez-vous vraiment supprimer cette clИ ? " +msgstr "Voulez-vous vraiment rИvoquer cette clИ ? " -#: g10/keyedit.c:901 +#: g10/keyedit.c:939 msgid "Invalid command (try \"help\")\n" msgstr "Commande invalide (essayez ╚ help ╩)\n" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 +msgid "Delete this good signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1298 +msgid "Delete this invalid signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1302 +#, fuzzy +msgid "Delete this unknown signature? (y/N/q)" +msgstr "Faut-il vraiment gИnИrer les certificats de rИvocation ? (o/N)" + +#: g10/keyedit.c:1308 +#, fuzzy +msgid "Really delete this self-signature? (y/N)" +msgstr "Faut-il vraiment gИnИrer les certificats de rИvocation ? (o/N)" + +#: g10/keyedit.c:1322 +#, fuzzy, c-format +msgid "Deleted %d signature.\n" +msgstr "%d mauvaises signatures\n" + +#: g10/keyedit.c:1323 +#, fuzzy, c-format +msgid "Deleted %d signatures.\n" +msgstr "%d mauvaises signatures\n" + +#: g10/keyedit.c:1326 +#, fuzzy +msgid "Nothing deleted.\n" +msgstr "ATTENTION : rien n'a ИtИ exportИ\n" + +#: g10/keyedit.c:1395 msgid "Please remove selections from the secret keys.\n" msgstr "Enlevez les sИlections des clИs secrХtes.\n" -#: g10/keyedit.c:1299 +#: g10/keyedit.c:1401 msgid "Please select at most one secondary key.\n" msgstr "Vous devez sИlectionner au plus une clИ secondaire.\n" -#: g10/keyedit.c:1303 -msgid "Changing exiration time for a secondary key.\n" +#: g10/keyedit.c:1405 +#, fuzzy +msgid "Changing expiration time for a secondary key.\n" msgstr "Changer la date d'expiration d'une clИ secondaire.\n" -#: g10/keyedit.c:1305 -msgid "Changing exiration time for the primary key.\n" +#: g10/keyedit.c:1407 +#, fuzzy +msgid "Changing expiration time for the primary key.\n" msgstr "Changer la date d'expiration de la clИ principale.\n" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1448 msgid "You can't change the expiration date of a v3 key\n" msgstr "Vous ne pouvez pas changer la date d'expiration d'une clИ v3\n" -#: g10/keyedit.c:1362 +#: g10/keyedit.c:1464 msgid "No corresponding signature in secret ring\n" msgstr "Pas de signature correspondante dans le porte-clИs secret\n" -#: g10/keyedit.c:1422 +#: g10/keyedit.c:1524 #, c-format msgid "No user id with index %d\n" msgstr "Pas d'utilisateur avec l'index %d\n" -#: g10/keyedit.c:1468 +#: g10/keyedit.c:1570 #, c-format msgid "No secondary key with index %d\n" msgstr "Pas de clИ secondaire avec l'index %d\n" -#: g10/keyedit.c:1566 -#, fuzzy +#: g10/keyedit.c:1668 msgid "user ID: \"" -msgstr "Entrez le nom d'utilisateur : " +msgstr "nom d'utilisateur : ╚ " -#: g10/keyedit.c:1569 -#, fuzzy, c-format +#: g10/keyedit.c:1671 +#, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" -msgstr "Rien Ю signer avec la clИ %08lX\n" +msgstr "" +" ╩\n" +"signИ avec votre clИ %08lX Ю %s\n" -#: g10/keyedit.c:1573 -#, fuzzy +#: g10/keyedit.c:1675 msgid "Create a revocation certificate for this signature? (y/N)" -msgstr "gИnИrer un certificat de rИvocation" +msgstr "GИnИrer un certificat de rИvocation pour cette signature ? (o/N)" -#: g10/keyedit.c:1653 -#, fuzzy +#: g10/keyedit.c:1755 msgid "Really create the revocation certificates? (y/N)" -msgstr "gИnИrer un certificat de rИvocation" +msgstr "Faut-il vraiment gИnИrer les certificats de rИvocation ? (o/N)" -#: g10/keyedit.c:1676 -#, fuzzy +#: g10/keyedit.c:1778 msgid "no secret key\n" -msgstr "mauvaise clИ secrХte" +msgstr "pas de clИ secrХte\n" #: g10/mainproc.c:184 #, c-format @@ -2216,7 +2288,7 @@ #: g10/mainproc.c:252 msgid "WARNING: encrypted message has been manipulated!\n" -msgstr "" +msgstr "ATTENTION: le message chiffrИ a ИtИ manipulИ !\n" #: g10/mainproc.c:257 #, c-format @@ -2232,38 +2304,51 @@ msgid "original file name='%.*s'\n" msgstr "nom de fichier original : '%.*s'\n" -#: g10/mainproc.c:890 +#: g10/mainproc.c:505 g10/mainproc.c:514 +#, fuzzy +msgid "WARNING: invalid notation data found\n" +msgstr "aucune donnИe OpenPGP valide n'a ИtИ trouvИe.\n" + +#: g10/mainproc.c:517 +msgid "Notation: " +msgstr "" + +#: g10/mainproc.c:524 +msgid "Policy: " +msgstr "" + +#: g10/mainproc.c:929 msgid "signature verification suppressed\n" msgstr "vИrification de signature supprimИe\n" -#: g10/mainproc.c:896 +#: g10/mainproc.c:935 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signature faite %.*s avec une clИ %s ID %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:922 g10/mainproc.c:933 +#: g10/mainproc.c:961 g10/mainproc.c:972 msgid "BAD signature from \"" msgstr "MAUVAISE signature de \"" -#: g10/mainproc.c:923 g10/mainproc.c:934 +#: g10/mainproc.c:962 g10/mainproc.c:973 msgid "Good signature from \"" msgstr "Bonne signature de \"" -#: g10/mainproc.c:925 +#: g10/mainproc.c:964 msgid " aka \"" msgstr " alias \"" -#: g10/mainproc.c:975 +#: g10/mainproc.c:1015 #, c-format msgid "Can't check signature: %s\n" msgstr "Ne peut vИrifier la signature : %s\n" -#: g10/mainproc.c:1056 +#: g10/mainproc.c:1109 msgid "old style (PGP 2.x) signature\n" msgstr "signature d'un ancien style (PGP 2.x)\n" -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1114 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquet racine invalide dИtectИ dans proc_tree()\n" @@ -2299,7 +2384,7 @@ msgid "can't handle public key algorithm %d\n" msgstr "ne peut gИrer l'algorithme Ю clИ publique %d\n" -#: g10/parse-packet.c:872 +#: g10/parse-packet.c:931 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "un sous-paquet de type %d possХde un bit critique\n" @@ -2324,11 +2409,11 @@ msgid " (main key ID %08lX)" msgstr " (ID clИ principale %08lX)" -#: g10/passphrase.c:190 +#: g10/passphrase.c:192 msgid "Enter passphrase: " msgstr "Entrez le mot de passe : " -#: g10/passphrase.c:194 +#: g10/passphrase.c:196 msgid "Repeat passphrase: " msgstr "RИpИtez le mot de passe : " @@ -2338,15 +2423,15 @@ "donnИes non enregistrИes ; utilisez l'option \"--output\" pour\n" "les enregistrer\n" -#: g10/plaintext.c:208 +#: g10/plaintext.c:266 msgid "Please enter name of data file: " msgstr "Entrez le nom d'un fichier de donnИes : " -#: g10/plaintext.c:229 +#: g10/plaintext.c:287 msgid "reading stdin ...\n" msgstr "lecture de l'entrИe standard...\n" -#: g10/plaintext.c:302 +#: g10/plaintext.c:360 #, c-format msgid "can't open signed data `%s'\n" msgstr "ne peut ouvir les donnИes signИes `%s'\n" @@ -2385,11 +2470,8 @@ msgstr "ATTENTION : ClИ faible dИtectИe - changez encore le mot de passe.\n" #: g10/sig-check.c:187 -#, fuzzy msgid "assuming bad MDC due to an unknown critical bit\n" -msgstr "" -"la signature est supposИe Йtre fausse car un bit critique est\n" -"inconnu\n" +msgstr "le sceau (MDC) est supposИ Йtre faux car un bit critique est inconnu\n" #: g10/sig-check.c:283 msgid "" @@ -2419,21 +2501,21 @@ "la signature est supposИe Йtre fausse car un bit critique est\n" "inconnu\n" -#: g10/sign.c:79 +#: g10/sign.c:132 #, c-format msgid "%s signature from: %s\n" msgstr "Signature %s de : %s\n" -#: g10/sign.c:210 g10/sign.c:496 +#: g10/sign.c:263 g10/sign.c:554 #, c-format msgid "can't create %s: %s\n" msgstr "ne peut crИer %s : %s\n" -#: g10/sign.c:306 +#: g10/sign.c:361 msgid "signing:" msgstr "signature :" -#: g10/sign.c:346 +#: g10/sign.c:401 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATTENTION : `%s' est un fichier vide\n" @@ -2484,7 +2566,7 @@ msgid "%s: directory does not exist!\n" msgstr "%s : le rИpertoire n'existe pas !\n" -#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457 +#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457 #, c-format msgid "%s: can't create: %s\n" msgstr "%s : ne peut crИer : %s\n" @@ -2584,7 +2666,8 @@ msgstr "%s : n'a pas pu ajouter un enregistrement : %s\n" #: g10/tdbio.c:1630 -msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n" +#, fuzzy +msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" "La base de confiance est corrompue ; exИcutez ╚ gpgm --fix-trustdb ╩.\n" @@ -3060,16 +3143,21 @@ msgid "Overwrite (y/N)? " msgstr "RИИcrire (o/N)? " -#: g10/openfile.c:92 +#: g10/openfile.c:97 +#, c-format +msgid "%s: unknown suffix\n" +msgstr "" + +#: g10/openfile.c:122 msgid "writing to stdout\n" msgstr "Иcriture vers la sortie standard\n" -#: g10/openfile.c:149 +#: g10/openfile.c:181 #, c-format msgid "assuming signed data in `%s'\n" msgstr "les donnИes signИes sont supposИes Йtre dans `%s'\n" -#: g10/openfile.c:199 +#: g10/openfile.c:231 #, c-format msgid "%s: new options file created\n" msgstr "%s : nouveau fichier d'options crИИ\n" @@ -3230,73 +3318,55 @@ msgid "keyedit.remove.subkey.okay" msgstr "Entrez ╚ oui ╩ s'il faut vraiment supprimer la sous-clИ" -#: g10/helptext.c:175 +#: g10/helptext.c:176 +#, fuzzy +msgid "keyedit.delsig.valid" +msgstr "RИpondez ╚ oui ╩ si vous voulez signer TOUS les noms d'utilisateurs" + +#: g10/helptext.c:181 +#, fuzzy +msgid "keyedit.delsig.unknown" +msgstr "RИpondez ╚ oui ╩ si vous voulez signer TOUS les noms d'utilisateurs" + +#: g10/helptext.c:187 +#, fuzzy +msgid "keyedit.delsig.invalid" +msgstr "RИpondez ╚ oui ╩ si vous voulez signer TOUS les noms d'utilisateurs" + +#: g10/helptext.c:191 +msgid "keyedit.delsig.selfsig" +msgstr "" + +#: g10/helptext.c:200 msgid "passphrase.enter" msgstr "" "Entrez le mot de passe ; c'est une phrase secrХte \n" " Blurb, blurb,.... " -#: g10/helptext.c:182 +#: g10/helptext.c:207 msgid "passphrase.repeat" msgstr "" "RИpИtez le dernier mot de passe, pour Йtre sШr de ce que vous avez tapИ." -#: g10/helptext.c:186 +#: g10/helptext.c:211 msgid "detached_signature.filename" msgstr "Donnez le nom du fichier auquel la signature se rapporte" -#: g10/helptext.c:190 +#: g10/helptext.c:215 msgid "openfile.overwrite.okay" msgstr "Entrez ╚ oui ╩ s'il faut vraiment rИИcrire le fichier" -#: g10/helptext.c:204 +#: g10/helptext.c:229 msgid "No help available" msgstr "Pas d'aide disponible" -#: g10/helptext.c:216 +#: g10/helptext.c:241 #, c-format msgid "No help available for `%s'" msgstr "Pas d'aide disponible pour `%s'" -#~ msgid "can't open file: %s\n" -#~ msgstr "ne peut ouvrir le fichier : %s\n" - -#~ msgid "read error: %s\n" -#~ msgstr "erreur de lecture : %s\n" - -#~ msgid "can't write to keyring: %s\n" -#~ msgstr "ne peut Иcrire le porte-clИs : %s\n" - -#~ msgid "writing keyblock\n" -#~ msgstr "Иcriture du bloc de clИs\n" - -#~ msgid "can't write keyblock: %s\n" -#~ msgstr "ne peut Иcrire le bloc de clИs : %s\n" - -#~ msgid "can't lock secret keyring: %s\n" -#~ msgstr "ne peut verrouiller le porte-clИs secret : %s\n" - -#~ msgid "can't write keyring: %s\n" -#~ msgstr "ne peut Иcrire le porte-clИs : %s\n" - -#, fuzzy -#~ msgid "encrypted message is valid\n" -#~ msgstr "la fonction de hachage sИlectionnИe est invalide\n" - -#, fuzzy -#~ msgid "Can't check MDC: %s\n" -#~ msgstr "Ne peut vИrifier la signature : %s\n" - -#~ msgid "Usage: gpgm [options] [files] (-h for help)" -#~ msgstr "Utilisation: gpgm [options] [fichiers] (-h pour l'aide)" - -# -#~ msgid "" -#~ "Syntax: gpgm [options] [files]\n" -#~ "GnuPG maintenance utility\n" -#~ msgstr "" -#~ "Syntaxe: gpgm [options] [fichiers]\n" -#~ "utilitaire de maitenance de GnuPG\n" +#~ msgid "can't lock keyring `%': %s\n" +#~ msgstr "ne peut verrouiller le porte-clИs `%' : %s\n" -#~ msgid "usage: gpgm [options] " -#~ msgstr "utilisation: gpgm [options] " +#~ msgid "error writing keyring `%': %s\n" +#~ msgstr "erreur durant la lecture du porte-clИs `%' : %s\n" diff -urN gnupg-0.9.7/po/gnupg.pot gnupg-0.9.8/po/gnupg.pot --- gnupg-0.9.7/po/gnupg.pot Sun May 23 15:36:42 1999 +++ gnupg-0.9.8/po/gnupg.pot Sat Jun 26 11:22:17 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-05-23 15:36+0200\n" +"POT-Creation-Date: 1999-06-26 11:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,14 +26,22 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "" -#: util/miscutil.c:156 +#: util/miscutil.c:156 util/miscutil.c:173 msgid "yes" msgstr "" -#: util/miscutil.c:157 +#: util/miscutil.c:157 util/miscutil.c:175 msgid "yY" msgstr "" +#: g10/keyedit.c:559 util/miscutil.c:174 +msgid "quit" +msgstr "" + +#: util/miscutil.c:176 +msgid "qQ" +msgstr "" + #: util/errors.c:54 msgid "general error" msgstr "" @@ -249,7 +257,7 @@ "\n" msgstr "" -#: cipher/rndlinux.c:110 +#: cipher/rndlinux.c:135 #, c-format msgid "" "\n" @@ -257,285 +265,297 @@ "the OS a chance to collect more entropy! (Need %d more bytes)\n" msgstr "" -#: g10/g10.c:165 +#: g10/g10.c:174 msgid "" "@Commands:\n" " " msgstr "" -#: g10/g10.c:167 +#: g10/g10.c:176 msgid "|[file]|make a signature" msgstr "" -#: g10/g10.c:168 +#: g10/g10.c:177 msgid "|[file]|make a clear text signature" msgstr "" -#: g10/g10.c:169 +#: g10/g10.c:178 msgid "make a detached signature" msgstr "" -#: g10/g10.c:170 +#: g10/g10.c:179 msgid "encrypt data" msgstr "" -#: g10/g10.c:171 +#: g10/g10.c:180 msgid "encryption only with symmetric cipher" msgstr "" -#: g10/g10.c:172 +#: g10/g10.c:181 msgid "store only" msgstr "" -#: g10/g10.c:173 +#: g10/g10.c:182 msgid "decrypt data (default)" msgstr "" -#: g10/g10.c:174 +#: g10/g10.c:183 msgid "verify a signature" msgstr "" -#: g10/g10.c:175 +#: g10/g10.c:184 msgid "list keys" msgstr "" -#: g10/g10.c:177 +#: g10/g10.c:186 msgid "list keys and signatures" msgstr "" -#: g10/g10.c:178 +#: g10/g10.c:187 msgid "check key signatures" msgstr "" -#: g10/g10.c:179 +#: g10/g10.c:188 msgid "list keys and fingerprints" msgstr "" -#: g10/g10.c:180 +#: g10/g10.c:189 msgid "list secret keys" msgstr "" -#: g10/g10.c:181 +#: g10/g10.c:190 msgid "generate a new key pair" msgstr "" -#: g10/g10.c:182 +#: g10/g10.c:191 msgid "remove key from the public keyring" msgstr "" -#: g10/g10.c:183 +#: g10/g10.c:192 msgid "sign or edit a key" msgstr "" -#: g10/g10.c:184 +#: g10/g10.c:193 msgid "generate a revocation certificate" msgstr "" -#: g10/g10.c:185 +#: g10/g10.c:194 msgid "export keys" msgstr "" -#: g10/g10.c:186 +#: g10/g10.c:195 msgid "export keys to a key server" msgstr "" -#: g10/g10.c:187 +#: g10/g10.c:196 msgid "import keys from a key server" msgstr "" -#: g10/g10.c:190 +#: g10/g10.c:199 msgid "import/merge keys" msgstr "" -#: g10/g10.c:192 +#: g10/g10.c:201 msgid "list only the sequence of packets" msgstr "" -#: g10/g10.c:194 +#: g10/g10.c:203 msgid "export the ownertrust values" msgstr "" -#: g10/g10.c:196 +#: g10/g10.c:205 msgid "import ownertrust values" msgstr "" -#: g10/g10.c:198 +#: g10/g10.c:207 msgid "|[NAMES]|update the trust database" msgstr "" -#: g10/g10.c:200 +#: g10/g10.c:209 msgid "|[NAMES]|check the trust database" msgstr "" -#: g10/g10.c:201 +#: g10/g10.c:210 msgid "fix a corrupted trust database" msgstr "" -#: g10/g10.c:202 +#: g10/g10.c:211 msgid "De-Armor a file or stdin" msgstr "" -#: g10/g10.c:203 +#: g10/g10.c:212 msgid "En-Armor a file or stdin" msgstr "" -#: g10/g10.c:204 +#: g10/g10.c:213 msgid "|algo [files]|print message digests" msgstr "" -#: g10/g10.c:205 +#: g10/g10.c:214 msgid "print all message digests" msgstr "" -#: g10/g10.c:211 +#: g10/g10.c:220 msgid "" "@\n" "Options:\n" " " msgstr "" -#: g10/g10.c:213 +#: g10/g10.c:222 msgid "create ascii armored output" msgstr "" -#: g10/g10.c:214 +#: g10/g10.c:223 msgid "|NAME|encrypt for NAME" msgstr "" -#: g10/g10.c:218 +#: g10/g10.c:227 msgid "use this user-id to sign or decrypt" msgstr "" -#: g10/g10.c:219 +#: g10/g10.c:228 msgid "|N|set compress level N (0 disables)" msgstr "" -#: g10/g10.c:221 +#: g10/g10.c:230 msgid "use canonical text mode" msgstr "" -#: g10/g10.c:222 +#: g10/g10.c:231 msgid "use as output file" msgstr "" -#: g10/g10.c:223 +#: g10/g10.c:232 msgid "verbose" msgstr "" -#: g10/g10.c:224 +#: g10/g10.c:233 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:225 +#: g10/g10.c:234 +msgid "don't use the terminal at all" +msgstr "" + +#: g10/g10.c:235 msgid "force v3 signatures" msgstr "" -#: g10/g10.c:226 +#: g10/g10.c:236 msgid "always use a MDC for encryption" msgstr "" -#: g10/g10.c:227 +#: g10/g10.c:237 msgid "do not make any changes" msgstr "" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:229 +#: g10/g10.c:239 msgid "batch mode: never ask" msgstr "" -#: g10/g10.c:230 +#: g10/g10.c:240 msgid "assume yes on most questions" msgstr "" -#: g10/g10.c:231 +#: g10/g10.c:241 msgid "assume no on most questions" msgstr "" -#: g10/g10.c:232 +#: g10/g10.c:242 msgid "add this keyring to the list of keyrings" msgstr "" -#: g10/g10.c:233 +#: g10/g10.c:243 msgid "add this secret keyring to the list" msgstr "" -#: g10/g10.c:234 +#: g10/g10.c:244 msgid "|NAME|use NAME as default secret key" msgstr "" -#: g10/g10.c:235 +#: g10/g10.c:245 msgid "|HOST|use this keyserver to lookup keys" msgstr "" -#: g10/g10.c:236 +#: g10/g10.c:246 msgid "|NAME|set terminal charset to NAME" msgstr "" -#: g10/g10.c:237 +#: g10/g10.c:247 msgid "read options from file" msgstr "" -#: g10/g10.c:239 +#: g10/g10.c:249 msgid "set debugging flags" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:250 msgid "enable full debugging" msgstr "" -#: g10/g10.c:241 +#: g10/g10.c:251 msgid "|FD|write status info to this FD" msgstr "" -#: g10/g10.c:242 +#: g10/g10.c:252 msgid "do not write comment packets" msgstr "" -#: g10/g10.c:243 +#: g10/g10.c:253 msgid "(default is 1)" msgstr "" -#: g10/g10.c:244 +#: g10/g10.c:254 msgid "(default is 3)" msgstr "" -#: g10/g10.c:246 +#: g10/g10.c:256 msgid "|FILE|load extension module FILE" msgstr "" -#: g10/g10.c:247 +#: g10/g10.c:257 msgid "emulate the mode described in RFC1991" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:258 +msgid "set all packet, cipher and digest options to OpenPGP behavior" +msgstr "" + +#: g10/g10.c:259 msgid "|N|use passphrase mode N" msgstr "" -#: g10/g10.c:250 +#: g10/g10.c:261 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "" -#: g10/g10.c:252 +#: g10/g10.c:263 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" -#: g10/g10.c:253 +#: g10/g10.c:264 msgid "|NAME|use cipher algorithm NAME" msgstr "" -#: g10/g10.c:254 +#: g10/g10.c:265 msgid "|NAME|use message digest algorithm NAME" msgstr "" -#: g10/g10.c:255 +#: g10/g10.c:266 msgid "|N|use compress algorithm N" msgstr "" -#: g10/g10.c:256 +#: g10/g10.c:267 msgid "throw keyid field of encrypted packets" msgstr "" -#: g10/g10.c:258 +#: g10/g10.c:268 +msgid "|NAME=VALUE|use this notation data" +msgstr "" + +#: g10/g10.c:270 msgid "" "@\n" "Examples:\n" @@ -547,170 +567,193 @@ " --fingerprint [names] show fingerprints\n" msgstr "" -#: g10/g10.c:327 +#: g10/g10.c:347 msgid "Please report bugs to .\n" msgstr "" -#: g10/g10.c:331 +#: g10/g10.c:351 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "" -#: g10/g10.c:334 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" msgstr "" -#: g10/g10.c:339 +#: g10/g10.c:359 msgid "" "\n" "Supported algorithms:\n" msgstr "" -#: g10/g10.c:413 +#: g10/g10.c:433 msgid "usage: gpg [options] " msgstr "" -#: g10/g10.c:453 +#: g10/g10.c:473 msgid "conflicting commands\n" msgstr "" -#: g10/g10.c:580 +#: g10/g10.c:605 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: g10/g10.c:584 +#: g10/g10.c:609 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: g10/g10.c:591 +#: g10/g10.c:616 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: g10/g10.c:737 +#: g10/g10.c:782 #, c-format msgid "%s is not a valid character set\n" msgstr "" -#: g10/g10.c:780 g10/g10.c:792 +#: g10/g10.c:827 g10/g10.c:839 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/g10.c:786 g10/g10.c:798 +#: g10/g10.c:833 g10/g10.c:845 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:801 +#: g10/g10.c:849 +msgid "the given policy URL is invalid\n" +msgstr "" + +#: g10/g10.c:852 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "" -#: g10/g10.c:803 +#: g10/g10.c:854 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:805 +#: g10/g10.c:856 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:807 +#: g10/g10.c:858 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:810 +#: g10/g10.c:861 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/g10.c:814 +#: g10/g10.c:865 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/g10.c:891 +#: g10/g10.c:942 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/g10.c:897 +#: g10/g10.c:948 msgid "--store [filename]" msgstr "" -#: g10/g10.c:904 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "" -#: g10/g10.c:912 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "" -#: g10/g10.c:925 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "" -#: g10/g10.c:938 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "" -#: g10/g10.c:952 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "" -#: g10/g10.c:964 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "" -#: g10/g10.c:973 +#: g10/g10.c:1024 msgid "--edit-key username [commands]" msgstr "" -#: g10/g10.c:987 +#: g10/g10.c:1038 msgid "--delete-secret-key username" msgstr "" -#: g10/g10.c:990 +#: g10/g10.c:1041 msgid "--delete-key username" msgstr "" -#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311 +#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "" -#: g10/g10.c:1024 +#: g10/g10.c:1075 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "" -#: g10/g10.c:1083 +#: g10/g10.c:1134 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/g10.c:1091 +#: g10/g10.c:1142 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/g10.c:1157 +#: g10/g10.c:1208 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "" -#: g10/g10.c:1232 +#: g10/g10.c:1283 msgid "[filename]" msgstr "" -#: g10/g10.c:1236 +#: g10/g10.c:1287 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "" +#: g10/g10.c:1457 +msgid "" +"the first character of a notation name must be a letter or an underscore\n" +msgstr "" + +#: g10/g10.c:1463 +msgid "" +"a notation name must have only letters, digits, dots or underscores and end " +"with an '='\n" +msgstr "" + +#: g10/g10.c:1469 +msgid "dots in a notation name must be surrounded by other characters\n" +msgstr "" + +#: g10/g10.c:1477 +msgid "a notation value must not use any control characters\n" +msgstr "" + #: g10/armor.c:296 #, c-format msgid "armor: %s\n" @@ -948,31 +991,36 @@ msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673 +#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705 #, c-format msgid "%s: skipped: %s\n" msgstr "" -#: g10/pkclist.c:591 +#: g10/pkclist.c:588 g10/pkclist.c:687 +#, c-format +msgid "%s: skipped: public key already present\n" +msgstr "" + +#: g10/pkclist.c:611 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" msgstr "" -#: g10/pkclist.c:596 +#: g10/pkclist.c:616 msgid "Enter the user ID: " msgstr "" -#: g10/pkclist.c:607 +#: g10/pkclist.c:627 msgid "No such user ID.\n" msgstr "" -#: g10/pkclist.c:653 +#: g10/pkclist.c:673 #, c-format msgid "%s: error checking key: %s\n" msgstr "" -#: g10/pkclist.c:679 +#: g10/pkclist.c:711 msgid "no valid addressees\n" msgstr "" @@ -1190,7 +1238,7 @@ "\n" msgstr "" -#: g10/keyedit.c:433 g10/keygen.c:748 +#: g10/keyedit.c:455 g10/keygen.c:748 msgid "passphrase not correctly repeated; try again.\n" msgstr "" @@ -1219,7 +1267,7 @@ msgstr "" #: g10/keygen.c:859 -msgid "Key generation cancelled.\n" +msgid "Key generation canceled.\n" msgstr "" #: g10/keygen.c:869 @@ -1247,13 +1295,13 @@ msgid "Key generation failed: %s\n" msgstr "" -#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52 +#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54 +#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1263,7 +1311,7 @@ msgid "Really create? " msgstr "" -#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467 +#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467 #: g10/tdbio.c:528 #, c-format msgid "%s: can't open: %s\n" @@ -1284,7 +1332,7 @@ msgid "reading from `%s'\n" msgstr "" -#: g10/encode.c:417 +#: g10/encode.c:431 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "" @@ -1419,17 +1467,19 @@ msgid "no default public keyring\n" msgstr "" -#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501 +#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "" -#: g10/import.c:379 g10/import.c:435 -msgid "can't lock keyring `%': %s\n" +#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#, c-format +msgid "can't lock keyring `%s': %s\n" msgstr "" -#: g10/import.c:382 -msgid "error writing keyring `%': %s\n" +#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648 +#, c-format +msgid "error writing keyring `%s': %s\n" msgstr "" #: g10/import.c:387 @@ -1452,11 +1502,6 @@ msgid "key %08lX: can't read original keyblock: %s\n" msgstr "" -#: g10/import.c:438 g10/import.c:547 g10/import.c:648 -#, c-format -msgid "error writing keyring `%s': %s\n" -msgstr "" - #: g10/import.c:444 #, c-format msgid "key %08lX: 1 new user-id\n" @@ -1492,11 +1537,6 @@ msgid "key %08lX: not changed\n" msgstr "" -#: g10/import.c:544 g10/import.c:645 -#, c-format -msgid "can't lock keyring `%s': %s\n" -msgstr "" - #: g10/import.c:552 #, c-format msgid "key %08lX: secret key imported\n" @@ -1597,460 +1637,494 @@ msgid "key %08lX: our copy has no self-signature\n" msgstr "" -#: g10/keyedit.c:91 +#: g10/keyedit.c:92 #, c-format msgid "%s: user not found\n" msgstr "" -#: g10/keyedit.c:177 +#: g10/keyedit.c:153 msgid "[revocation]" msgstr "" -#: g10/keyedit.c:178 +#: g10/keyedit.c:154 msgid "[self-signature]" msgstr "" -#: g10/keyedit.c:196 +#: g10/keyedit.c:218 msgid "1 bad signature\n" msgstr "" -#: g10/keyedit.c:198 +#: g10/keyedit.c:220 #, c-format msgid "%d bad signatures\n" msgstr "" -#: g10/keyedit.c:200 +#: g10/keyedit.c:222 msgid "1 signature not checked due to a missing key\n" msgstr "" -#: g10/keyedit.c:202 +#: g10/keyedit.c:224 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "" -#: g10/keyedit.c:204 +#: g10/keyedit.c:226 msgid "1 signature not checked due to an error\n" msgstr "" -#: g10/keyedit.c:206 +#: g10/keyedit.c:228 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "" -#: g10/keyedit.c:208 +#: g10/keyedit.c:230 msgid "1 user id without valid self-signature detected\n" msgstr "" -#: g10/keyedit.c:210 +#: g10/keyedit.c:232 #, c-format msgid "%d user ids without valid self-signatures detected\n" msgstr "" #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. -#: g10/keyedit.c:290 +#: g10/keyedit.c:312 #, c-format msgid "Already signed by key %08lX\n" msgstr "" -#: g10/keyedit.c:298 +#: g10/keyedit.c:320 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "" -#: g10/keyedit.c:307 +#: g10/keyedit.c:329 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" msgstr "" -#: g10/keyedit.c:316 +#: g10/keyedit.c:338 msgid "" "The signature will be marked as non-exportable.\n" "\n" msgstr "" -#: g10/keyedit.c:321 +#: g10/keyedit.c:343 msgid "Really sign? " msgstr "" -#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75 +#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "" -#: g10/keyedit.c:400 +#: g10/keyedit.c:422 msgid "This key is not protected.\n" msgstr "" -#: g10/keyedit.c:403 +#: g10/keyedit.c:425 msgid "Key is protected.\n" msgstr "" -#: g10/keyedit.c:420 +#: g10/keyedit.c:442 #, c-format msgid "Can't edit this key: %s\n" msgstr "" -#: g10/keyedit.c:425 +#: g10/keyedit.c:447 msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "" -#: g10/keyedit.c:437 +#: g10/keyedit.c:459 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" -#: g10/keyedit.c:440 +#: g10/keyedit.c:462 msgid "Do you really want to do this? " msgstr "" -#: g10/keyedit.c:501 +#: g10/keyedit.c:523 msgid "moving a key signature to the correct place\n" msgstr "" -#: g10/keyedit.c:537 -msgid "quit" -msgstr "" - -#: g10/keyedit.c:537 +#: g10/keyedit.c:559 msgid "quit this menu" msgstr "" -#: g10/keyedit.c:538 +#: g10/keyedit.c:560 msgid "q" msgstr "" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save" msgstr "" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save and quit" msgstr "" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "help" msgstr "" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "show this help" msgstr "" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "fpr" msgstr "" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "show fingerprint" msgstr "" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list" msgstr "" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list key and user ids" msgstr "" -#: g10/keyedit.c:544 +#: g10/keyedit.c:566 msgid "l" msgstr "" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "uid" msgstr "" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "select user id N" msgstr "" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "key" msgstr "" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "select secondary key N" msgstr "" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "check" msgstr "" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "list signatures" msgstr "" -#: g10/keyedit.c:548 +#: g10/keyedit.c:570 msgid "c" msgstr "" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign" msgstr "" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign the key" msgstr "" -#: g10/keyedit.c:550 +#: g10/keyedit.c:572 msgid "s" msgstr "" -#: g10/keyedit.c:551 +#: g10/keyedit.c:573 msgid "lsign" msgstr "" -#: g10/keyedit.c:551 +#: g10/keyedit.c:573 msgid "sign the key locally" msgstr "" -#: g10/keyedit.c:552 +#: g10/keyedit.c:574 msgid "debug" msgstr "" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "adduid" msgstr "" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "add a user id" msgstr "" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "deluid" msgstr "" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "delete user id" msgstr "" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "addkey" msgstr "" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "add a secondary key" msgstr "" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delkey" msgstr "" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delete a secondary key" msgstr "" -#: g10/keyedit.c:557 +#: g10/keyedit.c:579 +msgid "delsig" +msgstr "" + +#: g10/keyedit.c:579 +msgid "delete signatures" +msgstr "" + +#: g10/keyedit.c:580 msgid "expire" msgstr "" -#: g10/keyedit.c:557 +#: g10/keyedit.c:580 msgid "change the expire date" msgstr "" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle" msgstr "" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle between secret and public key listing" msgstr "" -#: g10/keyedit.c:560 +#: g10/keyedit.c:583 msgid "t" msgstr "" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "pref" msgstr "" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "list preferences" msgstr "" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "passwd" msgstr "" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "change the passphrase" msgstr "" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "trust" msgstr "" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "change the ownertrust" msgstr "" -#: g10/keyedit.c:564 +#: g10/keyedit.c:587 msgid "revsig" msgstr "" -#: g10/keyedit.c:564 +#: g10/keyedit.c:587 msgid "revoke signatures" msgstr "" -#: g10/keyedit.c:565 +#: g10/keyedit.c:588 msgid "revkey" msgstr "" -#: g10/keyedit.c:565 +#: g10/keyedit.c:588 msgid "revoke a secondary key" msgstr "" -#: g10/keyedit.c:584 +#: g10/keyedit.c:607 msgid "can't do that in batchmode\n" msgstr "" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:613 +#: g10/keyedit.c:636 msgid "Secret key is available.\n" msgstr "" -#: g10/keyedit.c:642 +#: g10/keyedit.c:665 msgid "Command> " msgstr "" -#: g10/keyedit.c:669 +#: g10/keyedit.c:692 msgid "Need the secret key to do this.\n" msgstr "" -#: g10/keyedit.c:691 +#: g10/keyedit.c:714 msgid "Save changes? " msgstr "" -#: g10/keyedit.c:694 +#: g10/keyedit.c:717 msgid "Quit without saving? " msgstr "" -#: g10/keyedit.c:704 +#: g10/keyedit.c:727 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:711 +#: g10/keyedit.c:734 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:718 +#: g10/keyedit.c:741 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:721 g10/keyedit.c:780 +#: g10/keyedit.c:744 g10/keyedit.c:803 #, c-format msgid "update of trustdb failed: %s\n" msgstr "" -#: g10/keyedit.c:754 +#: g10/keyedit.c:777 msgid "Really sign all user ids? " msgstr "" -#: g10/keyedit.c:755 +#: g10/keyedit.c:778 msgid "Hint: Select the user ids to sign\n" msgstr "" -#: g10/keyedit.c:791 +#: g10/keyedit.c:814 g10/keyedit.c:835 msgid "You must select at least one user id.\n" msgstr "" -#: g10/keyedit.c:793 +#: g10/keyedit.c:816 msgid "You can't delete the last user id!\n" msgstr "" -#: g10/keyedit.c:796 +#: g10/keyedit.c:819 msgid "Really remove all selected user ids? " msgstr "" -#: g10/keyedit.c:797 +#: g10/keyedit.c:820 msgid "Really remove this user id? " msgstr "" -#: g10/keyedit.c:820 g10/keyedit.c:842 +#: g10/keyedit.c:858 g10/keyedit.c:880 msgid "You must select at least one key.\n" msgstr "" -#: g10/keyedit.c:824 +#: g10/keyedit.c:862 msgid "Do you really want to delete the selected keys? " msgstr "" -#: g10/keyedit.c:825 +#: g10/keyedit.c:863 msgid "Do you really want to delete this key? " msgstr "" -#: g10/keyedit.c:846 +#: g10/keyedit.c:884 msgid "Do you really want to revoke the selected keys? " msgstr "" -#: g10/keyedit.c:847 +#: g10/keyedit.c:885 msgid "Do you really want to revoke this key? " msgstr "" -#: g10/keyedit.c:901 +#: g10/keyedit.c:939 msgid "Invalid command (try \"help\")\n" msgstr "" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 +msgid "Delete this good signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1298 +msgid "Delete this invalid signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1302 +msgid "Delete this unknown signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1308 +msgid "Really delete this self-signature? (y/N)" +msgstr "" + +#: g10/keyedit.c:1322 +#, c-format +msgid "Deleted %d signature.\n" +msgstr "" + +#: g10/keyedit.c:1323 +#, c-format +msgid "Deleted %d signatures.\n" +msgstr "" + +#: g10/keyedit.c:1326 +msgid "Nothing deleted.\n" +msgstr "" + +#: g10/keyedit.c:1395 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:1299 +#: g10/keyedit.c:1401 msgid "Please select at most one secondary key.\n" msgstr "" -#: g10/keyedit.c:1303 -msgid "Changing exiration time for a secondary key.\n" +#: g10/keyedit.c:1405 +msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:1305 -msgid "Changing exiration time for the primary key.\n" +#: g10/keyedit.c:1407 +msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1448 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:1362 +#: g10/keyedit.c:1464 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:1422 +#: g10/keyedit.c:1524 #, c-format msgid "No user id with index %d\n" msgstr "" -#: g10/keyedit.c:1468 +#: g10/keyedit.c:1570 #, c-format msgid "No secondary key with index %d\n" msgstr "" -#: g10/keyedit.c:1566 +#: g10/keyedit.c:1668 msgid "user ID: \"" msgstr "" -#: g10/keyedit.c:1569 +#: g10/keyedit.c:1671 #, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" msgstr "" -#: g10/keyedit.c:1573 +#: g10/keyedit.c:1675 msgid "Create a revocation certificate for this signature? (y/N)" msgstr "" -#: g10/keyedit.c:1653 +#: g10/keyedit.c:1755 msgid "Really create the revocation certificates? (y/N)" msgstr "" -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1778 msgid "no secret key\n" msgstr "" @@ -2094,38 +2168,50 @@ msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:890 +#: g10/mainproc.c:505 g10/mainproc.c:514 +msgid "WARNING: invalid notation data found\n" +msgstr "" + +#: g10/mainproc.c:517 +msgid "Notation: " +msgstr "" + +#: g10/mainproc.c:524 +msgid "Policy: " +msgstr "" + +#: g10/mainproc.c:929 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:896 +#: g10/mainproc.c:935 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" #. just in case that we have no userid -#: g10/mainproc.c:922 g10/mainproc.c:933 +#: g10/mainproc.c:961 g10/mainproc.c:972 msgid "BAD signature from \"" msgstr "" -#: g10/mainproc.c:923 g10/mainproc.c:934 +#: g10/mainproc.c:962 g10/mainproc.c:973 msgid "Good signature from \"" msgstr "" -#: g10/mainproc.c:925 +#: g10/mainproc.c:964 msgid " aka \"" msgstr "" -#: g10/mainproc.c:975 +#: g10/mainproc.c:1015 #, c-format msgid "Can't check signature: %s\n" msgstr "" -#: g10/mainproc.c:1056 +#: g10/mainproc.c:1109 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1114 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -2157,7 +2243,7 @@ msgid "can't handle public key algorithm %d\n" msgstr "" -#: g10/parse-packet.c:872 +#: g10/parse-packet.c:931 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" @@ -2179,11 +2265,11 @@ msgid " (main key ID %08lX)" msgstr "" -#: g10/passphrase.c:190 +#: g10/passphrase.c:192 msgid "Enter passphrase: " msgstr "" -#: g10/passphrase.c:194 +#: g10/passphrase.c:196 msgid "Repeat passphrase: " msgstr "" @@ -2191,15 +2277,15 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "" -#: g10/plaintext.c:208 +#: g10/plaintext.c:266 msgid "Please enter name of data file: " msgstr "" -#: g10/plaintext.c:229 +#: g10/plaintext.c:287 msgid "reading stdin ...\n" msgstr "" -#: g10/plaintext.c:302 +#: g10/plaintext.c:360 #, c-format msgid "can't open signed data `%s'\n" msgstr "" @@ -2263,21 +2349,21 @@ msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" -#: g10/sign.c:79 +#: g10/sign.c:132 #, c-format msgid "%s signature from: %s\n" msgstr "" -#: g10/sign.c:210 g10/sign.c:496 +#: g10/sign.c:263 g10/sign.c:554 #, c-format msgid "can't create %s: %s\n" msgstr "" -#: g10/sign.c:306 +#: g10/sign.c:361 msgid "signing:" msgstr "" -#: g10/sign.c:346 +#: g10/sign.c:401 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "" @@ -2326,7 +2412,7 @@ msgid "%s: directory does not exist!\n" msgstr "" -#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457 +#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457 #, c-format msgid "%s: can't create: %s\n" msgstr "" @@ -2423,7 +2509,7 @@ msgstr "" #: g10/tdbio.c:1630 -msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n" +msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" #: g10/trustdb.c:163 @@ -2870,16 +2956,21 @@ msgid "Overwrite (y/N)? " msgstr "" -#: g10/openfile.c:92 +#: g10/openfile.c:97 +#, c-format +msgid "%s: unknown suffix\n" +msgstr "" + +#: g10/openfile.c:122 msgid "writing to stdout\n" msgstr "" -#: g10/openfile.c:149 +#: g10/openfile.c:181 #, c-format msgid "assuming signed data in `%s'\n" msgstr "" -#: g10/openfile.c:199 +#: g10/openfile.c:231 #, c-format msgid "%s: new options file created\n" msgstr "" @@ -3005,27 +3096,43 @@ msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/helptext.c:175 +#: g10/helptext.c:176 +msgid "keyedit.delsig.valid" +msgstr "" + +#: g10/helptext.c:181 +msgid "keyedit.delsig.unknown" +msgstr "" + +#: g10/helptext.c:187 +msgid "keyedit.delsig.invalid" +msgstr "" + +#: g10/helptext.c:191 +msgid "keyedit.delsig.selfsig" +msgstr "" + +#: g10/helptext.c:200 msgid "passphrase.enter" msgstr "" -#: g10/helptext.c:182 +#: g10/helptext.c:207 msgid "passphrase.repeat" msgstr "" -#: g10/helptext.c:186 +#: g10/helptext.c:211 msgid "detached_signature.filename" msgstr "" -#: g10/helptext.c:190 +#: g10/helptext.c:215 msgid "openfile.overwrite.okay" msgstr "" -#: g10/helptext.c:204 +#: g10/helptext.c:229 msgid "No help available" msgstr "" -#: g10/helptext.c:216 +#: g10/helptext.c:241 #, c-format msgid "No help available for `%s'" msgstr "" diff -urN gnupg-0.9.7/po/it.po gnupg-0.9.8/po/it.po --- gnupg-0.9.7/po/it.po Sun May 23 20:02:48 1999 +++ gnupg-0.9.8/po/it.po Sat Jun 26 13:07:28 1999 @@ -1,12 +1,12 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) 1998 Free Software Foundation, Inc. -# Marco d'Itri , 1998. +# GnuPG italian translation +# Copyright (C) 1998, 1999 Free Software Foundation, Inc. +# Marco d'Itri , 1998, 1999. # msgid "" msgstr "" -"Project-Id-Version: gnupg-0.4.3\n" -"POT-Creation-Date: 1999-05-23 15:36+0200\n" -"PO-Revision-Date: 1998-11-09 16:19+01:00\n" +"Project-Id-Version: gnupg-0.9.7\n" +"POT-Creation-Date: 1999-06-26 11:22+0200\n" +"PO-Revision-Date: 1999-05-15 18:09+02:00\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -19,259 +19,220 @@ #: util/secmem.c:249 msgid "operation is not possible without initialized secure memory\n" -msgstr "" +msgstr "l'operazione non Х possibile senza memoria sicura inizializzata\n" #: util/secmem.c:250 msgid "(you may have used the wrong program for this task)\n" -msgstr "" +msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n" -#: util/miscutil.c:156 +#: util/miscutil.c:156 util/miscutil.c:173 msgid "yes" msgstr "sЛ" -#: util/miscutil.c:157 +#: util/miscutil.c:157 util/miscutil.c:175 msgid "yY" msgstr "sS" -#: util/errors.c:54 +#: g10/keyedit.c:559 util/miscutil.c:174 +msgid "quit" +msgstr "quit" + +#: util/miscutil.c:176 #, fuzzy +msgid "qQ" +msgstr "q" + +#: util/errors.c:54 msgid "general error" -msgstr "Errore generale" +msgstr "errore generale" #: util/errors.c:55 -#, fuzzy msgid "unknown packet type" -msgstr "Tipo del pacchetto sconosciuto" +msgstr "pacchetto di tipo sconosciuto" #: util/errors.c:56 -#, fuzzy msgid "unknown version" -msgstr "Versione sconosciuta" +msgstr "versione sconosciuta" #: util/errors.c:57 -#, fuzzy msgid "unknown pubkey algorithm" -msgstr "Algoritmo della chiave pubblica sconosciuto" +msgstr "algoritmo della chiave pubblica sconosciuto" #: util/errors.c:58 -#, fuzzy msgid "unknown digest algorithm" -msgstr "Algoritmo del digest sconosciuto" +msgstr "algoritmo del digest sconosciuto" #: util/errors.c:59 -#, fuzzy msgid "bad public key" -msgstr "Chiave pubblica errata o danneggiata" +msgstr "chiave pubblica errata" #: util/errors.c:60 -#, fuzzy msgid "bad secret key" -msgstr "Chiave segreta errata o danneggiata" +msgstr "chiave segreta errata" #: util/errors.c:61 -#, fuzzy msgid "bad signature" -msgstr "Firma errata o danneggiata" +msgstr "firma errata" #: util/errors.c:62 -#, fuzzy msgid "checksum error" -msgstr "Checksum errato" +msgstr "codice di controllo errato" #: util/errors.c:63 -#, fuzzy msgid "bad passphrase" -msgstr "Passphrase errata" +msgstr "passphrase errata" #: util/errors.c:64 -#, fuzzy msgid "public key not found" -msgstr "Chiave pubblica non trovata" +msgstr "chiave pubblica non trovata" #: util/errors.c:65 -#, fuzzy msgid "unknown cipher algorithm" -msgstr "Algoritmo di cifratura sconosciuto" +msgstr "algoritmo di cifratura sconosciuto" #: util/errors.c:66 -#, fuzzy msgid "can't open the keyring" -msgstr "Impossibile aprire il portachiavi" +msgstr "impossibile aprire il portachiavi" #: util/errors.c:67 -#, fuzzy msgid "invalid packet" -msgstr "Pacchetto non valido" +msgstr "pacchetto non valido" #: util/errors.c:68 -#, fuzzy msgid "invalid armor" -msgstr "Armatura non valida" +msgstr "armatura non valida" #: util/errors.c:69 -#, fuzzy msgid "no such user id" -msgstr "User id inesistente" +msgstr "l'user ID non esiste" #: util/errors.c:70 -#, fuzzy msgid "secret key not available" -msgstr "La chiave segreta non Х disponibile." +msgstr "la chiave segreta non Х disponibile" #: util/errors.c:71 -#, fuzzy msgid "wrong secret key used" -msgstr "х stata usata la chiave segreta sbagliata" +msgstr "Х stata usata la chiave segreta sbagliata" #: util/errors.c:72 -#, fuzzy msgid "not supported" -msgstr "Non gestito" +msgstr "non gestito" #: util/errors.c:73 -#, fuzzy msgid "bad key" -msgstr "Chiave danneggiata" +msgstr "chiave sbagliata" #: util/errors.c:74 -#, fuzzy msgid "file read error" -msgstr "Errore durante la lettura del file" +msgstr "errore durante la lettura del file" #: util/errors.c:75 -#, fuzzy msgid "file write error" -msgstr "Errore durante la scrittura del file" +msgstr "errore durante la scrittura del file" #: util/errors.c:76 -#, fuzzy msgid "unknown compress algorithm" -msgstr "Algoritmo di compressione sconosciuto" +msgstr "algoritmo di compressione sconosciuto" #: util/errors.c:77 -#, fuzzy msgid "file open error" -msgstr "Errore durante l'apertura del file" +msgstr "errore durante l'apertura del file" #: util/errors.c:78 -#, fuzzy msgid "file create error" -msgstr "Errore durante la creazione del file" +msgstr "errore durante la creazione del file" #: util/errors.c:79 -#, fuzzy msgid "invalid passphrase" -msgstr "Passphrase non valida" +msgstr "passphrase non valida" #: util/errors.c:80 -#, fuzzy msgid "unimplemented pubkey algorithm" -msgstr "Algoritmo della chiave pubblica non implementato" +msgstr "algoritmo della chiave pubblica non implementato" #: util/errors.c:81 -#, fuzzy msgid "unimplemented cipher algorithm" -msgstr "Algoritmo di cifratura non implementato" +msgstr "algoritmo di cifratura non implementato" #: util/errors.c:82 -#, fuzzy msgid "unknown signature class" -msgstr "Classe della firma sconosciuta." +msgstr "classe della firma sconosciuta." #: util/errors.c:83 -#, fuzzy msgid "trust database error" -msgstr "Errore nel database della fiducia" +msgstr "errore nel database della fiducia" #: util/errors.c:84 -#, fuzzy msgid "bad MPI" msgstr "MPI danneggiato" #: util/errors.c:85 -#, fuzzy msgid "resource limit" -msgstr "Limite della risorsa" +msgstr "limite della risorsa" #: util/errors.c:86 -#, fuzzy msgid "invalid keyring" -msgstr "Portachiavi non valido" +msgstr "portachiavi non valido" #: util/errors.c:87 -#, fuzzy msgid "bad certificate" -msgstr "Certificato danneggiato" +msgstr "certificato danneggiato" #: util/errors.c:88 -#, fuzzy msgid "malformed user id" -msgstr "User id malformato" +msgstr "user id malformato" #: util/errors.c:89 -#, fuzzy msgid "file close error" -msgstr "Errore durante la chiusura del file" +msgstr "errore durante la chiusura del file" #: util/errors.c:90 -#, fuzzy msgid "file rename error" -msgstr "Errore durante la rinominazione del file" +msgstr "errore durante la rinominazione del file" #: util/errors.c:91 -#, fuzzy msgid "file delete error" -msgstr "Errore durante la cancellazione del file" +msgstr "errore durante la cancellazione del file" #: util/errors.c:92 -#, fuzzy msgid "unexpected data" -msgstr "Dati inaspettati" +msgstr "dati inattesi" #: util/errors.c:93 -#, fuzzy msgid "timestamp conflict" -msgstr "Date in conflitto" +msgstr "date in conflitto" #: util/errors.c:94 -#, fuzzy msgid "unusable pubkey algorithm" -msgstr "Algoritmo della chiave pubblica non utilizzabile" +msgstr "algoritmo della chiave pubblica non utilizzabile" #: util/errors.c:95 -#, fuzzy msgid "file exists" -msgstr "Il file esiste" +msgstr "il file esiste" #: util/errors.c:96 -#, fuzzy msgid "weak key" -msgstr "Chiave debole" +msgstr "chiave debole" #: util/errors.c:97 -#, fuzzy msgid "invalid argument" -msgstr "Armatura non valida" +msgstr "armatura non valida" #: util/errors.c:98 -#, fuzzy msgid "bad URI" -msgstr "MPI danneggiato" +msgstr "URI non valida" #: util/errors.c:99 -#, fuzzy msgid "unsupported URI" -msgstr "Non gestito" +msgstr "URI non gestito" #: util/errors.c:100 -#, fuzzy msgid "network error" -msgstr "Errore generale" +msgstr "errore di rete" #: util/errors.c:102 -#, fuzzy msgid "not encrypted" -msgstr "cifra dati" +msgstr "non cifrato" #: util/logger.c:218 #, c-format @@ -284,10 +245,9 @@ msgstr "Hai trovato un bug... (%s:%d)\n" #: 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" +"ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n" #: cipher/random.c:413 msgid "" @@ -300,7 +260,7 @@ "Il generatore di numeri casuali Х solo un ripiego per fare\n" "compilare il programma - non Х assolutamente un RNG forte!\n" -#: cipher/rndlinux.c:110 +#: cipher/rndlinux.c:135 #, c-format msgid "" "\n" @@ -312,7 +272,7 @@ "altra cosa per dare all'OS la possibilitЮ di raccogliere altra entropia!\n" "(Servono ancora %d altri byte)\n" -#: g10/g10.c:165 +#: g10/g10.c:174 msgid "" "@Commands:\n" " " @@ -320,131 +280,131 @@ "@Comandi:\n" " " -#: g10/g10.c:167 +#: g10/g10.c:176 msgid "|[file]|make a signature" msgstr "|[file]|fai una firma" -#: g10/g10.c:168 +#: g10/g10.c:177 msgid "|[file]|make a clear text signature" msgstr "|[file]|fai una firma mantenendo il testo in chiaro" -#: g10/g10.c:169 +#: g10/g10.c:178 msgid "make a detached signature" msgstr "fai una firma separata" -#: g10/g10.c:170 +#: g10/g10.c:179 msgid "encrypt data" msgstr "cifra dati" -#: g10/g10.c:171 +#: g10/g10.c:180 msgid "encryption only with symmetric cipher" msgstr "cifra solo con un cifrario simmetrico" -#: g10/g10.c:172 +#: g10/g10.c:181 msgid "store only" msgstr "immagazzina soltanto" -#: g10/g10.c:173 +#: g10/g10.c:182 msgid "decrypt data (default)" msgstr "decifra dati (predefinito)" -#: g10/g10.c:174 +#: g10/g10.c:183 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:175 +#: g10/g10.c:184 msgid "list keys" msgstr "elenca le chiavi" -#: g10/g10.c:177 +#: g10/g10.c:186 msgid "list keys and signatures" msgstr "elenca le chiavi e le firme" -#: g10/g10.c:178 +#: g10/g10.c:187 msgid "check key signatures" msgstr "controlla le firme delle chiavi" -#: g10/g10.c:179 +#: g10/g10.c:188 msgid "list keys and fingerprints" msgstr "elenca le chiavi e le impronte digitali" -#: g10/g10.c:180 +#: g10/g10.c:189 msgid "list secret keys" msgstr "elenca le chiavi segrete" -#: g10/g10.c:181 +#: g10/g10.c:190 msgid "generate a new key pair" msgstr "genera una nuova coppia di chiavi" -#: g10/g10.c:182 +#: g10/g10.c:191 msgid "remove key from the public keyring" msgstr "rimuove una chiave dal portachiavi pubblico" -#: g10/g10.c:183 +#: g10/g10.c:192 msgid "sign or edit a key" msgstr "firma o modifica una chiave" -#: g10/g10.c:184 +#: g10/g10.c:193 msgid "generate a revocation certificate" msgstr "genera un certificato di revoca" -#: g10/g10.c:185 +#: g10/g10.c:194 msgid "export keys" msgstr "esporta delle chiavi" -#: g10/g10.c:186 +#: g10/g10.c:195 msgid "export keys to a key server" -msgstr "" +msgstr "esporta le chiavi a un key server" -#: g10/g10.c:187 +#: g10/g10.c:196 msgid "import keys from a key server" -msgstr "" +msgstr "importa le chiavi da un key server" -#: g10/g10.c:190 +#: g10/g10.c:199 msgid "import/merge keys" msgstr "importa/aggiungi delle chiavi" -#: g10/g10.c:192 +#: g10/g10.c:201 msgid "list only the sequence of packets" msgstr "elenca solo la sequenza dei pacchetti" -#: g10/g10.c:194 +#: g10/g10.c:203 msgid "export the ownertrust values" msgstr "esporta i valori di fiducia" -#: g10/g10.c:196 +#: g10/g10.c:205 msgid "import ownertrust values" msgstr "importa i valori di fiducia" -#: g10/g10.c:198 +#: g10/g10.c:207 msgid "|[NAMES]|update the trust database" -msgstr "|[NAMES]|controlla il database della fiducia" +msgstr "|[NOMI]|controlla il database della fiducia" -#: g10/g10.c:200 +#: g10/g10.c:209 msgid "|[NAMES]|check the trust database" -msgstr "|[NAMES]|controlla il database della fiducia" +msgstr "|[NOMI]|controlla il database della fiducia" -#: g10/g10.c:201 +#: g10/g10.c:210 msgid "fix a corrupted trust database" msgstr "ripara un database della fiducia rovinato" -#: g10/g10.c:202 +#: g10/g10.c:211 msgid "De-Armor a file or stdin" msgstr "rimuovi l'armatura a un file o a stdin" -#: g10/g10.c:203 +#: g10/g10.c:212 msgid "En-Armor a file or stdin" msgstr "crea l'armatura a un file o a stdin" -#: g10/g10.c:204 +#: g10/g10.c:213 msgid "|algo [files]|print message digests" msgstr "|algo [files]|stampa tutti i message digests" -#: g10/g10.c:205 +#: g10/g10.c:214 msgid "print all message digests" msgstr "stampa tutti i message digests" -#: g10/g10.c:211 +#: g10/g10.c:220 msgid "" "@\n" "Options:\n" @@ -454,151 +414,160 @@ "Opzioni:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:222 msgid "create ascii armored output" msgstr "crea un output ascii con armatura" -#: g10/g10.c:214 -#, fuzzy +#: g10/g10.c:223 msgid "|NAME|encrypt for NAME" -msgstr "|NAME|usa l'algoritmo di cifratura NOME" +msgstr "|NOME|cifra per NOME" -#: g10/g10.c:218 +#: g10/g10.c:227 msgid "use this user-id to sign or decrypt" msgstr "usa questo user-id per firmare o decifrare" -#: g10/g10.c:219 +#: g10/g10.c:228 msgid "|N|set compress level N (0 disables)" msgstr "|N|imposta il livello di compressione (0 disabilita)" -#: g10/g10.c:221 +#: g10/g10.c:230 msgid "use canonical text mode" msgstr "usa il modo testo canonico" -#: g10/g10.c:222 +#: g10/g10.c:231 msgid "use as output file" msgstr "usa come file di output" -#: g10/g10.c:223 +#: g10/g10.c:232 msgid "verbose" msgstr "prolisso" -#: g10/g10.c:224 +#: g10/g10.c:233 msgid "be somewhat more quiet" msgstr "meno prolisso" -#: g10/g10.c:225 +#: g10/g10.c:234 +msgid "don't use the terminal at all" +msgstr "" + +#: g10/g10.c:235 msgid "force v3 signatures" msgstr "forza l'uso di firme v3" -#: g10/g10.c:226 -#, fuzzy +#: g10/g10.c:236 msgid "always use a MDC for encryption" -msgstr "usa questo user-id per cifrare" +msgstr "usa sempre un MDC per cifrare" -#: g10/g10.c:227 +#: g10/g10.c:237 msgid "do not make any changes" -msgstr "" +msgstr "non fa cambiamenti" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:229 +#: g10/g10.c:239 msgid "batch mode: never ask" msgstr "modo batch: non fare domande" -#: g10/g10.c:230 +#: g10/g10.c:240 msgid "assume yes on most questions" msgstr "assumi \"sЛ\" a quasi tutte le domande" -#: g10/g10.c:231 +#: g10/g10.c:241 msgid "assume no on most questions" msgstr "assumi \"no\" a quasi tutte le domande" -#: g10/g10.c:232 +#: g10/g10.c:242 msgid "add this keyring to the list of keyrings" msgstr "aggiungi questo portachiavi alla lista" -#: g10/g10.c:233 +#: g10/g10.c:243 msgid "add this secret keyring to the list" msgstr "aggiungi questo portachiavi segreto alla lista" -#: g10/g10.c:234 +#: g10/g10.c:244 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|usa NAME come chiave segreta predefinita" -#: g10/g10.c:235 +#: g10/g10.c:245 msgid "|HOST|use this keyserver to lookup keys" -msgstr "" +msgstr "|HOST|cerca le chiavi in questo keyserver" -#: g10/g10.c:236 -#, fuzzy +#: g10/g10.c:246 msgid "|NAME|set terminal charset to NAME" -msgstr "|NAME|usa l'algoritmo di cifratura NOME" +msgstr "|NAME|imposta il set di caratteri del terminale NOME" -#: g10/g10.c:237 +#: g10/g10.c:247 msgid "read options from file" msgstr "leggi le opzioni dal file" -#: g10/g10.c:239 +#: g10/g10.c:249 msgid "set debugging flags" msgstr "imposta i flag di debugging" -#: g10/g10.c:240 +#: g10/g10.c:250 msgid "enable full debugging" msgstr "abilita il debugging completo" -#: g10/g10.c:241 +#: g10/g10.c:251 msgid "|FD|write status info to this FD" msgstr "|FD|scrivi le informazioni di stato su questo fd" -#: g10/g10.c:242 +#: g10/g10.c:252 msgid "do not write comment packets" msgstr "non scrivere pacchetti di commento" -#: g10/g10.c:243 +#: g10/g10.c:253 msgid "(default is 1)" msgstr "(predefinito Х 1)" -#: g10/g10.c:244 +#: g10/g10.c:254 msgid "(default is 3)" msgstr "(predefinito Х 3)" -#: g10/g10.c:246 +#: g10/g10.c:256 msgid "|FILE|load extension module FILE" msgstr "|FILE|carica il modulo di estensione FILE" -#: g10/g10.c:247 +#: g10/g10.c:257 msgid "emulate the mode described in RFC1991" -msgstr "emula il modo descritto nel RFC1991" +msgstr "emula il modo descritto in RFC 1991" + +#: g10/g10.c:258 +msgid "set all packet, cipher and digest options to OpenPGP behavior" +msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:259 msgid "|N|use passphrase mode N" msgstr "|N|usa il modo N per la passphrase" -#: g10/g10.c:250 +#: g10/g10.c:261 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:252 +#: g10/g10.c:263 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase" -#: g10/g10.c:253 +#: g10/g10.c:264 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:254 +#: g10/g10.c:265 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:255 +#: g10/g10.c:266 msgid "|N|use compress algorithm N" msgstr "|N|usa l'algoritmo di compressione N" -#: g10/g10.c:256 +#: g10/g10.c:267 msgid "throw keyid field of encrypted packets" -msgstr "elimina il campo keyid dei pacchetti crittografati" +msgstr "elimina il campo keyid dei pacchetti cifrati" -#: g10/g10.c:258 +#: g10/g10.c:268 +msgid "|NAME=VALUE|use this notation data" +msgstr "" + +#: g10/g10.c:270 msgid "" "@\n" "Examples:\n" @@ -618,15 +587,15 @@ " --list-keys [nomi] mostra le chiavi\n" " --fingerprint [nomi] mostra le impronte digitali\n" -#: g10/g10.c:327 +#: g10/g10.c:347 msgid "Please report bugs to .\n" msgstr "Per favore segnala i bug a .\n" -#: g10/g10.c:331 +#: g10/g10.c:351 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:334 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -636,7 +605,7 @@ "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:339 +#: g10/g10.c:359 msgid "" "\n" "Supported algorithms:\n" @@ -644,151 +613,172 @@ "\n" "Algoritmi gestiti:\n" -#: g10/g10.c:413 +#: g10/g10.c:433 msgid "usage: gpg [options] " msgstr "uso: gpg [options] " -#: g10/g10.c:453 +#: g10/g10.c:473 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:580 -#, fuzzy, c-format +#: g10/g10.c:605 +#, c-format msgid "NOTE: no default option file `%s'\n" -msgstr "nota: nessun file con opzioni predefinite `%s'\n" +msgstr "NOTA: manca il file con le opzioni predefinite `%s'\n" -#: g10/g10.c:584 +#: g10/g10.c:609 #, c-format msgid "option file `%s': %s\n" -msgstr "file con opzioni predefinite `%s': %s\n" +msgstr "file con le opzioni `%s': %s\n" -#: g10/g10.c:591 +#: g10/g10.c:616 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:737 -#, fuzzy, c-format +#: g10/g10.c:782 +#, c-format msgid "%s is not a valid character set\n" -msgstr "Carattere non valido nel commento\n" +msgstr "%s non Х un set di caratteri valido\n" -#: g10/g10.c:780 g10/g10.c:792 +#: g10/g10.c:827 g10/g10.c:839 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non Х valido\n" -#: g10/g10.c:786 g10/g10.c:798 +#: g10/g10.c:833 g10/g10.c:845 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non Х valido\n" -#: g10/g10.c:801 +#: g10/g10.c:849 +msgid "the given policy URL is invalid\n" +msgstr "" + +#: g10/g10.c:852 #, 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:803 +#: g10/g10.c:854 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:805 +#: g10/g10.c:856 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:807 +#: g10/g10.c:858 msgid "max-cert-depth must be in range 1 to 255\n" -msgstr "" +msgstr "max-cert-depth deve essere tra 1 e 255\n" -#: g10/g10.c:810 -#, fuzzy +#: g10/g10.c:861 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" -msgstr "nota: il modo S2K semplice (0) Х fortemente scoraggiato\n" +msgstr "NOTA: l'uso del modo S2K semplice (0) Х fortemente scoraggiato\n" -#: g10/g10.c:814 +#: g10/g10.c:865 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:891 +#: g10/g10.c:942 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:897 +#: g10/g10.c:948 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:904 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:912 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:925 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:938 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:952 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:964 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:973 -#, fuzzy +#: g10/g10.c:1024 msgid "--edit-key username [commands]" -msgstr "--edit-key nomeutente" +msgstr "--edit-key nomeutente [comandi]" -#: g10/g10.c:987 +#: g10/g10.c:1038 msgid "--delete-secret-key username" msgstr "--delete-secret-key nomeutente" -#: g10/g10.c:990 +#: g10/g10.c:1041 msgid "--delete-key username" msgstr "--delete-key nomeutente" -#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311 +#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire `%s': %s\n" -#: g10/g10.c:1024 +#: g10/g10.c:1075 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [userid] [portachiavi]" -#: g10/g10.c:1083 +#: g10/g10.c:1134 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:1091 +#: g10/g10.c:1142 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:1157 +#: g10/g10.c:1208 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1283 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:1236 +#: g10/g10.c:1287 msgid "Go ahead and type your message ...\n" -msgstr "" +msgstr "Vai avanti e scrivi il messaggio...\n" -#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "impossibile aprire `%s'\n" +#: g10/g10.c:1457 +msgid "" +"the first character of a notation name must be a letter or an underscore\n" +msgstr "" + +#: g10/g10.c:1463 +msgid "" +"a notation name must have only letters, digits, dots or underscores and end " +"with an '='\n" +msgstr "" + +#: g10/g10.c:1469 +msgid "dots in a notation name must be surrounded by other characters\n" +msgstr "" + +#: g10/g10.c:1477 +msgid "a notation value must not use any control characters\n" +msgstr "" + #: g10/armor.c:296 #, c-format msgid "armor: %s\n" @@ -807,18 +797,16 @@ msgstr "header della firma in chiaro non valido\n" #: g10/armor.c:389 -#, fuzzy msgid "nested clear text signatures\n" -msgstr "|[file]|fai una firma mantenendo il testo in chiaro" +msgstr "firme in chiaro innestate\n" #: g10/armor.c:500 msgid "invalid dash escaped line: " msgstr "riga protetta con il trattino non valida: " #: g10/armor.c:512 -#, fuzzy msgid "unexpected armor:" -msgstr "Dati inaspettati" +msgstr "armatura inaspettata:" #: g10/armor.c:629 #, c-format @@ -851,27 +839,28 @@ msgstr "errore nella riga della coda\n" #: g10/armor.c:1001 -#, fuzzy msgid "no valid OpenPGP data found.\n" -msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n" +msgstr "Non sono stati trovati dati OpenPGP validi.\n" #: g10/armor.c:1005 #, c-format msgid "invalid armor: line longer than %d characters\n" -msgstr "" +msgstr "armatura non valida: linea piu` lunga di %d caratteri\n" #: g10/armor.c:1009 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" +"carattere quoted printable nell'armatura - probabilmente Х stato usato\n" +"un MTA buggato\n" #: g10/pkclist.c:137 -#, fuzzy, c-format +#, c-format msgid "" "No trust value assigned to %lu:\n" "%4u%c/%08lX %s \"" msgstr "" -"Nessun valore di fiducia del proprietario definito per %lu:\n" +"Nessun valore di fiducia assegnato a %lu:\n" "%4u%c/%08lX %s \"" #: g10/pkclist.c:147 @@ -898,17 +887,16 @@ #: g10/pkclist.c:156 msgid " m = back to the main menu\n" -msgstr " m = ritorna al menЫ principale\n" +msgstr " m = torna al menЫ principale\n" #: g10/pkclist.c:158 msgid " q = quit\n" -msgstr "" +msgstr " q = abbandona\n" # valid user replies (not including 1..4) # [Marco, you can change 'm' and 's' to whatever letters you like] #. a string with valid answers #: g10/pkclist.c:163 -#, fuzzy msgid "sSmMqQ" msgstr "sSmMqQ" @@ -918,7 +906,7 @@ #: g10/pkclist.c:187 msgid "Certificates leading to an ultimately trusted key:\n" -msgstr "" +msgstr "Certificati che portano a chiavi definitivamente affidabili:\n" #: g10/pkclist.c:254 msgid "" @@ -935,50 +923,51 @@ "No path leading to one of our keys found.\n" "\n" msgstr "" +"Non Х stato trovato alcun percorso che porti a una delle nostre chiavi.\n" #: g10/pkclist.c:262 msgid "" "No certificates with undefined trust found.\n" "\n" -msgstr "" +msgstr "Non Х stato trovato alcun certificato con fiducia non definita.\n" #: g10/pkclist.c:264 -#, fuzzy msgid "" "No trust values changed.\n" "\n" msgstr "" -"Nessun valore di fiducia del proprietario modificato.\n" +"Nessun valore di fiducia modificato.\n" "\n" #: g10/pkclist.c:281 -#, fuzzy, c-format +#, c-format msgid "key %08lX: key has been revoked!\n" -msgstr "chiave %08lX: accettata come chiave segreta\n" +msgstr "chiave %08lX: la chiave Х stata revocata!\n" #: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403 msgid "Use this key anyway? " msgstr "Uso lo stesso questa chiave? " #: g10/pkclist.c:291 -#, fuzzy, c-format +#, c-format msgid "key %08lX: subkey has been revoked!\n" -msgstr "chiave %08lX: accettata come chiave segreta\n" +msgstr "chiave %08lX: la subchiave Х stata revocata!\n" #: g10/pkclist.c:321 -#, fuzzy, c-format +#, c-format msgid "%08lX: key has expired\n" -msgstr "Nota: questa chiave Х scaduta!\n" +msgstr "%08lX: la chiave Х scaduta\n" #: g10/pkclist.c:327 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" +"%08lX: mancano informazioni su come calcolare una probabilitЮ di fiducia\n" #: g10/pkclist.c:341 -#, fuzzy, c-format +#, c-format msgid "%08lX: We do NOT trust this key\n" -msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n" +msgstr "%08lX: NON ci fidiamo di questa chiave!\n" #: g10/pkclist.c:347 #, c-format @@ -986,14 +975,16 @@ "%08lX: It is not sure that this key really belongs to the owner\n" "but it is accepted anyway\n" msgstr "" +"%08lX: Non Х sicuro che questa chiave appartenga veramente al proprietario\n" +"ma Х accettata comunque\n" #: g10/pkclist.c:353 msgid "This key probably belongs to the owner\n" -msgstr "" +msgstr "Questa chiave probabilmente appartiene al proprietario\n" #: g10/pkclist.c:358 msgid "This key belongs to us\n" -msgstr "" +msgstr "Questa chiave ci appartiene\n" #: g10/pkclist.c:398 msgid "" @@ -1020,9 +1011,8 @@ msgstr " Questo puР significare che la firma Х stata falsificata.\n" #: g10/pkclist.c:459 -#, fuzzy msgid "WARNING: This subkey has been revoked by its owner!\n" -msgstr "ATTENZIONE: questa chiave Х stata revocata dal suo proprietario!\n" +msgstr "ATTENZIONE: questa subchiave Х stata revocata dal proprietario!\n" #: g10/pkclist.c:480 msgid "Note: This key has expired!\n" @@ -1056,12 +1046,17 @@ msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Non Х sicuro che la firma appartenga al proprietario.\n" -#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673 +#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: saltata: %s\n" -#: g10/pkclist.c:591 +#: g10/pkclist.c:588 g10/pkclist.c:687 +#, fuzzy, c-format +msgid "%s: skipped: public key already present\n" +msgstr "%s: il keyblock ha problemi di lettura: %s\n" + +#: g10/pkclist.c:611 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1069,20 +1064,20 @@ "Non hai specificato un user ID. (puoi usare \"-r\")\n" "\n" -#: g10/pkclist.c:596 +#: g10/pkclist.c:616 msgid "Enter the user ID: " msgstr "Inserisci l'user ID: " -#: g10/pkclist.c:607 +#: g10/pkclist.c:627 msgid "No such user ID.\n" msgstr "User ID inesistente.\n" -#: g10/pkclist.c:653 +#: g10/pkclist.c:673 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: errore nel controllare la chiave: %s\n" -#: g10/pkclist.c:679 +#: g10/pkclist.c:711 msgid "no valid addressees\n" msgstr "nessun indirizzo valido\n" @@ -1111,12 +1106,12 @@ #: g10/keygen.c:391 #, c-format msgid " (%d) ElGamal (encrypt only)\n" -msgstr " (%d) ElGamal (crittografa solo)\n" +msgstr " (%d) ElGamal (cifra solo)\n" #: g10/keygen.c:392 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" -msgstr " (%d) ElGamal (firma e crittografa)\n" +msgstr " (%d) ElGamal (firma e cifra)\n" #: g10/keygen.c:394 #, c-format @@ -1128,9 +1123,8 @@ msgstr "Cosa scegli? " #: g10/keygen.c:409 -#, fuzzy msgid "Do you really want to create a sign and encrypt key? " -msgstr "Vuoi davvero cancellare le chiavi selezionate? " +msgstr "Vuoi davvero creare una chiave di firma e cifratura? " #: g10/keygen.c:430 msgid "Invalid selection.\n" @@ -1170,16 +1164,16 @@ #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. #: g10/keygen.c:466 -#, fuzzy, c-format +#, c-format msgid "keysize too large; %d is largest value allowed.\n" -msgstr "la chiave Х troppo corta; 768 Х il minimo valore permesso.\n" +msgstr "la chiave Х troppo lunga; %d Х il massimo valore permesso.\n" #: g10/keygen.c:471 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" msgstr "" -"Chiavi piЫ lunghe di 2048 non sono consigliate perchХ i calcoli sono \n" +"Chiavi piЫ lunghe di 2048 non sono consigliate perchХ i calcoli sono\n" "VERAMENTE lunghi!\n" #: g10/keygen.c:474 @@ -1296,7 +1290,7 @@ #: g10/keygen.c:669 #, c-format msgid "You are using the `%s' character set.\n" -msgstr "" +msgstr "Stai usando il set di caratteri `%s'.\n" #: g10/keygen.c:675 #, c-format @@ -1325,7 +1319,7 @@ "Ti serve una passphrase per proteggere la tua chiave segreta.\n" "\n" -#: g10/keyedit.c:433 g10/keygen.c:748 +#: g10/keyedit.c:455 g10/keygen.c:748 msgid "passphrase not correctly repeated; try again.\n" msgstr "passphrase non ripetuta correttamente; riprova.\n" @@ -1342,7 +1336,6 @@ "\n" #: g10/keygen.c:775 -#, fuzzy msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -1350,11 +1343,9 @@ "generator a better chance to gain enough entropy.\n" msgstr "" "Dobbiamo generare un mucchio di byte casuali. х una buona idea eseguire\n" -"qualche altra azione (lavorare in un'altra finestra, muovere il mouse, " -"usare\n" -"la rete e i dischi) durante la generazione dei numeri primi; questo dЮ al\n" -"generatore di numeri casuali la possibilitЮ di raccogliere abbastanza\n" -"entropia.\n" +"qualche altra azione (scrivere sulla tastiera, muovere il mouse, usare i\n" +"dischi) durante la generazione dei numeri primi; questo da al generatore di\n" +"numeri casuali migliori possibilitЮ di raccogliere abbastanza entropia.\n" #: g10/keygen.c:845 msgid "Key generation can only be used in interactive mode\n" @@ -1365,7 +1356,8 @@ msgstr "La coppia DSA avrЮ 1024 bit.\n" #: g10/keygen.c:859 -msgid "Key generation cancelled.\n" +#, fuzzy +msgid "Key generation canceled.\n" msgstr "Generazione della chiave annullata.\n" #: g10/keygen.c:869 @@ -1383,41 +1375,40 @@ msgstr "chiavi pubbliche e segrete create e firmate.\n" #: g10/keygen.c:949 -#, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" 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" +"Nota che questa chiave non puР essere usata per cifrare. Forse vorrai usare\n" +"il comando \"--edit-key\" per generare una chiave secondaria per questo " +"scopo.\n" #: g10/keygen.c:963 g10/keygen.c:1062 #, c-format msgid "Key generation failed: %s\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52 -#, fuzzy, c-format +#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105 +#, 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" +"la chiave Х stata creata %lu secondo nel futuro (salto nel tempo o problema\n" +"con l'orologio)\n" -#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54 -#, fuzzy, c-format +#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107 +#, 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" +"la chiave Х stata creata %lu secondi nel futuro (salto nel tempo o problema\n" +"con l'orologio)\n" #: g10/keygen.c:1040 msgid "Really create? " msgstr "Crea davvero? " -#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467 +#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467 #: g10/tdbio.c:528 #, c-format msgid "%s: can't open: %s\n" @@ -1429,47 +1420,46 @@ msgstr "errore nella creazione della passhprase: %s\n" #: g10/encode.c:167 g10/encode.c:287 -#, fuzzy, c-format +#, c-format msgid "%s: WARNING: empty file\n" -msgstr "%s: attenzione: file vuoto\n" +msgstr "%s: ATTENZIONE: file vuoto\n" #: g10/encode.c:237 #, c-format msgid "reading from `%s'\n" msgstr "lettura da `%s'\n" -#: g10/encode.c:417 -#, fuzzy, c-format +#: g10/encode.c:431 +#, c-format msgid "%s/%s encrypted for: %s\n" -msgstr "%s crittografato per: %s\n" +msgstr "%s/%s cifrato per: %s\n" #: g10/export.c:147 -#, fuzzy, c-format +#, c-format msgid "%s: user not found: %s\n" -msgstr "%s: utente non trovato\n" +msgstr "%s: utente non trovato: %s\n" #: g10/export.c:156 #, c-format msgid "certificate read problem: %s\n" -msgstr "" +msgstr "problema di lettura del certificato: %s\n" #: g10/export.c:165 -#, fuzzy, c-format +#, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" -msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" +msgstr "chiave %08lX: chiave non rfc2440 - saltata\n" #: g10/export.c:203 -#, fuzzy msgid "WARNING: nothing exported\n" -msgstr "ATTENZIONE: uso di una chiave non fidata!\n" +msgstr "ATTENZIONE: non Х stato esportato nulla\n" #: g10/getkey.c:206 msgid "too many entries in pk cache - disabled\n" -msgstr "" +msgstr "troppe voci nella pk cache - disabilitata\n" #: g10/getkey.c:345 msgid "too many entries in unk cache - disabled\n" -msgstr "" +msgstr "troppe voci nella unk cache - disabilitata\n" #: g10/getkey.c:1535 g10/getkey.c:1591 #, c-format @@ -1494,7 +1484,7 @@ #: g10/import.c:172 #, fuzzy, c-format msgid "error reading `%s': %s\n" -msgstr "%s: errore nel controllare la chiave: %s\n" +msgstr "errore nella creazione della passhprase: %s\n" #: g10/import.c:175 #, c-format @@ -1574,20 +1564,20 @@ msgid "no default public keyring\n" msgstr "nessun portachiavi pubblico predefinito\n" -#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501 +#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "scrittura in `%s'\n" -#: g10/import.c:379 g10/import.c:435 -#, fuzzy -msgid "can't lock keyring `%': %s\n" +#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#, fuzzy, c-format +msgid "can't lock keyring `%s': %s\n" msgstr "impossibile bloccare il portachiavi pubblico: %s\n" -#: g10/import.c:382 -#, fuzzy -msgid "error writing keyring `%': %s\n" -msgstr "%s: errore nel controllare la chiave: %s\n" +#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648 +#, fuzzy, c-format +msgid "error writing keyring `%s': %s\n" +msgstr "%s: errore durante la scrittura del record di versione: %s\n" #: g10/import.c:387 #, c-format @@ -1609,11 +1599,6 @@ msgid "key %08lX: can't read original keyblock: %s\n" msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n" -#: g10/import.c:438 g10/import.c:547 g10/import.c:648 -#, fuzzy, c-format -msgid "error writing keyring `%s': %s\n" -msgstr "%s: errore nel controllare la chiave: %s\n" - #: g10/import.c:444 #, c-format msgid "key %08lX: 1 new user-id\n" @@ -1649,11 +1634,6 @@ msgid "key %08lX: not changed\n" msgstr "chiave %08lX: non cambiata\n" -#: g10/import.c:544 g10/import.c:645 -#, fuzzy, c-format -msgid "can't lock keyring `%s': %s\n" -msgstr "impossibile bloccare il portachiavi pubblico: %s\n" - #: g10/import.c:552 #, c-format msgid "key %08lX: secret key imported\n" @@ -1703,14 +1683,14 @@ msgstr "chiave %08lX: autofirma non valida\n" #: g10/import.c:709 -#, fuzzy, c-format +#, c-format msgid "key %08lX: no subkey for key binding\n" -msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n" +msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n" #: g10/import.c:718 -#, fuzzy, c-format +#, c-format msgid "key %08lX: invalid subkey binding\n" -msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n" +msgstr "chiave %08lX: legame con la subchiave non valido:\n" #: g10/import.c:750 #, c-format @@ -1718,18 +1698,18 @@ msgstr "chiave %08lX: saltato l'user id '" #: g10/import.c:773 -#, fuzzy, c-format +#, c-format msgid "key %08lX: skipped subkey\n" -msgstr "chiave %08lX: una nuova subchiave\n" +msgstr "chiave %08lX: saltata la subchiave\n" #. here we violate the rfc a bit by still allowing #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense #: g10/import.c:798 -#, fuzzy, c-format +#, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" -msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n" +msgstr "chiave %08lX: firma non esportabile (chiave %02x) - saltata\n" #: g10/import.c:807 #, c-format @@ -1756,68 +1736,68 @@ msgid "key %08lX: our copy has no self-signature\n" msgstr "chiave %08lX: la nostra copia non ha autofirma\n" -#: g10/keyedit.c:91 +#: g10/keyedit.c:92 #, c-format msgid "%s: user not found\n" msgstr "%s: utente non trovato\n" -#: g10/keyedit.c:177 +#: g10/keyedit.c:153 msgid "[revocation]" -msgstr "" +msgstr "[revoca]" -#: g10/keyedit.c:178 +#: g10/keyedit.c:154 msgid "[self-signature]" msgstr "[autofirma]" -#: g10/keyedit.c:196 +#: g10/keyedit.c:218 msgid "1 bad signature\n" msgstr "una firma non corretta\n" -#: g10/keyedit.c:198 +#: g10/keyedit.c:220 #, c-format msgid "%d bad signatures\n" msgstr "%d firme non corrette\n" -#: g10/keyedit.c:200 +#: g10/keyedit.c:222 msgid "1 signature not checked due to a missing key\n" msgstr "1 firma non controllata per mancanza della chiave\n" -#: g10/keyedit.c:202 +#: g10/keyedit.c:224 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d firme non controllate per mancanza delle chiavi\n" -#: g10/keyedit.c:204 +#: g10/keyedit.c:226 msgid "1 signature not checked due to an error\n" msgstr "1 firma non controllata a causa di un errore\n" -#: g10/keyedit.c:206 +#: g10/keyedit.c:228 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d firme non controllate a causa di errori\n" -#: g10/keyedit.c:208 +#: g10/keyedit.c:230 msgid "1 user id without valid self-signature detected\n" msgstr "Trovato 1 user id senza autofirma valida\n" -#: g10/keyedit.c:210 +#: g10/keyedit.c:232 #, c-format msgid "%d user ids without valid self-signatures detected\n" msgstr "Trovati %d user id senza autofirme valide\n" #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. -#: g10/keyedit.c:290 +#: g10/keyedit.c:312 #, c-format msgid "Already signed by key %08lX\n" msgstr "GiЮ firmato dalla chiave %08lX\n" -#: g10/keyedit.c:298 +#: g10/keyedit.c:320 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Niente da firmare con la chiave %08lX\n" -#: g10/keyedit.c:307 +#: g10/keyedit.c:329 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -1825,35 +1805,37 @@ "Sei davvero sicuro di volere firmare questa chiave\n" "con la tua chiave: \"" -#: g10/keyedit.c:316 +#: g10/keyedit.c:338 msgid "" "The signature will be marked as non-exportable.\n" "\n" msgstr "" +"La firma sarЮ segnata come non esportabile.\n" +"\n" -#: g10/keyedit.c:321 +#: g10/keyedit.c:343 msgid "Really sign? " msgstr "Firmo davvero? " -#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75 +#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "firma fallita: %s\n" -#: g10/keyedit.c:400 +#: g10/keyedit.c:422 msgid "This key is not protected.\n" msgstr "Questa chiave non Х protetta.\n" -#: g10/keyedit.c:403 +#: g10/keyedit.c:425 msgid "Key is protected.\n" msgstr "La chiave Х protetta.\n" -#: g10/keyedit.c:420 +#: g10/keyedit.c:442 #, c-format msgid "Can't edit this key: %s\n" msgstr "Impossibile modificare questa chiave: %s\n" -#: g10/keyedit.c:425 +#: g10/keyedit.c:447 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -1861,7 +1843,7 @@ "Inserisci la nuova passphrase per questa chiave segreta.\n" "\n" -#: g10/keyedit.c:437 +#: g10/keyedit.c:459 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -1869,377 +1851,407 @@ "Non vuoi una passphrase - questa Х probabilmente una *cattiva* idea!\n" "\n" -#: g10/keyedit.c:440 +#: g10/keyedit.c:462 msgid "Do you really want to do this? " msgstr "Vuoi veramente farlo?" -#: g10/keyedit.c:501 +#: g10/keyedit.c:523 msgid "moving a key signature to the correct place\n" -msgstr "" +msgstr "spostamento della firma di una chiave nel posto corretto\n" -#: g10/keyedit.c:537 -msgid "quit" -msgstr "quit" - -#: g10/keyedit.c:537 +#: g10/keyedit.c:559 msgid "quit this menu" msgstr "abbandona questo menЫ" -#: g10/keyedit.c:538 +#: g10/keyedit.c:560 msgid "q" msgstr "q" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save" msgstr "save" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save and quit" msgstr "salva ed esci" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "help" msgstr "help" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "show this help" msgstr "mostra questo aiuto" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "show fingerprint" msgstr "mostra le impronte digitali" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list" msgstr "list" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list key and user ids" msgstr "elenca le chiavi e gli user id" -#: g10/keyedit.c:544 +#: g10/keyedit.c:566 msgid "l" msgstr "l" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "uid" msgstr "uid" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "select user id N" msgstr "scegli l'user id N" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "key" msgstr "key" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "select secondary key N" msgstr "scegli la chiave secondaria N" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "check" msgstr "check" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "list signatures" msgstr "elenca le firme" -#: g10/keyedit.c:548 +#: g10/keyedit.c:570 msgid "c" msgstr "c" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign" msgstr "sign" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign the key" msgstr "firma la chiave" -#: g10/keyedit.c:550 +#: g10/keyedit.c:572 msgid "s" msgstr "s" -#: g10/keyedit.c:551 -#, fuzzy +#: g10/keyedit.c:573 msgid "lsign" -msgstr "sign" +msgstr "lsign" -#: g10/keyedit.c:551 -#, fuzzy +#: g10/keyedit.c:573 msgid "sign the key locally" -msgstr "firma la chiave" +msgstr "firma la chiave localmente" -#: g10/keyedit.c:552 +#: g10/keyedit.c:574 msgid "debug" msgstr "debug" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "add a user id" msgstr "aggiungi un user id" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "delete user id" msgstr "cancella un user id" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "add a secondary key" msgstr "aggiungi una chiave secondaria" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delete a secondary key" msgstr "cancella una chiave secondaria" -#: g10/keyedit.c:557 +#: g10/keyedit.c:579 +#, fuzzy +msgid "delsig" +msgstr "lsign" + +#: g10/keyedit.c:579 +#, fuzzy +msgid "delete signatures" +msgstr "elenca le firme" + +#: g10/keyedit.c:580 msgid "expire" msgstr "expire" -#: g10/keyedit.c:557 +#: g10/keyedit.c:580 msgid "change the expire date" msgstr "cambia la data di scadenza" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle between secret and public key listing" msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica" -#: g10/keyedit.c:560 +#: g10/keyedit.c:583 msgid "t" msgstr "t" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "pref" msgstr "pref" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "list preferences" msgstr "elenca le impostazioni" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "change the passphrase" msgstr "cambia la passphrase" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "trust" msgstr "trust" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "change the ownertrust" msgstr "cambia il valore di fiducia" -#: g10/keyedit.c:564 -#, fuzzy +#: g10/keyedit.c:587 msgid "revsig" -msgstr "sign" +msgstr "revsig" -#: g10/keyedit.c:564 -#, fuzzy +#: g10/keyedit.c:587 msgid "revoke signatures" -msgstr "forza l'uso di firme v3" +msgstr "revoca firme" -#: g10/keyedit.c:565 -#, fuzzy +#: g10/keyedit.c:588 msgid "revkey" -msgstr "key" +msgstr "revkey" -#: g10/keyedit.c:565 -#, fuzzy +#: g10/keyedit.c:588 msgid "revoke a secondary key" -msgstr "cancella una chiave secondaria" +msgstr "revoca una chiave secondaria" -#: g10/keyedit.c:584 +#: g10/keyedit.c:607 msgid "can't do that in batchmode\n" msgstr "impossibile fare questo in batch mode\n" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:613 +#: g10/keyedit.c:636 msgid "Secret key is available.\n" msgstr "х disponibile una chiave segreta.\n" -#: g10/keyedit.c:642 +#: g10/keyedit.c:665 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:669 +#: g10/keyedit.c:692 msgid "Need the secret key to do this.\n" msgstr "Per fare questo serve la chiave segreta.\n" -#: g10/keyedit.c:691 +#: g10/keyedit.c:714 msgid "Save changes? " msgstr "Salvo i cambiamenti? " -#: g10/keyedit.c:694 +#: g10/keyedit.c:717 msgid "Quit without saving? " msgstr "Esco senza salvare? " -#: g10/keyedit.c:704 +#: g10/keyedit.c:727 #, c-format msgid "update failed: %s\n" msgstr "aggiornamento fallito: %s\n" -#: g10/keyedit.c:711 +#: g10/keyedit.c:734 #, c-format msgid "update secret failed: %s\n" msgstr "aggiornamento della chiave segreta fallito: %s\n" -#: g10/keyedit.c:718 +#: g10/keyedit.c:741 msgid "Key not changed so no update needed.\n" msgstr "La chiave non Х cambiata quindi non sono necessari aggiornamenti.\n" -#: g10/keyedit.c:721 g10/keyedit.c:780 -#, fuzzy, c-format +#: g10/keyedit.c:744 g10/keyedit.c:803 +#, c-format msgid "update of trustdb failed: %s\n" msgstr "aggiornamento del trustdb fallito: %s\n" -#: g10/keyedit.c:754 +#: g10/keyedit.c:777 msgid "Really sign all user ids? " msgstr "Firmo davvero tutti gli user id? " -#: g10/keyedit.c:755 +#: g10/keyedit.c:778 msgid "Hint: Select the user ids to sign\n" msgstr "Suggerimento: seleziona gli user id da firmare\n" -#: g10/keyedit.c:791 +#: g10/keyedit.c:814 g10/keyedit.c:835 msgid "You must select at least one user id.\n" msgstr "Devi selezionare almeno un user id.\n" -#: g10/keyedit.c:793 +#: g10/keyedit.c:816 msgid "You can't delete the last user id!\n" msgstr "Non puoi cancellare l'ultimo user id!\n" -#: g10/keyedit.c:796 +#: g10/keyedit.c:819 msgid "Really remove all selected user ids? " msgstr "Tolgo davvero tutti gli user id selezionati? " -#: g10/keyedit.c:797 +#: g10/keyedit.c:820 msgid "Really remove this user id? " msgstr "Tolgo davvero questo user id? " -#: g10/keyedit.c:820 g10/keyedit.c:842 +#: g10/keyedit.c:858 g10/keyedit.c:880 msgid "You must select at least one key.\n" msgstr "Devi selezionare almeno una chiave.\n" -#: g10/keyedit.c:824 +#: g10/keyedit.c:862 msgid "Do you really want to delete the selected keys? " msgstr "Vuoi davvero cancellare le chiavi selezionate? " -#: g10/keyedit.c:825 +#: g10/keyedit.c:863 msgid "Do you really want to delete this key? " msgstr "Vuoi davvero cancellare questa chiave? " -#: g10/keyedit.c:846 -#, fuzzy +#: g10/keyedit.c:884 msgid "Do you really want to revoke the selected keys? " -msgstr "Vuoi davvero cancellare le chiavi selezionate? " +msgstr "Vuoi davvero revocare le chiavi selezionate? " -#: g10/keyedit.c:847 -#, fuzzy +#: g10/keyedit.c:885 msgid "Do you really want to revoke this key? " -msgstr "Vuoi davvero cancellare questa chiave? " +msgstr "Vuoi davvero revocare questa chiave? " -#: g10/keyedit.c:901 +#: g10/keyedit.c:939 msgid "Invalid command (try \"help\")\n" -msgstr "Comando non valido (prova \"help\")\n" +msgstr "Comando non valido (prova \"help\")\n" + +#: g10/keyedit.c:1294 +msgid "Delete this good signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1298 +msgid "Delete this invalid signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1302 +msgid "Delete this unknown signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1308 +#, fuzzy +msgid "Really delete this self-signature? (y/N)" +msgstr "Creare davvero i certificati di revoca? (s/N)" + +#: g10/keyedit.c:1322 +#, fuzzy, c-format +msgid "Deleted %d signature.\n" +msgstr "%d firme non corrette\n" + +#: g10/keyedit.c:1323 +#, fuzzy, c-format +msgid "Deleted %d signatures.\n" +msgstr "%d firme non corrette\n" + +#: g10/keyedit.c:1326 +#, fuzzy +msgid "Nothing deleted.\n" +msgstr "ATTENZIONE: non Х stato esportato nulla\n" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1395 msgid "Please remove selections from the secret keys.\n" msgstr "Togli le selezioni dalle chiavi segrete.\n" -#: g10/keyedit.c:1299 +#: g10/keyedit.c:1401 msgid "Please select at most one secondary key.\n" msgstr "Seleziona al massimo una chiave secondaria.\n" -#: g10/keyedit.c:1303 -msgid "Changing exiration time for a secondary key.\n" +#: g10/keyedit.c:1405 +#, fuzzy +msgid "Changing expiration time for a secondary key.\n" msgstr "Modifico il tempo di scadenza per una chiave secondaria.\n" -#: g10/keyedit.c:1305 -msgid "Changing exiration time for the primary key.\n" +#: g10/keyedit.c:1407 +#, fuzzy +msgid "Changing expiration time for the primary key.\n" msgstr "Modifico il tempo di scadenza per la chiave primaria.\n" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1448 msgid "You can't change the expiration date of a v3 key\n" -msgstr "" +msgstr "Non Х possibile cambiare la data di scadenza di una chiave v3\n" -#: g10/keyedit.c:1362 +#: g10/keyedit.c:1464 msgid "No corresponding signature in secret ring\n" msgstr "Manca la firma corrispondente nel portachiavi segreto\n" -#: g10/keyedit.c:1422 +#: g10/keyedit.c:1524 #, c-format msgid "No user id with index %d\n" msgstr "Nessun user id con l'indice %d\n" -#: g10/keyedit.c:1468 +#: g10/keyedit.c:1570 #, c-format msgid "No secondary key with index %d\n" msgstr "Nessuna chiave secondaria con l'indice %d\n" -#: g10/keyedit.c:1566 -#, fuzzy +#: g10/keyedit.c:1668 msgid "user ID: \"" -msgstr "Inserisci l'user ID: " +msgstr "user ID: \"" -#: g10/keyedit.c:1569 -#, fuzzy, c-format +#: g10/keyedit.c:1671 +#, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" -msgstr "Niente da firmare con la chiave %08lX\n" +msgstr "" +"\"\n" +"firmata con la tua chiave %08lX a %s\n" +"\n" -#: g10/keyedit.c:1573 -#, fuzzy +#: g10/keyedit.c:1675 msgid "Create a revocation certificate for this signature? (y/N)" -msgstr "genera un certificato di revoca" +msgstr "Creare un certificato di revoca per questa firma? (s/N)" -#: g10/keyedit.c:1653 -#, fuzzy +#: g10/keyedit.c:1755 msgid "Really create the revocation certificates? (y/N)" -msgstr "genera un certificato di revoca" +msgstr "Creare davvero i certificati di revoca? (s/N)" -#: g10/keyedit.c:1676 -#, fuzzy +#: g10/keyedit.c:1778 msgid "no secret key\n" -msgstr "Chiave segreta errata o danneggiata" +msgstr "manca la chiave segreta\n" #: g10/mainproc.c:184 -#, fuzzy, c-format +#, c-format msgid "public key is %08lX\n" -msgstr "Chiave pubblica non trovata" +msgstr "la chiave pubblica Х %08lX\n" #: g10/mainproc.c:212 -#, fuzzy msgid "public key encrypted data: good DEK\n" -msgstr "Decifratura della chiave pubblica fallita: %s\n" +msgstr "dati cifrati con la chiave pubblica: DEK corretto\n" #. fixme: defer this message until we have parsed all packets of #. * this type - do this by building a list of keys with their stati @@ -2248,16 +2260,15 @@ #: g10/mainproc.c:219 #, c-format msgid "public key decryption failed: %s\n" -msgstr "Decifratura della chiave pubblica fallita: %s\n" +msgstr "decifratura della chiave pubblica fallita: %s\n" #: g10/mainproc.c:247 -#, fuzzy msgid "decryption okay\n" -msgstr "decifratura fallita: %s\n" +msgstr "decifratura corretta\n" #: g10/mainproc.c:252 msgid "WARNING: encrypted message has been manipulated!\n" -msgstr "" +msgstr "ATTENZIONE: il messaggio cifrato Х stato manipolato!\n" #: g10/mainproc.c:257 #, c-format @@ -2265,85 +2276,97 @@ msgstr "decifratura fallita: %s\n" #: g10/mainproc.c:275 -#, fuzzy msgid "NOTE: sender requested \"for-your-eyes-only\"\n" -msgstr "nota: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n" +msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n" #: g10/mainproc.c:277 #, c-format msgid "original file name='%.*s'\n" +msgstr "nome del file originale='%.*s'\n" + +#: g10/mainproc.c:505 g10/mainproc.c:514 +#, fuzzy +msgid "WARNING: invalid notation data found\n" +msgstr "Non sono stati trovati dati OpenPGP validi.\n" + +#: g10/mainproc.c:517 +msgid "Notation: " msgstr "" -#: g10/mainproc.c:890 -msgid "signature verification suppressed\n" +#: g10/mainproc.c:524 +msgid "Policy: " msgstr "" -#: g10/mainproc.c:896 +#: g10/mainproc.c:929 +msgid "signature verification suppressed\n" +msgstr "verifica della firma soppressa\n" + +#: g10/mainproc.c:935 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" -msgstr "Firma fatta %.*s usando %s key ID %08lX\n" +msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:922 g10/mainproc.c:933 +#: g10/mainproc.c:961 g10/mainproc.c:972 msgid "BAD signature from \"" msgstr "Firma NON corretta da \"" -#: g10/mainproc.c:923 g10/mainproc.c:934 +#: g10/mainproc.c:962 g10/mainproc.c:973 msgid "Good signature from \"" -msgstr "Buona firma da \"" +msgstr "Firma valida da \"" -#: g10/mainproc.c:925 -#, fuzzy +#: g10/mainproc.c:964 msgid " aka \"" -msgstr "importate: %lu" +msgstr " anche noto come \"" -#: g10/mainproc.c:975 +#: g10/mainproc.c:1015 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossibile controllare la firma: %s\n" -#: g10/mainproc.c:1056 +#: g10/mainproc.c:1109 msgid "old style (PGP 2.x) signature\n" -msgstr "" +msgstr "firma vecchio stile (PGP 2.x)\n" -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1114 msgid "invalid root packet detected in proc_tree()\n" -msgstr "" +msgstr "individuato un pacchetto radice non valido in proc_tree()\n" #: g10/misc.c:93 -#, fuzzy, c-format +#, c-format msgid "can't disable core dumps: %s\n" -msgstr "impossibile aprire `%s': %s\n" +msgstr "impossibile disabilitare i core dump: %s\n" #: g10/misc.c:96 msgid "WARNING: program may create a core file!\n" -msgstr "" +msgstr "ATTENZIONE: il programma potrebbe creare un file di core!\n" #: g10/misc.c:203 msgid "Experimental algorithms should not be used!\n" -msgstr "" +msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n" #: g10/misc.c:217 msgid "" "RSA keys are deprecated; please consider creating a new key and use this key " "in the future\n" msgstr "" -"L'uso di chiavi RSA Х deprecato; per favore in futuro considera di creare e\n" -"usare una nuova chiave.\n" +"Le chiavi RSA sono deprecate; per favore considera di creare una nuova " +"chiave\n" +"e usarla in futuro\n" #: g10/misc.c:239 msgid "this cipher algorithm is depreciated; please use a more standard one!\n" -msgstr "" +msgstr "questo algoritmo di cifratura Х deprecato; usatene uno piЫ standard!\n" #: g10/parse-packet.c:112 -#, fuzzy, c-format +#, c-format msgid "can't handle public key algorithm %d\n" -msgstr "impossibile bloccare il portachiavi pubblico: %s\n" +msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n" -#: g10/parse-packet.c:872 +#: g10/parse-packet.c:931 #, c-format msgid "subpacket of type %d has critical bit set\n" -msgstr "" +msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n" #: g10/passphrase.c:157 msgid "" @@ -2356,22 +2379,20 @@ "dell'utente: \"" #: g10/passphrase.c:166 -#, fuzzy, c-format +#, c-format msgid "%u-bit %s key, ID %08lX, created %s" -msgstr "(chiave %2$s di %1$u-bit, ID %3$08lX, creata il %4$s)\n" +msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s" #: g10/passphrase.c:171 #, c-format msgid " (main key ID %08lX)" -msgstr "" +msgstr " (key ID principale %08lX)" -#: g10/passphrase.c:190 -#, fuzzy +#: g10/passphrase.c:192 msgid "Enter passphrase: " msgstr "Inserisci la passphrase: " -#: g10/passphrase.c:194 -#, fuzzy +#: g10/passphrase.c:196 msgid "Repeat passphrase: " msgstr "Ripeti la passphrase: " @@ -2380,15 +2401,15 @@ msgstr "" "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n" -#: g10/plaintext.c:208 +#: g10/plaintext.c:266 msgid "Please enter name of data file: " msgstr "Inserisci il nome del file di dati: " -#: g10/plaintext.c:229 +#: g10/plaintext.c:287 msgid "reading stdin ...\n" -msgstr "" +msgstr "viene letto stdin...\n" -#: g10/plaintext.c:302 +#: g10/plaintext.c:360 #, c-format msgid "can't open signed data `%s'\n" msgstr "impossibile aprire i dati firmati `%s'\n" @@ -2396,22 +2417,21 @@ #: g10/pubkey-enc.c:79 #, c-format msgid "anonymous receiver; trying secret key %08lX ...\n" -msgstr "ricevente anonimo; provo la chiave segreta %08lX ...\n" +msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n" #: g10/pubkey-enc.c:85 -#, fuzzy msgid "okay, we are the anonymous recipient.\n" -msgstr "Bene, siamo il ricevente anonimo.\n" +msgstr "bene, siamo il destinatario anonimo.\n" #: g10/pubkey-enc.c:137 -#, fuzzy msgid "old encoding of the DEK is not supported\n" -msgstr "l'algoritmo di protezione %d non Х gestito\n" +msgstr "la vecchia codifica del DEK non Х gestita\n" #: g10/pubkey-enc.c:191 -#, fuzzy, c-format +#, c-format msgid "NOTE: cipher algorithm %d not found in preferences\n" -msgstr "nota: algoritmo di cifratura %d non trovato nelle impostazioni\n" +msgstr "" +"NOTA: l'algoritmo di cifratura %d non Х stato trovato nelle impostazioni\n" #: g10/seckey-cert.c:55 #, c-format @@ -2423,255 +2443,256 @@ msgstr "Passphrase non valida; riprova...\n" #: g10/seckey-cert.c:227 -#, fuzzy msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "" -"Attenzione: individuata una chiave debole - per favore cambia ancora la\n" +"ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n" "passphrase.\n" #: g10/sig-check.c:187 msgid "assuming bad MDC due to an unknown critical bit\n" -msgstr "" +msgstr "si presume un MDC non valido a causa di un bit critico sconosciuto\n" #: g10/sig-check.c:283 msgid "" "this is a PGP generated ElGamal key which is NOT secure for signatures!\n" msgstr "" -"questa Х una chiave ElGamal generata da PGP che NON Х sicura per le firme!\n" +"questa Х una chiave ElGamal generata da PGP e NON Х sicura per le firme!\n" #: g10/sig-check.c:291 -#, fuzzy, c-format +#, c-format msgid "public key is %lu second newer than the signature\n" -msgstr "chiave %08lX: user id senza firma\n" +msgstr "la chiave pubblica Х %lu secondo piЫ recente della firma\n" #: g10/sig-check.c:292 -#, fuzzy, c-format +#, c-format msgid "public key is %lu seconds newer than the signature\n" -msgstr "chiave %08lX: user id senza firma\n" +msgstr "la chiave pubblica Х %lu secondi piЫ recente della firma\n" #: g10/sig-check.c:308 -#, fuzzy, c-format +#, c-format msgid "NOTE: signature key expired %s\n" -msgstr "attenzione: firma della chiave scaduta il %s\n" +msgstr "NOTA: chiave per firmare scaduta il %s\n" #: g10/sig-check.c:365 msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" +"si presume una firma non valida a causa di un bit critico sconosciuto\n" -#: g10/sign.c:79 -#, fuzzy, c-format +#: g10/sign.c:132 +#, c-format msgid "%s signature from: %s\n" -msgstr "Firma NON corretta da \"" +msgstr "Firma %s da: %s\n" -#: g10/sign.c:210 g10/sign.c:496 -#, fuzzy, c-format +#: g10/sign.c:263 g10/sign.c:554 +#, c-format msgid "can't create %s: %s\n" -msgstr "%s: impossibile creare: %s\n" +msgstr "impossibile creare %s: %s\n" -#: g10/sign.c:306 -#, fuzzy +#: g10/sign.c:361 msgid "signing:" -msgstr "sign" +msgstr "firma:" -#: g10/sign.c:346 -#, fuzzy, c-format +#: g10/sign.c:401 +#, c-format msgid "WARNING: `%s' is an empty file\n" -msgstr "%s: attenzione: file vuoto\n" +msgstr "ATTENZIONE: `%s' Х un file vuoto\n" #: g10/textfilter.c:128 #, c-format msgid "can't handle text lines longer than %d characters\n" -msgstr "" +msgstr "impossibile gestire linee di testo piЫ lunghe di %d caratteri\n" #: g10/textfilter.c:197 #, c-format msgid "input line longer than %d characters\n" -msgstr "" +msgstr "linea di input piЫ lunga di %d caratteri\n" #: g10/tdbio.c:116 g10/tdbio.c:1505 -#, fuzzy, c-format +#, c-format msgid "trustdb rec %lu: lseek failed: %s\n" -msgstr "aggiornamento della chiave segreta fallito: %s\n" +msgstr "trustdb rec %lu: lseek fallita: %s\n" #: g10/tdbio.c:122 g10/tdbio.c:1512 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" -msgstr "" +msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n" #: g10/tdbio.c:232 msgid "trustdb transaction too large\n" -msgstr "" +msgstr "transazione del trustdb troppo grande\n" #: g10/tdbio.c:424 -#, fuzzy, c-format +#, c-format msgid "%s: can't access: %s\n" -msgstr "%s: impossibile creare: %s\n" +msgstr "%s: impossibile acedere a: %s\n" #: g10/ringedit.c:296 g10/tdbio.c:444 -#, fuzzy, c-format +#, c-format msgid "%s: can't create directory: %s\n" -msgstr "%s: impossibile creare: %s\n" +msgstr "%s: impossibile creare la directory: %s\n" #: g10/ringedit.c:302 g10/tdbio.c:447 -#, fuzzy, c-format +#, c-format msgid "%s: directory created\n" -msgstr "%s: impossibile creare: %s\n" +msgstr "%s: directory creata\n" #: g10/tdbio.c:451 #, c-format msgid "%s: directory does not exist!\n" -msgstr "" +msgstr "%s: la directory non esiste!\n" -#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457 +#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossibile creare: %s\n" #: g10/tdbio.c:472 g10/tdbio.c:521 -#, fuzzy, c-format +#, c-format msgid "%s: can't create lock\n" -msgstr "%s: impossibile creare: %s\n" +msgstr "%s: impossibile creare il lock\n" #: g10/tdbio.c:486 #, c-format msgid "%s: failed to create version record: %s" -msgstr "" +msgstr "%s: creazione del record della versione fallita: %s" #: g10/tdbio.c:490 -#, fuzzy, c-format +#, c-format msgid "%s: invalid trustdb created\n" -msgstr "%s: impossibile creare: %s\n" +msgstr "%s: Х stato creato un trustdb non valido\n" #: g10/tdbio.c:493 -#, fuzzy, c-format +#, c-format msgid "%s: trustdb created\n" -msgstr "%s: impossibile creare: %s\n" +msgstr "%s: creato il trustdb\n" #: g10/tdbio.c:530 -#, fuzzy, c-format +#, c-format msgid "%s: invalid trustdb\n" -msgstr "aggiornamento del trustdb fallito: %s\n" +msgstr "%s: trustdb non valido\n" #: g10/tdbio.c:563 -#, fuzzy, c-format +#, c-format msgid "%s: failed to create hashtable: %s\n" -msgstr "%s: impossibile creare: %s\n" +msgstr "%s: creazione della tabella hash fallita: %s\n" #: g10/tdbio.c:571 -#, fuzzy, c-format +#, c-format msgid "%s: error updating version record: %s\n" -msgstr "%s: errore nel controllare la chiave: %s\n" +msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n" #: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678 #: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465 -#, fuzzy, c-format +#, c-format msgid "%s: error reading version record: %s\n" -msgstr "%s: errore nel controllare la chiave: %s\n" +msgstr "%s: errore durante la lettura del record di versione: %s\n" #: g10/tdbio.c:600 g10/tdbio.c:659 -#, fuzzy, c-format +#, c-format msgid "%s: error writing version record: %s\n" -msgstr "%s: errore nel controllare la chiave: %s\n" +msgstr "%s: errore durante la scrittura del record di versione: %s\n" #: g10/tdbio.c:1132 -#, fuzzy, c-format +#, c-format msgid "trustdb: lseek failed: %s\n" -msgstr "aggiornamento della chiave segreta fallito: %s\n" +msgstr "trustdb: lseek fallita: %s\n" #: g10/tdbio.c:1140 -#, fuzzy, c-format +#, c-format msgid "trustdb: read failed (n=%d): %s\n" -msgstr "aggiornamento del trustdb fallito: %s\n" +msgstr "trustdb: read fallita (n=%d): %s\n" #: g10/tdbio.c:1161 -#, fuzzy, c-format +#, c-format msgid "%s: not a trustdb file\n" -msgstr "aggiornamento del trustdb fallito: %s\n" +msgstr "%s: non Х un file di trustdb\n" #: g10/tdbio.c:1177 #, c-format msgid "%s: version record with recnum %lu\n" -msgstr "" +msgstr "%s: record di versione con recnum %lu\n" #: g10/tdbio.c:1182 -#, fuzzy, c-format +#, c-format msgid "%s: invalid file version %d\n" -msgstr "header della firma in chiaro non valido\n" +msgstr "%s: versione %d del file non valida\n" #: g10/tdbio.c:1471 -#, fuzzy, c-format +#, c-format msgid "%s: error reading free record: %s\n" -msgstr "%s: errore nel controllare la chiave: %s\n" +msgstr "%s: errore durante la lettura del record libero: %s\n" #: g10/tdbio.c:1479 -#, fuzzy, c-format +#, c-format msgid "%s: error writing dir record: %s\n" -msgstr "%s: errore nel controllare la chiave: %s\n" +msgstr "%s: errore durante la scrittura del dir record: %s\n" #: g10/tdbio.c:1489 #, c-format msgid "%s: failed to zero a record: %s\n" -msgstr "" +msgstr "%s: azzeramento di un record fallito: %s\n" #: g10/tdbio.c:1519 #, c-format msgid "%s: failed to append a record: %s\n" -msgstr "" +msgstr "%s: accodatura a un record fallita: %s\n" #: g10/tdbio.c:1630 #, fuzzy -msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n" -msgstr "Il trustdb Х rovinato; per favore esegui \"gpgm --fix-trust-db\".\n" +msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +msgstr "Il trustdb Х danneggiato; eseguire \"gpgm --fix-trust-db\".\n" #: g10/trustdb.c:163 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" -msgstr "" +msgstr "trust record %lu, req type %d: read fallita: %s\n" #: g10/trustdb.c:178 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" -msgstr "" +msgstr "trust record %lu, req type %d: write fallita: %s\n" #: g10/trustdb.c:192 -#, fuzzy, c-format +#, c-format msgid "trust record %lu: delete failed: %s\n" -msgstr "aggiornamento della chiave segreta fallito: %s\n" +msgstr "trust record %lu: delete fallita: %s\n" #: g10/trustdb.c:206 -#, fuzzy, c-format +#, c-format msgid "trustdb: sync failed: %s\n" -msgstr "aggiornamento del trustdb fallito: %s\n" +msgstr "trustdb: sync fallita: %s\n" #: g10/trustdb.c:386 #, c-format msgid "error reading dir record for LID %lu: %s\n" -msgstr "" +msgstr "errore durante la lettura del dir record per il LID %lu: %s\n" #: g10/trustdb.c:393 #, c-format msgid "lid %lu: expected dir record, got type %d\n" -msgstr "" +msgstr "lid %lu: atteso un dir record, trovato uno di tipo %d\n" #: g10/trustdb.c:398 #, c-format msgid "no primary key for LID %lu\n" -msgstr "" +msgstr "manca una chiave primaria per il LID %lu\n" #: g10/trustdb.c:403 -#, fuzzy, c-format +#, c-format msgid "error reading primary key for LID %lu: %s\n" -msgstr "errore nella creazione della passhprase: %s\n" +msgstr "" +"errore durante la lettura della chiave primaria per il\n" +"LID %lu: %s\n" #: g10/trustdb.c:442 -#, fuzzy, c-format +#, c-format msgid "get_dir_record: search_record failed: %s\n" -msgstr "aggiornamento della chiave segreta fallito: %s\n" +msgstr "get_dir_record: search_record fallito: %s\n" #: g10/trustdb.c:510 -#, fuzzy, c-format +#, c-format msgid "NOTE: secret key %08lX is NOT protected.\n" -msgstr "Questa chiave non Х protetta.\n" +msgstr "NOTA: la chiave segreta %08lX NON Х protetta.\n" #: g10/trustdb.c:518 #, c-format @@ -2694,30 +2715,30 @@ msgstr "chiave %08lX: richiesta del record fallita\n" #: g10/trustdb.c:550 -#, fuzzy, c-format +#, c-format msgid "key %08lX: already in trusted key table\n" -msgstr "chiave %08lX: giЮ nella tabella delle chiavi segrete\n" +msgstr "chiave %08lX: giЮ nella tabella delle chiavi affidabili\n" #: g10/trustdb.c:553 -#, fuzzy, c-format +#, c-format msgid "key %08lX: accepted as trusted key.\n" -msgstr "chiave %08lX: accettata come chiave segreta\n" +msgstr "chiave %08lX: accettata come chiave affidabile\n" #: g10/trustdb.c:561 -#, fuzzy, c-format +#, c-format msgid "enumerate secret keys failed: %s\n" -msgstr "enum_secret_keys fallito: %s\n" +msgstr "enumerate secret keys fallito: %s\n" #: g10/trustdb.c:851 -#, fuzzy, c-format +#, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" msgstr "" -"nota: rec di %lu[%d] nella hintlist di %lu ma marcato come verificato\n" +"NOTA: rec di %lu[%d] nella hintlist di %lu ma marcato come verificato\n" #: g10/trustdb.c:855 -#, fuzzy, c-format +#, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n" -msgstr "nota: rec di %lu[%d] nella hintlist di %lu ma non marcato\n" +msgstr "NOTA: rec di %lu[%d] nella hintlist di %lu ma non marcato\n" #. we need the dir record #: g10/trustdb.c:862 @@ -2773,9 +2794,9 @@ msgstr "lid %lu: impossibile ottenere il keyblock: %s\n" #: g10/trustdb.c:1055 g10/trustdb.c:2030 -#, fuzzy, c-format +#, c-format msgid "tdbio_search_dir failed: %s\n" -msgstr "rimozione dell'armatura fallita: %s\n" +msgstr "tdbio_search_dir fallita: %s\n" #: g10/trustdb.c:1210 #, c-format @@ -2813,6 +2834,7 @@ #: g10/trustdb.c:1403 msgid "Valid user ID revocation skipped due to a newer self signature\n" msgstr "" +"Evitata la revoca dell'user ID valida a causa di una autofirma piЫ recente\n" #: g10/trustdb.c:1410 msgid "Valid user ID revocation\n" @@ -2827,23 +2849,20 @@ msgstr "Troppe preferenze" #: g10/trustdb.c:1526 -#, fuzzy msgid "Too many preference items" msgstr "Troppi elementi di preferenza" #: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105 msgid "WARNING: can't yet handle long pref records\n" -msgstr "" +msgstr "ATTENZIONE: non Х ancora possibile gestire record pref lunghi\n" #: g10/trustdb.c:1654 -#, fuzzy msgid "duplicated certificate - deleted" -msgstr "Certificato doppio - cancellato" +msgstr "certificato doppio - cancellato" #: g10/trustdb.c:1692 -#, fuzzy msgid "public key not anymore available" -msgstr "La chiave segreta non Х disponibile." +msgstr "chiave pubblica non piЫ disponibile" #: g10/trustdb.c:1702 g10/trustdb.c:1791 msgid "Invalid certificate revocation" @@ -2856,57 +2875,56 @@ #: g10/trustdb.c:1720 #, c-format msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" -msgstr "" +msgstr "uid %08lX.%lu/%02X%02X: ha shadow dir %lu ma non Х ancora marcato.\n" #: g10/trustdb.c:1734 -#, fuzzy, c-format +#, c-format msgid "sig record %lu[%d] points to wrong record.\n" -msgstr "Il rec di %lu[%d] nella hintlist di %lu non punta a un record dir\n" +msgstr "il sig recor di %lu[%d] punta al record sbagliato.\n" #. that should never happen #: g10/trustdb.c:2007 -#, fuzzy, c-format +#, c-format msgid "insert_trust_record: keyblock not found: %s\n" -msgstr "chiave %08lX: chiave segreta non trovata: %s\n" +msgstr "insert_trust_record: keyblock non trovato: %s\n" #: g10/trustdb.c:2408 msgid "Ooops, no keys\n" -msgstr "" +msgstr "Ooops, mancano le chiavi\n" #: g10/trustdb.c:2412 -#, fuzzy msgid "Ooops, no user ids\n" -msgstr "elenca le chiavi e gli user id" +msgstr "Ooops, mancano gli user id\n" #: g10/trustdb.c:2529 -#, fuzzy, c-format +#, c-format msgid "lid ?: insert failed: %s\n" -msgstr "aggiornamento della chiave segreta fallito: %s\n" +msgstr "lid ?: inserimento fallito: %s\n" #: g10/trustdb.c:2534 -#, fuzzy, c-format +#, c-format msgid "lid %lu: insert failed: %s\n" -msgstr "aggiornamento della chiave segreta fallito: %s\n" +msgstr "lid %lu: inserimento fallito: %s\n" #: g10/trustdb.c:2540 -#, fuzzy, c-format +#, c-format msgid "lid %lu: inserted\n" -msgstr "\\t%lu chiavi inserite\n" +msgstr "lid %lu: inserito\n" #: g10/trustdb.c:2545 g10/trustdb.c:2654 -#, fuzzy, c-format +#, c-format msgid "lid %lu: update failed: %s\n" -msgstr "aggiornamento fallito: %s\n" +msgstr "lid %lu: aggiornamento fallito: %s\n" #: g10/trustdb.c:2551 g10/trustdb.c:2660 -#, fuzzy, c-format +#, c-format msgid "lid %lu: updated\n" -msgstr "\\t%lu chiavi aggiornate\n" +msgstr "lid %lu: aggiornato\n" #: g10/trustdb.c:2556 g10/trustdb.c:2664 -#, fuzzy, c-format +#, c-format msgid "lid %lu: okay\n" -msgstr "lid %lu: manca la chiave primaria\n" +msgstr "lid %lu: corretto\n" #: g10/trustdb.c:2562 g10/trustdb.c:2671 #, c-format @@ -2916,62 +2934,62 @@ #: g10/trustdb.c:2564 g10/trustdb.c:2675 #, c-format msgid "\t%lu keys with errors\n" -msgstr "\\t%lu chiavi con errori\n" +msgstr "\t%lu chiavi con errori\n" #: g10/trustdb.c:2566 g10/trustdb.c:2677 #, c-format msgid "\t%lu keys updated\n" -msgstr "\\t%lu chiavi aggiornate\n" +msgstr "\t%lu chiavi aggiornate\n" #: g10/trustdb.c:2568 #, c-format msgid "\t%lu keys inserted\n" -msgstr "\\t%lu chiavi inserite\n" +msgstr "\t%lu chiavi inserite\n" #: g10/trustdb.c:2571 -#, fuzzy, c-format +#, c-format msgid "enumerate keyblocks failed: %s\n" -msgstr "enum_secret_keys fallito: %s\n" +msgstr "enumerate keyblocks fallito: %s\n" #: g10/trustdb.c:2598 #, c-format msgid "%s: keyblock read problem: %s\n" -msgstr "" +msgstr "%s: il keyblock ha problemi di lettura: %s\n" #: g10/trustdb.c:2612 -#, fuzzy, c-format +#, c-format msgid "%s: update failed: %s\n" -msgstr "aggiornamento fallito: %s\n" +msgstr "%s: aggiornamento fallito: %s\n" #: g10/trustdb.c:2615 -#, fuzzy, c-format +#, c-format msgid "%s: updated\n" -msgstr "\\t%lu chiavi aggiornate\n" +msgstr "%s: aggiornato\n" #: g10/trustdb.c:2617 #, c-format msgid "%s: okay\n" -msgstr "" +msgstr "%s: va bene\n" #: g10/trustdb.c:2632 #, c-format msgid "lid %lu: dir record w/o key - skipped\n" -msgstr "" +msgstr "lid %lu: dir record senza chiave - saltato\n" #: g10/trustdb.c:2645 -#, fuzzy, c-format +#, c-format msgid "lid %lu: keyblock not found: %s\n" -msgstr "chiave %08lX: chiave pubblica non trovata: %s\n" +msgstr "lid %lu: keyblock non trovato: %s\n" #: g10/trustdb.c:2673 #, c-format msgid "\t%lu keys skipped\n" -msgstr "\\t%lu chiavi saltate\n" +msgstr "\t%lu chiavi saltate\n" #: g10/trustdb.c:2743 -#, fuzzy, c-format +#, c-format msgid "check_trust: search dir record failed: %s\n" -msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" +msgstr "check_trust: ricerca del dir record fallita: %s\n" #: g10/trustdb.c:2750 #, c-format @@ -3001,69 +3019,72 @@ msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n" #: g10/trustdb.c:2881 -#, fuzzy, c-format +#, c-format msgid "user '%s' not found: %s\n" -msgstr "%s: utente non trovato\n" +msgstr "utente `%s' non trovato: %s\n" #: g10/trustdb.c:2883 -#, fuzzy, c-format +#, c-format msgid "problem finding '%s' in trustdb: %s\n" -msgstr "inizializzazione del trustdb fallita: %s\n" +msgstr "problema cercando `%s' nel trustdb: %s\n" #: g10/trustdb.c:2886 -#, fuzzy, c-format +#, c-format msgid "user '%s' not in trustdb - inserting\n" -msgstr "aggiornamento del trustdb fallito: %s\n" +msgstr "l'utente `%s' non Х nel trustdb - viene inserito\n" #: g10/trustdb.c:2889 -#, fuzzy, c-format +#, c-format msgid "failed to put '%s' into trustdb: %s\n" -msgstr "inizializzazione del trustdb fallita: %s\n" +msgstr "impossibile mettere `%s' nel trustdb: %s\n" #: g10/ringedit.c:316 -#, fuzzy, c-format +#, c-format msgid "%s: can't create keyring: %s\n" -msgstr "%s: impossibile creare: %s\n" +msgstr "%s: impossibile creare il portachiavi: %s\n" #: g10/ringedit.c:333 g10/ringedit.c:1349 -#, fuzzy, c-format +#, c-format msgid "%s: keyring created\n" -msgstr "%s: creato un nuovo file delle opzioni\n" +msgstr "%s: portachiavi creato\n" #: g10/ringedit.c:1526 msgid "WARNING: 2 files with confidential information exists.\n" -msgstr "" +msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n" #: g10/ringedit.c:1527 -#, fuzzy, c-format +#, c-format msgid "%s is the unchanged one\n" -msgstr "chiavi segrete non cambiate %lu\n" +msgstr "%s Х quello non modificato\n" #: g10/ringedit.c:1528 #, c-format msgid "%s is the new one\n" -msgstr "" +msgstr "%s Х quello nuovo\n" #: g10/ringedit.c:1529 msgid "Please fix this possible security flaw\n" -msgstr "" +msgstr "Per favore risolvete questo possibile problema di sicurezza\n" #: g10/skclist.c:88 g10/skclist.c:125 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" +"la chiave non Х indicata come insicura - impossibile usarla con il RNG " +"finto!\n" #: g10/skclist.c:113 -#, fuzzy, c-format +#, c-format msgid "skipped `%s': %s\n" -msgstr "%s: saltata: %s\n" +msgstr "saltata `%s': %s\n" #: g10/skclist.c:119 -#, fuzzy, c-format +#, c-format msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " "signatures!\n" msgstr "" -"questa Х una chiave ElGamal generata da PGP che NON Х sicura per le firme!\n" +"%s: questa Х una chiave ElGamal generata da PGP che NON Х sicura per\n" +"le firme!\n" #. do not overwrite #: g10/openfile.c:65 @@ -3073,38 +3094,42 @@ #: g10/openfile.c:67 msgid "Overwrite (y/N)? " -msgstr "Sovrascrivo (y/N)? " +msgstr "Sovrascrivo (s/N)? " -#: g10/openfile.c:92 +#: g10/openfile.c:97 +#, c-format +msgid "%s: unknown suffix\n" +msgstr "" + +#: g10/openfile.c:122 msgid "writing to stdout\n" msgstr "scrivo su stdout\n" -#: g10/openfile.c:149 +#: g10/openfile.c:181 #, c-format msgid "assuming signed data in `%s'\n" msgstr "presumo che i dati firmati siano in `%s'\n" -#: g10/openfile.c:199 +#: g10/openfile.c:231 #, c-format msgid "%s: new options file created\n" msgstr "%s: creato un nuovo file delle opzioni\n" #: g10/encr-data.c:66 -#, fuzzy, c-format +#, c-format msgid "%s encrypted data\n" -msgstr "cifra dati" +msgstr "dati cifrati con %s\n" #: g10/encr-data.c:68 #, c-format msgid "encrypted with unknown algorithm %d\n" -msgstr "" +msgstr "cifrato con l'algoritmo sconosciuto %d\n" #: g10/encr-data.c:85 -#, fuzzy msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" -"Attenzione: il messaggio era stato crittografato usando una chiave debole\n" +"ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n" "per il cifrario simmetrico\n" #: g10/seskey.c:52 @@ -3140,9 +3165,8 @@ msgstr "keygen.algo" #: g10/helptext.c:82 -#, fuzzy msgid "keygen.algo.elg_se" -msgstr "keygen.algo" +msgstr "keygen.algo.elg_se" #: g10/helptext.c:89 msgid "keygen.size" @@ -3216,30 +3240,49 @@ msgid "keyedit.remove.subkey.okay" msgstr "keyedit.remove.subkey.okay" -#: g10/helptext.c:175 +#: g10/helptext.c:176 +#, fuzzy +msgid "keyedit.delsig.valid" +msgstr "keyedit.sign_all.okay" + +#: g10/helptext.c:181 +#, fuzzy +msgid "keyedit.delsig.unknown" +msgstr "keyedit.sign_all.okay" + +#: g10/helptext.c:187 +#, fuzzy +msgid "keyedit.delsig.invalid" +msgstr "keyedit.sign_all.okay" + +#: g10/helptext.c:191 +msgid "keyedit.delsig.selfsig" +msgstr "" + +#: g10/helptext.c:200 msgid "passphrase.enter" msgstr "passphrase.enter" -#: g10/helptext.c:182 +#: g10/helptext.c:207 msgid "passphrase.repeat" msgstr "passphrase.repeat" -#: g10/helptext.c:186 +#: g10/helptext.c:211 msgid "detached_signature.filename" msgstr "detached_signature.filename" -#: g10/helptext.c:190 +#: g10/helptext.c:215 msgid "openfile.overwrite.okay" msgstr "openfile.overwrite.okay" -#: g10/helptext.c:204 +#: g10/helptext.c:229 msgid "No help available" -msgstr "Nessun aiuto disponibile" +msgstr "Non Х disponibile un aiuto" -#: g10/helptext.c:216 +#: g10/helptext.c:241 #, c-format msgid "No help available for `%s'" -msgstr "Nessun aiuto disponibile per `%s'" +msgstr "Non Х disponibile un aiuto per `%s'" #~ msgid "can't open file: %s\n" #~ msgstr "impossibile aprire il file: %s\n" @@ -3262,96 +3305,8 @@ #~ msgid "can't write keyring: %s\n" #~ msgstr "impossibile scrivere il portachiavi: %s\n" -#, fuzzy #~ msgid "encrypted message is valid\n" -#~ msgstr "l'algoritmo di digest selezionato non Х valido\n" +#~ msgstr "il messaggio cifrato Х valido\n" -#, fuzzy #~ msgid "Can't check MDC: %s\n" -#~ msgstr "Impossibile controllare la firma: %s\n" - -#~ msgid "Usage: gpgm [options] [files] (-h for help)" -#~ msgstr "Uso: gpgm [opzioni] [file] (-h per l'aiuto)" - -#~ msgid "" -#~ "Syntax: gpgm [options] [files]\n" -#~ "GnuPG maintenance utility\n" -#~ msgstr "" -#~ "Sintassi: gpgm [opzioni] [file]\n" -#~ "Utility di manutenzione di GnuPG\n" - -#~ msgid "usage: gpgm [options] " -#~ msgstr "uso: gpgm [options] " - -#~ msgid "chained sigrec %lu has a wrong owner\n" -#~ msgstr "la chained sigrec %lu ha il proprietario sbagliato\n" - -#, fuzzy -#~ msgid "'%s' is not a valid long keyID\n" -#~ msgstr "Carattere non valido nel commento\n" - -#, fuzzy -#~ msgid "key %08lX: no public key for trusted key - skipped\n" -#~ msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" - -#, fuzzy -#~ msgid "lid %lu: read dir record failed: %s\n" -#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" - -#, fuzzy -#~ msgid "lid %lu: read key record failed: %s\n" -#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" - -#, fuzzy -#~ msgid "lid %lu: read uid record failed: %s\n" -#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" - -#, fuzzy -#~ msgid "lid %lu: read pref record failed: %s\n" -#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" - -#, fuzzy -#~ msgid "lid %lu: read sig record failed: %s\n" -#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" - -#, fuzzy -#~ msgid "user '%s' read problem: %s\n" -#~ msgstr "%s: utente non trovato\n" - -#, fuzzy -#~ msgid "user '%s' list problem: %s\n" -#~ msgstr "%s: utente non trovato\n" - -#, fuzzy -#~ msgid "user '%s' not in trustdb\n" -#~ msgstr "%s: utente non trovato\n" - -#, fuzzy -#~ msgid "error: invalid fingerprint\n" -#~ msgstr "errore nella riga della coda\n" - -#, fuzzy -#~ msgid "error: no ownertrust value\n" -#~ msgstr "esporta i valori di fiducia" - -#, fuzzy -#~ msgid "key not in ring: %s\n" -#~ msgstr "impossibile scrivere il portachiavi: %s\n" - -#, fuzzy -#~ msgid "insert trust record failed: %s\n" -#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" - -#, fuzzy -#~ msgid "error finding dir record: %s\n" -#~ msgstr "rimozione dell'armatura fallita: %s\n" - -#, fuzzy -#~ msgid "Hmmm, public key lost?" -#~ msgstr "chiave pubblica perduta" - -#~ msgid "invalid clear text header: " -#~ msgstr "header del testo in chiaro non valido: " - -#~ msgid "You will see a list of signators etc. here\n" -#~ msgstr "Qui vedrai una lista di firmatari, ecc.\n" +#~ msgstr "Impossibile controllare il MDC: %s\n" diff -urN gnupg-0.9.7/po/pl.po gnupg-0.9.8/po/pl.po --- gnupg-0.9.7/po/pl.po Sun May 23 20:02:49 1999 +++ gnupg-0.9.8/po/pl.po Sat Jun 26 13:07:29 1999 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: gnupg-0.9.2\n" -"POT-Creation-Date: 1999-05-23 15:36+0200\n" -"PO-Revision-Date: 1999-01-26 01:30+01:00\n" +"Project-Id-Version: gnupg-0.9.7\n" +"POT-Creation-Date: 1999-06-26 11:22+0200\n" +"PO-Revision-Date: 1999-05-30 19:08+02:00\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -28,20 +28,29 @@ #: util/secmem.c:249 msgid "operation is not possible without initialized secure memory\n" -msgstr "" +msgstr "operacja niemo©liwa do wykonania bez dostЙpnej pamiЙci bezpiecznej\n" #: util/secmem.c:250 msgid "(you may have used the wrong program for this task)\n" -msgstr "" +msgstr "(prawdopodobnie u©ywany program jest niewЁa╤ciwy dlatego zadania)\n" -#: util/miscutil.c:156 +#: util/miscutil.c:156 util/miscutil.c:173 msgid "yes" msgstr "tak" -#: util/miscutil.c:157 +#: util/miscutil.c:157 util/miscutil.c:175 msgid "yY" msgstr "tT" +#: g10/keyedit.c:559 util/miscutil.c:174 +msgid "quit" +msgstr "wyj╤cie" + +#: util/miscutil.c:176 +#, fuzzy +msgid "qQ" +msgstr "w" + #: util/errors.c:54 msgid "general error" msgstr "bЁ╠d ogСlny" @@ -152,7 +161,7 @@ #: util/errors.c:81 msgid "unimplemented cipher algorithm" -msgstr "algorytm szyfruj╠cy nie jest zaimplementowany." +msgstr "algorytm szyfruj╠cy nie jest zaimplementowany" #: util/errors.c:82 msgid "unknown signature class" @@ -224,16 +233,15 @@ #: util/errors.c:99 msgid "unsupported URI" -msgstr "URI nie obsЁugiwanego typu" +msgstr "URI typu nie obsЁugiwanego" #: util/errors.c:100 msgid "network error" msgstr "bЁ╠d sieci" #: util/errors.c:102 -#, fuzzy msgid "not encrypted" -msgstr "%s zaszyfrowane dane\n" +msgstr "nie zaszyfrowany" #: util/logger.c:218 #, c-format @@ -265,7 +273,7 @@ "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ║ SIй DO \n" "NORMALNEGO U╞YTKU I NIE ZAPEWNIAJ║ BEZPIECZEяSTWA!!\n" -#: cipher/rndlinux.c:110 +#: cipher/rndlinux.c:135 #, c-format msgid "" "\n" @@ -277,7 +285,7 @@ "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:165 +#: g10/g10.c:174 msgid "" "@Commands:\n" " " @@ -285,132 +293,131 @@ "@Polecenia:\n" " " -#: g10/g10.c:167 +#: g10/g10.c:176 msgid "|[file]|make a signature" msgstr "|[plik]|zЁo©enie podpisu" -#: g10/g10.c:168 +#: g10/g10.c:177 msgid "|[file]|make a clear text signature" msgstr "|[plik]|zЁo©enie podpisu na czytelnym dokumencie" -#: g10/g10.c:169 +#: g10/g10.c:178 msgid "make a detached signature" msgstr "sporz╠dzenie podpisu oddzielonego od dokumentu" -#: g10/g10.c:170 +#: g10/g10.c:179 msgid "encrypt data" msgstr "szyfrowanie danych" -#: g10/g10.c:171 +#: g10/g10.c:180 msgid "encryption only with symmetric cipher" msgstr "szyfrowanie tylko szyfrem symetrycznym" -#: g10/g10.c:172 +#: g10/g10.c:181 msgid "store only" msgstr "tylko zapis" -#: g10/g10.c:173 +#: g10/g10.c:182 msgid "decrypt data (default)" msgstr "odszyfrowywanie danych (domy╤lnie)" -#: g10/g10.c:174 +#: g10/g10.c:183 msgid "verify a signature" msgstr "sprawdzenie podpisu" -#: g10/g10.c:175 +#: g10/g10.c:184 msgid "list keys" msgstr "lista kluczy" -#: g10/g10.c:177 +#: g10/g10.c:186 msgid "list keys and signatures" msgstr "lista kluczy i podpisСw" -#: g10/g10.c:178 +#: g10/g10.c:187 msgid "check key signatures" msgstr "sprawdzenie podpisСw kluczy" -#: g10/g10.c:179 +#: g10/g10.c:188 msgid "list keys and fingerprints" msgstr "lista kluczy i ich odciskСw" -#: g10/g10.c:180 +#: g10/g10.c:189 msgid "list secret keys" msgstr "lista kluczy tajnych" -#: g10/g10.c:181 +#: g10/g10.c:190 msgid "generate a new key pair" msgstr "generacja nowej pary klucza" -#: g10/g10.c:182 +#: g10/g10.c:191 msgid "remove key from the public keyring" msgstr "usuniЙcie klucza ze zbioru kluczy publicznych" -#: g10/g10.c:183 +#: g10/g10.c:192 msgid "sign or edit a key" msgstr "podpisanie lub modyfikacja klucza" -#: g10/g10.c:184 +#: g10/g10.c:193 msgid "generate a revocation certificate" msgstr "generacja certyfikatu uniewa©nienia klucza" -#: g10/g10.c:185 +#: g10/g10.c:194 msgid "export keys" msgstr "eksport kluczy do pliku" -#: g10/g10.c:186 +#: g10/g10.c:195 msgid "export keys to a key server" msgstr "eksport kluczy do serwera kluczy" -#: g10/g10.c:187 -#, fuzzy +#: g10/g10.c:196 msgid "import keys from a key server" -msgstr "eksport kluczy do serwera kluczy" +msgstr "import kluczy z serwera kluczy" -#: g10/g10.c:190 +#: g10/g10.c:199 msgid "import/merge keys" -msgstr "doЁ╠czanie klucza do zbioru" +msgstr "import/doЁ╠czenie kluczy" -#: g10/g10.c:192 +#: g10/g10.c:201 msgid "list only the sequence of packets" msgstr "wypisane sekwencji pakietСw" -#: g10/g10.c:194 +#: g10/g10.c:203 msgid "export the ownertrust values" msgstr "eksport warto╤ci zaufania" -#: g10/g10.c:196 +#: g10/g10.c:205 msgid "import ownertrust values" msgstr "wczytanie warto╤Фi zaufania" -#: g10/g10.c:198 +#: g10/g10.c:207 msgid "|[NAMES]|update the trust database" msgstr "|[NAZWY]|naniesienie poprawek do bazy zaufania" -#: g10/g10.c:200 +#: g10/g10.c:209 msgid "|[NAMES]|check the trust database" msgstr "|[NAZWY]|sprawdzenie bazy zaufania" -#: g10/g10.c:201 +#: g10/g10.c:210 msgid "fix a corrupted trust database" msgstr "naprawa uszkodzonej Bazy Zaufania" -#: g10/g10.c:202 +#: g10/g10.c:211 msgid "De-Armor a file or stdin" -msgstr "ZdjЙcie opakowania ASCII pliku lub potoku" +msgstr "zdjЙcie opakowania ASCII pliku lub potoku" -#: g10/g10.c:203 +#: g10/g10.c:212 msgid "En-Armor a file or stdin" -msgstr "Opakowanie ASCII pliku lub potoku" +msgstr "opakowanie ASCII pliku lub potoku" -#: g10/g10.c:204 +#: g10/g10.c:213 msgid "|algo [files]|print message digests" msgstr "|algo [pliki]|skrСty wiadomo╤ci" -#: g10/g10.c:205 +#: g10/g10.c:214 msgid "print all message digests" msgstr "wszystkie skrСty wiadomo╤ci" -#: g10/g10.c:211 +#: g10/g10.c:220 msgid "" "@\n" "Options:\n" @@ -420,150 +427,160 @@ "Opcje:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:222 msgid "create ascii armored output" msgstr "plik wynikowy w opakowaniu ASCII" -#: g10/g10.c:214 -#, fuzzy +#: g10/g10.c:223 msgid "|NAME|encrypt for NAME" -msgstr "|NAZWA|zestaw znakСw terminala NAZWA" +msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA" -#: g10/g10.c:218 +#: g10/g10.c:227 msgid "use this user-id to sign or decrypt" msgstr "identyfikator do podpisania lub odszyfrowania" -#: g10/g10.c:219 +#: g10/g10.c:228 msgid "|N|set compress level N (0 disables)" msgstr "|N|poziom kompresji N (0 - brak)" -#: g10/g10.c:221 +#: g10/g10.c:230 msgid "use canonical text mode" msgstr "kanoniczny format tekstowy" -#: g10/g10.c:222 +#: g10/g10.c:231 msgid "use as output file" msgstr "plik wyj╤ciowy" -#: g10/g10.c:223 +#: g10/g10.c:232 msgid "verbose" msgstr "z informacjami dodatkowymi" -#: g10/g10.c:224 +#: g10/g10.c:233 msgid "be somewhat more quiet" msgstr "mniej komunikatСww" -#: g10/g10.c:225 +#: g10/g10.c:234 +msgid "don't use the terminal at all" +msgstr "" + +#: g10/g10.c:235 msgid "force v3 signatures" msgstr "wymuszenie trzeciej wersji formatu podpisСw" -#: g10/g10.c:226 -#, fuzzy +#: g10/g10.c:236 msgid "always use a MDC for encryption" -msgstr "u©yФ tego identyfikatora do szyfrowania" +msgstr "do szyfrowania bЙdzie u©ywany MDC" -#: g10/g10.c:227 +#: g10/g10.c:237 msgid "do not make any changes" -msgstr "" +msgstr "pozostawienie bez zmian" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:229 +#: g10/g10.c:239 msgid "batch mode: never ask" msgstr "tryb wsadowy: ©adnych pytaЯ" -#: g10/g10.c:230 +#: g10/g10.c:240 msgid "assume yes on most questions" msgstr "automatyczna odpowied╪ tak na wiЙkszo╤Ф pytaЯ" -#: g10/g10.c:231 +#: g10/g10.c:241 msgid "assume no on most questions" msgstr "automatyczna odpowied╪ nie na wiЙkszo╤Ф pytaЯ" -#: g10/g10.c:232 +#: g10/g10.c:242 msgid "add this keyring to the list of keyrings" -msgstr "dodaФ zbiСr kluczy do listy" +msgstr "dodaФ zbiСr kluczy do listy u©ywanych" -#: g10/g10.c:233 +#: g10/g10.c:243 msgid "add this secret keyring to the list" msgstr "dodaФ zbiСr kluczy tajnych do listy" -#: g10/g10.c:234 +#: g10/g10.c:244 msgid "|NAME|use NAME as default secret key" msgstr "|NAZWA|u©ycie NAZWA jako domy╤lnego klucza tajnego" -#: g10/g10.c:235 +#: g10/g10.c:245 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|serwer kluczy w ktСrym bЙd╠ poszukiwane" -#: g10/g10.c:236 +#: g10/g10.c:246 msgid "|NAME|set terminal charset to NAME" msgstr "|NAZWA|zestaw znakСw terminala NAZWA" -#: g10/g10.c:237 +#: g10/g10.c:247 msgid "read options from file" msgstr "wczytanie opcji z pliku" -#: g10/g10.c:239 +#: g10/g10.c:249 msgid "set debugging flags" msgstr "ustawienie opcji ╤ledzenia wykonania programu" -#: g10/g10.c:240 +#: g10/g10.c:250 msgid "enable full debugging" msgstr "umo©liwienie peЁnego ╤ledzenia programu" -#: g10/g10.c:241 +#: g10/g10.c:251 msgid "|FD|write status info to this FD" msgstr "|FD|zapisaФ opis stanu do FD" -#: g10/g10.c:242 +#: g10/g10.c:252 msgid "do not write comment packets" msgstr "nie zapisywaФ pakietСw z komentarzem" -#: g10/g10.c:243 +#: g10/g10.c:253 msgid "(default is 1)" msgstr "(domy╤lnie 1)" -#: g10/g10.c:244 +#: g10/g10.c:254 msgid "(default is 3)" msgstr "(domy╤lnie 3)" -#: g10/g10.c:246 +#: g10/g10.c:256 msgid "|FILE|load extension module FILE" msgstr "|PLIK|Ёadowanie moduЁu rozszerzenia z PLIK" -#: g10/g10.c:247 +#: g10/g10.c:257 msgid "emulate the mode described in RFC1991" msgstr "emulacja trybu opisanego w RFC1991" -#: g10/g10.c:248 +#: g10/g10.c:258 +msgid "set all packet, cipher and digest options to OpenPGP behavior" +msgstr "" + +#: g10/g10.c:259 msgid "|N|use passphrase mode N" msgstr "|N|N-ty tryb wprowadzania wyra©enia przej╤ciowego" -#: g10/g10.c:250 +#: g10/g10.c:261 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|ALG|algorytm obliczania skrСtСw wiadomo╤ci ALG" -#: g10/g10.c:252 +#: g10/g10.c:263 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|ALG|algorytmu szyfruj╠cy ALG dla hasЁa" -#: g10/g10.c:253 +#: g10/g10.c:264 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAZWA|algorytm szyfruj╠cy NAZWA" -#: g10/g10.c:254 +#: g10/g10.c:265 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAZWA|algorytm obliczania skrСtСw wiadomo╤ci NAZWA" -#: g10/g10.c:255 +#: g10/g10.c:266 msgid "|N|use compress algorithm N" msgstr "|N|algorytm kompresji N" -#: g10/g10.c:256 +#: g10/g10.c:267 msgid "throw keyid field of encrypted packets" -msgstr "usuniЙcie identyfikatorСw kluczy pakietСw" +msgstr "usuniЙcie identyfikatorСw kluczy z pakietСw" -#: g10/g10.c:258 +#: g10/g10.c:268 +msgid "|NAME=VALUE|use this notation data" +msgstr "" + +#: g10/g10.c:270 msgid "" "@\n" "Examples:\n" @@ -584,15 +601,15 @@ " --list-keys [nazwy] pokazuje klucze\n" " --fingerprint [nazwy] pokazuje odciski kluczy\n" -#: g10/g10.c:327 +#: g10/g10.c:347 msgid "Please report bugs to .\n" msgstr "BЁЙdy prosimy zgЁaszaФ na adres .\n" -#: g10/g10.c:331 +#: g10/g10.c:351 msgid "Usage: gpg [options] [files] (-h for help)" -msgstr "SposСb u©ycia: gpg [opcje] [pliki] (-h podaje pomoc)" +msgstr "WywoЁanie: gpg [opcje] [pliki] (-h podaje pomoc)" -#: g10/g10.c:334 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -602,7 +619,7 @@ "podpisywanie, sprawdzanie podpisСw, szyfrowanie, deszyfrowanie\n" "domy╤lnie wykonywana operacja zale©y od danych wej╤ciowych\n" -#: g10/g10.c:339 +#: g10/g10.c:359 msgid "" "\n" "Supported algorithms:\n" @@ -610,149 +627,172 @@ "\n" "ObsЁugiwane algorytmy:\n" -#: g10/g10.c:413 +#: g10/g10.c:433 msgid "usage: gpg [options] " -msgstr "sposСb u©ycia: gpg [opcje]" +msgstr "wywoЁanie: gpg [opcje]" -#: g10/g10.c:453 +#: g10/g10.c:473 msgid "conflicting commands\n" msgstr "sprzeczne polecenia\n" -#: g10/g10.c:580 +#: g10/g10.c:605 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "UWAGA: brak domy╤lnego pliku opcji '%s'\n" -#: g10/g10.c:584 +#: g10/g10.c:609 #, c-format msgid "option file `%s': %s\n" msgstr "plik opcji '%s': %s\n" -#: g10/g10.c:591 +#: g10/g10.c:616 #, c-format msgid "reading options from `%s'\n" msgstr "odczyt opcji z '%s'\n" -#: g10/g10.c:737 +#: g10/g10.c:782 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nie jest poprawn╠ nazw╠ zestawu znakСw\n" -#: g10/g10.c:780 g10/g10.c:792 +#: g10/g10.c:827 g10/g10.c:839 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj╠cy jest niepoprawny\n" -#: g10/g10.c:786 g10/g10.c:798 +#: g10/g10.c:833 g10/g10.c:845 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm geenracji skrСtСw wiadomo╤ci jest niepoprawny\n" -#: g10/g10.c:801 +#: g10/g10.c:849 +msgid "the given policy URL is invalid\n" +msgstr "" + +#: g10/g10.c:852 #, 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:803 +#: g10/g10.c:854 msgid "completes-needed must be greater than 0\n" msgstr "warto╤Ф completes-needed musi byФ wiЙksza od 0\n" -#: g10/g10.c:805 +#: g10/g10.c:856 msgid "marginals-needed must be greater than 1\n" msgstr "warto╤Ф marginals-needed musi byФ wiЙksza od 1\n" -#: g10/g10.c:807 +#: g10/g10.c:858 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "warto╤Ф max-cert-depth musi mie╤ciФ siЙ w zakresie od 1 do 255\n" -#: g10/g10.c:810 +#: g10/g10.c:861 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/g10.c:814 +#: g10/g10.c:865 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "Niepoprawny tryb S2K; musi mieФ warto╤Ф 0, 1 lub 3\n" -#: g10/g10.c:891 +#: g10/g10.c:942 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Inicjowanie Bazy Zaufania nie powiodЁo siЙ: %s\n" -#: g10/g10.c:897 +#: g10/g10.c:948 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:904 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:912 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:925 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:938 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:952 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/g10.c:964 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:973 +#: g10/g10.c:1024 msgid "--edit-key username [commands]" msgstr "--edit-key nazwa u©ytkownika [polecenia]" -#: g10/g10.c:987 +#: g10/g10.c:1038 msgid "--delete-secret-key username" msgstr "--delete-secret-key nazwa u©ytkownika" -#: g10/g10.c:990 +#: g10/g10.c:1041 msgid "--delete-key username" msgstr "--delete-key nazwa u©ytkownika" -#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311 +#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "nie mogЙ otworzyФ %s: %s\n" -#: g10/g10.c:1024 +#: g10/g10.c:1075 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiСr kluczy]" -#: g10/g10.c:1083 +#: g10/g10.c:1134 #, c-format msgid "dearmoring failed: %s\n" -msgstr "UsuniЙcie opakowania ASCII nie powiodЁo siЙ: %s\n" +msgstr "usuniЙcie opakowania ASCII nie powiodЁo siЙ: %s\n" -#: g10/g10.c:1091 +#: g10/g10.c:1142 #, c-format msgid "enarmoring failed: %s\n" -msgstr "Opakowywanie ASCII nie powiodЁo siЙ: %s\n" +msgstr "opakowywanie ASCII nie powiodЁo siЙ: %s\n" -#: g10/g10.c:1157 +#: g10/g10.c:1208 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niewЁa╤ciwy algorytm skrСtu '%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1283 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:1236 +#: g10/g10.c:1287 msgid "Go ahead and type your message ...\n" msgstr "Wpisz tutaj swoj╠ wiadomo╤Ф ...\n" -#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "nie mogЙ otworzyФ '%s'\n" +#: g10/g10.c:1457 +msgid "" +"the first character of a notation name must be a letter or an underscore\n" +msgstr "" + +#: g10/g10.c:1463 +msgid "" +"a notation name must have only letters, digits, dots or underscores and end " +"with an '='\n" +msgstr "" + +#: g10/g10.c:1469 +msgid "dots in a notation name must be surrounded by other characters\n" +msgstr "" + +#: g10/g10.c:1477 +msgid "a notation value must not use any control characters\n" +msgstr "" + #: g10/armor.c:296 #, c-format msgid "armor: %s\n" @@ -760,7 +800,7 @@ #: g10/armor.c:319 msgid "invalid armor header: " -msgstr "Niepoprawny nagЁСwek opakowania: " +msgstr "niepoprawny nagЁСwek opakowania: " #: g10/armor.c:326 msgid "armor header: " @@ -925,9 +965,9 @@ msgstr "U©yФ tego klucza pomimo to? " #: g10/pkclist.c:291 -#, fuzzy, c-format +#, c-format msgid "key %08lX: subkey has been revoked!\n" -msgstr "klucz %08lX: klucz zostaЁ uniewa©niony!\n" +msgstr "klucz %08lX: podklucz zostaЁ uniewa©niony!\n" #: g10/pkclist.c:321 #, c-format @@ -942,7 +982,7 @@ #: g10/pkclist.c:341 #, c-format msgid "%08lX: We do NOT trust this key\n" -msgstr "%08lX: OSTRZE╞ENIE: Nie ufamy temu kluczowi!\n" +msgstr "%08lX: NIE UFAMY temu kluczowi\n" #: g10/pkclist.c:347 #, c-format @@ -986,9 +1026,8 @@ msgstr " To mo©e oznaczaФ ©e podpis jest faЁszerstwem.\n" #: g10/pkclist.c:459 -#, fuzzy msgid "WARNING: This subkey has been revoked by its owner!\n" -msgstr "OSTRZE╞ENIE: Ten klucz zostaЁ uniewa©niony przez wЁa╤ciciela!\n" +msgstr "OSTRZE╞ENIE: Ten podklucz zostaЁ uniewa©niony przez wЁa╤ciciela!\n" #: g10/pkclist.c:480 msgid "Note: This key has expired!\n" @@ -1006,7 +1045,7 @@ #: g10/pkclist.c:505 msgid "WARNING: We do NOT trust this key!\n" -msgstr "OSTRZE╞ENIE: Nie ufamy temu kluczowi!\n" +msgstr "OSTRZE╞ENIE: NIE UFAMY temu kluczowi!\n" #: g10/pkclist.c:506 msgid " The signature is probably a FORGERY.\n" @@ -1024,12 +1063,17 @@ msgstr "" " Nie ma pewno╤ci ©e ten podpis zostaЁ zЁo©nony przez wЁa╤ciciela.\n" -#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673 +#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: pominiЙty: %s\n" -#: g10/pkclist.c:591 +#: g10/pkclist.c:588 g10/pkclist.c:687 +#, fuzzy, c-format +msgid "%s: skipped: public key already present\n" +msgstr "%s: problem przy odczycie bloku klucza: %s\n" + +#: g10/pkclist.c:611 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1037,20 +1081,20 @@ "Nie podaЁe╤ identyfikatora u©ytkownika (user ID). \n" "Mo©na to zrobiФ za pomoc╠ opcji \"-r\".\n" -#: g10/pkclist.c:596 +#: g10/pkclist.c:616 msgid "Enter the user ID: " msgstr "Wprowad╪ identyfikator u©ytkownika (user ID): " -#: g10/pkclist.c:607 +#: g10/pkclist.c:627 msgid "No such user ID.\n" msgstr "Brak takiego identyfikatora u©ytkownika.\n" -#: g10/pkclist.c:653 +#: g10/pkclist.c:673 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: bЁ╠d podczas sprawdzania klucza: %s\n" -#: g10/pkclist.c:679 +#: g10/pkclist.c:711 msgid "no valid addressees\n" msgstr "brak poprawnych adresСw\n" @@ -1138,16 +1182,16 @@ #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. #: g10/keygen.c:466 -#, fuzzy, c-format +#, c-format msgid "keysize too large; %d is largest value allowed.\n" -msgstr "DЁugo╤Ф klucza zbyt maЁa; minimalna dopuszczona wynosi 768 bitСw.\n" +msgstr "zbyt du©y rozmiar klucza, ograniczenie wynosi %d.\n" #: g10/keygen.c:471 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" msgstr "" -"Klucze dЁu©sze ni© 2048 bitСw s╠ odradzane poniewa© obliczenia\n" +"Klucze dЁu©sze ni© 2048 bitСw s╠ odradzane, poniewa© obliczenia\n" "trwaj╠ wtedy BARDZO dЁugo!\n" #: g10/keygen.c:474 @@ -1265,7 +1309,7 @@ #: g10/keygen.c:669 #, c-format msgid "You are using the `%s' character set.\n" -msgstr "" +msgstr "U©ywasz zestawu znakСw %s.\n" #: g10/keygen.c:675 #, c-format @@ -1295,7 +1339,7 @@ msgstr "" "Musisz podaФ wyra©enie przej╤ciowe (hasЁo) aby ochroniФ swСj klucz tajny.\n" -#: g10/keyedit.c:433 g10/keygen.c:748 +#: g10/keyedit.c:455 g10/keygen.c:748 msgid "passphrase not correctly repeated; try again.\n" msgstr "" "PowtСrzone wyra©enie przej╤ciowe nie zgadza siЙ z podanym w pierwszej " @@ -1315,20 +1359,18 @@ "\n" #: g10/keygen.c:775 -#, fuzzy msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" "disks) during the prime generation; this gives the random number\n" "generator a better chance to gain enough entropy.\n" msgstr "" -"Program musi wygenerowaФ du©o losowych bajtСw. Dobrze by byЁo, zmusiФ " -"komputer\n" -"do rСwnolegЁej pracy nad czym╤ innym (w innym oknie, wykonaФ jakie╤ ruchy\n" -"myszk╠, u©yФ sieci albo odwoЁaФ siЙ do dysku) podczas generacji liczb\n" -"pierwszych; to daje komputerowi szansЙ zebrania dostatecznej ilo╤ci " -"entropii\n" -"do zasilenia generatora liczb losowych.\n" +"Musimy wygenerowaФ du©o losowych bajtСw. Dobrym pomysЁem podczas " +"generowania\n" +"liczb pierszych jest wykonanywanie w tym czasie innych dziaЁaЯ (pisanie na\n" +"klawiaturzeze, poruszanie myszk╠, odwoЁanie siЙ do dyskСw); dziЙki temu\n" +"generator liczb losowych ma mo©liwo╤Ф zebrania odpowiedniej ilo╤ci " +"entropii.\n" #: g10/keygen.c:845 msgid "Key generation can only be used in interactive mode\n" @@ -1339,7 +1381,8 @@ msgstr "Para kluczy dla DSA bЙdzie miaЁa 1024 bity dЁugo╤ci.\n" #: g10/keygen.c:859 -msgid "Key generation cancelled.\n" +#, fuzzy +msgid "Key generation canceled.\n" msgstr "Procedura generacji klucza zostaЁa anulowana.\n" #: g10/keygen.c:869 @@ -1369,7 +1412,7 @@ msgid "Key generation failed: %s\n" msgstr "Generacja klucza nie powiodЁa siЙ: %s\n" -#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52 +#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1377,7 +1420,7 @@ "klucz zostaЁ stworzony %lu sekundЙ w przyszЁo╤ci (zaburzenia\n" "czasoprzestrzeni, lub ╪le ustawiony zegar systemowy)\n" -#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54 +#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1389,7 +1432,7 @@ msgid "Really create? " msgstr "Na pewno generowaФ? " -#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467 +#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467 #: g10/tdbio.c:528 #, c-format msgid "%s: can't open: %s\n" @@ -1410,7 +1453,7 @@ msgid "reading from `%s'\n" msgstr "odczyt z '%s'\n" -#: g10/encode.c:417 +#: g10/encode.c:431 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s zaszyfrowany dla: %s\n" @@ -1448,9 +1491,9 @@ msgstr "u©ywany jest podklucz %08lX zamiast klucza gЁСwnego %08lX\n" #: g10/import.c:116 -#, fuzzy, c-format +#, c-format msgid "can't open `%s': %s\n" -msgstr "nie mogЙ otworzyФ %s: %s\n" +msgstr "nie mo©na otworzyФ %s: %s\n" #: g10/import.c:160 #, c-format @@ -1463,9 +1506,9 @@ msgstr "%lu kluczy przetworzonych do tej chwili\n" #: g10/import.c:172 -#, fuzzy, c-format +#, c-format msgid "error reading `%s': %s\n" -msgstr "bЁ╠d odczytu rekordu podpisu: %s\n" +msgstr "bЁ╠d odczytu '%s': %s\n" #: g10/import.c:175 #, c-format @@ -1545,20 +1588,20 @@ msgid "no default public keyring\n" msgstr "brak domy╤lnego zbioru kluczy publicznych\n" -#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501 +#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "zapis do '%s'\n" -#: g10/import.c:379 g10/import.c:435 -#, fuzzy -msgid "can't lock keyring `%': %s\n" -msgstr "nie mogЙ zablokowaФ zbioru kluczy publicznych: %s\n" +#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#, c-format +msgid "can't lock keyring `%s': %s\n" +msgstr "nie mo©na zablokowaФ zbioru kluczy publicznych '%s': %s\n" -#: g10/import.c:382 -#, fuzzy -msgid "error writing keyring `%': %s\n" -msgstr "%s: bЁ╠d zapisu numeru wersji: %s\n" +#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648 +#, c-format +msgid "error writing keyring `%s': %s\n" +msgstr "bЁ╠d zapisu zbioru kluczy '%s': %s\n" #: g10/import.c:387 #, c-format @@ -1580,11 +1623,6 @@ 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:438 g10/import.c:547 g10/import.c:648 -#, fuzzy, c-format -msgid "error writing keyring `%s': %s\n" -msgstr "%s: bЁ╠d zapisu numeru wersji: %s\n" - #: g10/import.c:444 #, c-format msgid "key %08lX: 1 new user-id\n" @@ -1620,11 +1658,6 @@ msgid "key %08lX: not changed\n" msgstr "klucz %08lX: bez zmian\n" -#: g10/import.c:544 g10/import.c:645 -#, fuzzy, c-format -msgid "can't lock keyring `%s': %s\n" -msgstr "nie mogЙ zablokowaФ zbioru kluczy publicznych: %s\n" - #: g10/import.c:552 #, c-format msgid "key %08lX: secret key imported\n" @@ -1701,11 +1734,9 @@ #. * the secret key used to create this signature - it #. * seems that this makes sense #: g10/import.c:798 -#, fuzzy, c-format +#, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" -msgstr "" -"klucz %08lX: certyfikat uniewa©nienia umieszczony w niewЁa╤ciwym \n" -"miejscu - zostaЁ pominiЙty\n" +msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pominiЙty\n" #: g10/import.c:807 #, c-format @@ -1722,7 +1753,7 @@ #: g10/import.c:915 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "" +msgstr "key %08lX: powtСrzony identyfikator u©ytkownika - doЁ╠czony\n" #: g10/import.c:966 #, c-format @@ -1734,51 +1765,51 @@ msgid "key %08lX: our copy has no self-signature\n" msgstr "klucz %08lX: dostЙpna kopia nie jest podpisana ni╠ sam╠\n" -#: g10/keyedit.c:91 +#: g10/keyedit.c:92 #, c-format msgid "%s: user not found\n" msgstr "%s: nie znaleziono u©ytkownika\n" -#: g10/keyedit.c:177 +#: g10/keyedit.c:153 msgid "[revocation]" -msgstr "" +msgstr "[uniewa©nienie]" -#: g10/keyedit.c:178 +#: g10/keyedit.c:154 msgid "[self-signature]" msgstr "[podpis klucza nim samym]" -#: g10/keyedit.c:196 +#: g10/keyedit.c:218 msgid "1 bad signature\n" msgstr "1 niepoprawny podpis\n" -#: g10/keyedit.c:198 +#: g10/keyedit.c:220 #, c-format msgid "%d bad signatures\n" msgstr "%d niepoprawnych podpisСw\n" -#: g10/keyedit.c:200 +#: g10/keyedit.c:222 msgid "1 signature not checked due to a missing key\n" msgstr "1 podpis nie zostaЁ sprawdzony z powodu braku klucza\n" -#: g10/keyedit.c:202 +#: g10/keyedit.c:224 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d podpisСw nie zostaЁo sprawdzonych z powodu braku kluczy\n" -#: g10/keyedit.c:204 +#: g10/keyedit.c:226 msgid "1 signature not checked due to an error\n" msgstr "1 podpis nie zostaЁ sprawdzony z powodu bЁЙdu\n" -#: g10/keyedit.c:206 +#: g10/keyedit.c:228 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d podpisСw nie sprawdzonych z powodu bЁЙdСw\n" -#: g10/keyedit.c:208 +#: g10/keyedit.c:230 msgid "1 user id without valid self-signature detected\n" msgstr "wykryto 1 identyfikator u©ytkownika bez podpisu wЁa╤ciciela klucza\n" -#: g10/keyedit.c:210 +#: g10/keyedit.c:232 #, c-format msgid "%d user ids without valid self-signatures detected\n" msgstr "" @@ -1786,17 +1817,17 @@ #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. -#: g10/keyedit.c:290 +#: g10/keyedit.c:312 #, c-format msgid "Already signed by key %08lX\n" msgstr "Ju© podpisano kluczem %08lX.\n" -#: g10/keyedit.c:298 +#: g10/keyedit.c:320 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nie ma nic do podpisania kluczem %08lX.\n" -#: g10/keyedit.c:307 +#: g10/keyedit.c:329 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -1804,35 +1835,37 @@ "Czy jeste╤ naprawdЙ pewien ©e chcesz podpisaФ ten klucz \n" "swoim kluczem: \"" -#: g10/keyedit.c:316 +#: g10/keyedit.c:338 msgid "" "The signature will be marked as non-exportable.\n" "\n" msgstr "" +"Podpis zostanie oznaczony jako nieeksportowalny.\n" +"\n" -#: g10/keyedit.c:321 +#: g10/keyedit.c:343 msgid "Really sign? " msgstr "Na pewno podpisaФ? " -#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75 +#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" -msgstr "podpisywanie nie powiodЁo siЙ: %s\n" +msgstr "zЁo©enie podpisu nie powiodЁo siЙ: %s\n" -#: g10/keyedit.c:400 +#: g10/keyedit.c:422 msgid "This key is not protected.\n" msgstr "Ten klucz nie jest chroniony.\n" -#: g10/keyedit.c:403 +#: g10/keyedit.c:425 msgid "Key is protected.\n" msgstr "Klucz jest chroniony.\n" -#: g10/keyedit.c:420 +#: g10/keyedit.c:442 #, c-format msgid "Can't edit this key: %s\n" msgstr "Tego klucza nie mo©na edytowaФ: %s.\n" -#: g10/keyedit.c:425 +#: g10/keyedit.c:447 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -1840,381 +1873,412 @@ "Wprowad╪ nowe wyra©enie przej╤ciowe (hasЁo) dla tego klucza tajnego.\n" "\n" -#: g10/keyedit.c:437 +#: g10/keyedit.c:459 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" -"Nie chcesz podaФ wyra©enia przej╤ciowego (hasЁa) - to zЁy pomysЁ!\n" +"Nie chcesz podaФ wyra©enia przej╤ciowego (hasЁa) - to *zЁy* pomysЁ!\n" "\n" -#: g10/keyedit.c:440 +#: g10/keyedit.c:462 msgid "Do you really want to do this? " msgstr "Czy na pewno chcesz to zrobiФ? " -#: g10/keyedit.c:501 +#: g10/keyedit.c:523 msgid "moving a key signature to the correct place\n" msgstr "przenoszЙ podpis klucza na wЁa╤ciwe miejsce\n" -#: g10/keyedit.c:537 -msgid "quit" -msgstr "wyj╤cie" - -#: g10/keyedit.c:537 +#: g10/keyedit.c:559 msgid "quit this menu" msgstr "wyj╤cie z tego menu" -#: g10/keyedit.c:538 +#: g10/keyedit.c:560 msgid "q" msgstr "w" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save" msgstr "zapis" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save and quit" msgstr "zapis zmian i wyj╤cie" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "help" msgstr "pomoc" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "show this help" msgstr "ten tekst pomocy" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "fpr" msgstr "odc" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "show fingerprint" msgstr "okazanie odcisku klucza" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list" msgstr "lista" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list key and user ids" msgstr "lista kluczy i identyfikatorСw u©ytkownikСw" -#: g10/keyedit.c:544 +#: g10/keyedit.c:566 msgid "l" msgstr "l" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "uid" msgstr "id" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "select user id N" msgstr "wybСr identyfikatora u©ytkownika N" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "key" msgstr "klucz" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "select secondary key N" msgstr "wybСr podklucza N" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "check" msgstr "lista" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "list signatures" msgstr "lista podpisСw" -#: g10/keyedit.c:548 +#: g10/keyedit.c:570 msgid "c" msgstr "l" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign" msgstr "podpis" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign the key" msgstr "zЁo©enie podpisu na kluczu" -#: g10/keyedit.c:550 +#: g10/keyedit.c:572 msgid "s" msgstr "p" -#: g10/keyedit.c:551 -#, fuzzy +#: g10/keyedit.c:573 msgid "lsign" -msgstr "podpis" +msgstr "lpodpis" -#: g10/keyedit.c:551 -#, fuzzy +#: g10/keyedit.c:573 msgid "sign the key locally" -msgstr "zЁo©enie podpisu na kluczu" +msgstr "zЁo©enie lokalnego podpisu na kluczu" -#: g10/keyedit.c:552 +#: g10/keyedit.c:574 msgid "debug" msgstr "╤ledzenia" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "adduid" msgstr "dodid" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "add a user id" msgstr "dodanie nowego identyfikatora u©ytkownika do klucza" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "deluid" msgstr "usid" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "delete user id" msgstr "usuniЙcie identyfikatora u©ytkownika z klucza" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "addkey" msgstr "dodkl" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "add a secondary key" msgstr "dodanie podklucza" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delkey" msgstr "uskl" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delete a secondary key" msgstr "usuniЙcie podklucza" -#: g10/keyedit.c:557 +#: g10/keyedit.c:579 +#, fuzzy +msgid "delsig" +msgstr "lpodpis" + +#: g10/keyedit.c:579 +#, fuzzy +msgid "delete signatures" +msgstr "lista podpisСw" + +#: g10/keyedit.c:580 msgid "expire" msgstr "data" -#: g10/keyedit.c:557 +#: g10/keyedit.c:580 msgid "change the expire date" msgstr "zmiana daty wa©no╤ci klucza" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle" msgstr "przeЁ" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle between secret and public key listing" msgstr "przeЁ╠czenie pomiЙdzy list╠ kluczy publicznych i tajnych" -#: g10/keyedit.c:560 +#: g10/keyedit.c:583 msgid "t" msgstr "p" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "pref" msgstr "opcje" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "list preferences" msgstr "lista opcji" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "passwd" msgstr "hasЁo" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "change the passphrase" msgstr "zmiana wyra©enia przej╤ciowego (hasЁa)" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "trust" msgstr "zaufanie" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "change the ownertrust" msgstr "zmiana zaufania wЁa╤ciciela" -#: g10/keyedit.c:564 -#, fuzzy +#: g10/keyedit.c:587 msgid "revsig" -msgstr "podpis" +msgstr "unpod" -#: g10/keyedit.c:564 -#, fuzzy +#: g10/keyedit.c:587 msgid "revoke signatures" -msgstr "wymuszenie trzeciej wersji formatu podpisСw" +msgstr "uniewa©nienie podpisu" -#: g10/keyedit.c:565 -#, fuzzy +#: g10/keyedit.c:588 msgid "revkey" -msgstr "klucz" +msgstr "unpkl" -#: g10/keyedit.c:565 -#, fuzzy +#: g10/keyedit.c:588 msgid "revoke a secondary key" -msgstr "usuniЙcie podklucza" +msgstr "uniewa©nienie podklucza" -#: g10/keyedit.c:584 +#: g10/keyedit.c:607 msgid "can't do that in batchmode\n" -msgstr "operacja niemo©liwa do wykonania w trybie wsadowym\n" +msgstr "nie dziaЁa w trybie wsadowym\n" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:613 +#: g10/keyedit.c:636 msgid "Secret key is available.\n" msgstr "DostЙpny jest klucz tajny.\n" -#: g10/keyedit.c:642 +#: g10/keyedit.c:665 msgid "Command> " msgstr "Polecenie> " -#: g10/keyedit.c:669 +#: g10/keyedit.c:692 msgid "Need the secret key to do this.\n" msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n" -#: g10/keyedit.c:691 +#: g10/keyedit.c:714 msgid "Save changes? " msgstr "ZapisaФ zmiany? " -#: g10/keyedit.c:694 +#: g10/keyedit.c:717 msgid "Quit without saving? " msgstr "Wyj╤Ф bez zapisania zmian? " -#: g10/keyedit.c:704 +#: g10/keyedit.c:727 #, c-format msgid "update failed: %s\n" msgstr "naniesienie poprawek nie powiodЁo siЙ: %s\n" -#: g10/keyedit.c:711 +#: g10/keyedit.c:734 #, c-format msgid "update secret failed: %s\n" msgstr "naniesienie poprawek na kluczu tajnym nie powiodЁo siЙ: %s\n" -#: g10/keyedit.c:718 +#: g10/keyedit.c:741 msgid "Key not changed so no update needed.\n" msgstr "" "Klucz nie zostaЁ zmieniony wiЙc nanoszenie poprawek nie jest konieczne.\n" -#: g10/keyedit.c:721 g10/keyedit.c:780 +#: g10/keyedit.c:744 g10/keyedit.c:803 #, c-format msgid "update of trustdb failed: %s\n" msgstr "naniesienie poprawek bazy zaufania nie powiodЁo siЙ: %s\n" -#: g10/keyedit.c:754 +#: g10/keyedit.c:777 msgid "Really sign all user ids? " msgstr "PodpisaФ wszystkie identyfikatory u©ytkownika na tym kluczu? " -#: g10/keyedit.c:755 +#: g10/keyedit.c:778 msgid "Hint: Select the user ids to sign\n" msgstr "Podpowied╪: wybierz identyfikatory u©ytkownika do podpisania.\n" -#: g10/keyedit.c:791 +#: g10/keyedit.c:814 g10/keyedit.c:835 msgid "You must select at least one user id.\n" msgstr "Musisz wybraФ co najmniej jeden identyfikator u©ytkownika.\n" -#: g10/keyedit.c:793 +#: g10/keyedit.c:816 msgid "You can't delete the last user id!\n" msgstr "Nie mo©esz usun╠Ф ostatniego identyfikatora u©ytkownika!\n" -#: g10/keyedit.c:796 +#: g10/keyedit.c:819 msgid "Really remove all selected user ids? " msgstr "Czy na pewno usun╠Ф wszystkie wybrane identyfikatory u©ytkownika? " -#: g10/keyedit.c:797 +#: g10/keyedit.c:820 msgid "Really remove this user id? " msgstr "Czy na pewno usun╠Ф ten identyfikator u©ytkownika? " -#: g10/keyedit.c:820 g10/keyedit.c:842 +#: g10/keyedit.c:858 g10/keyedit.c:880 msgid "You must select at least one key.\n" msgstr "Musisz wybraФ co najmniej jeden klucz.\n" -#: g10/keyedit.c:824 +#: g10/keyedit.c:862 msgid "Do you really want to delete the selected keys? " msgstr "Czy na pewno chcesz usun╠Ф wybrane klucze? " -#: g10/keyedit.c:825 +#: g10/keyedit.c:863 msgid "Do you really want to delete this key? " msgstr "Czy na pewno chcesz usun╠Ф ten klucz? " -#: g10/keyedit.c:846 -#, fuzzy +#: g10/keyedit.c:884 msgid "Do you really want to revoke the selected keys? " -msgstr "Czy na pewno chcesz usun╠Ф wybrane klucze? " +msgstr "Czy na pewno chcesz uniewa©niФ wybrane klucze? " -#: g10/keyedit.c:847 -#, fuzzy +#: g10/keyedit.c:885 msgid "Do you really want to revoke this key? " -msgstr "Czy na pewno chcesz usun╠Ф ten klucz? " +msgstr "Czy na pewno chcesz uniewa©niФ ten klucz? " -#: g10/keyedit.c:901 +#: g10/keyedit.c:939 msgid "Invalid command (try \"help\")\n" msgstr "Niepoprawna komenda (sprСbuj \"help\")\n" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 +msgid "Delete this good signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1298 +msgid "Delete this invalid signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1302 +#, fuzzy +msgid "Delete this unknown signature? (y/N/q)" +msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)" + +#: g10/keyedit.c:1308 +#, fuzzy +msgid "Really delete this self-signature? (y/N)" +msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)" + +#: g10/keyedit.c:1322 +#, fuzzy, c-format +msgid "Deleted %d signature.\n" +msgstr "%d niepoprawnych podpisСw\n" + +#: g10/keyedit.c:1323 +#, fuzzy, c-format +msgid "Deleted %d signatures.\n" +msgstr "%d niepoprawnych podpisСw\n" + +#: g10/keyedit.c:1326 +#, fuzzy +msgid "Nothing deleted.\n" +msgstr "OSTRZE╞ENIE: nic nie zostaЁo wyeksportowane!\n" + +#: g10/keyedit.c:1395 msgid "Please remove selections from the secret keys.\n" msgstr "ProszЙ usun╠Ф znacznik wyboru z kluczy tajnych.\n" -#: g10/keyedit.c:1299 +#: g10/keyedit.c:1401 msgid "Please select at most one secondary key.\n" msgstr "ProszЙ wybraФ najwy©ej jeden podklucz.\n" -#: g10/keyedit.c:1303 -msgid "Changing exiration time for a secondary key.\n" +#: g10/keyedit.c:1405 +#, fuzzy +msgid "Changing expiration time for a secondary key.\n" msgstr "Zmiana daty wa©no╤ci podklucza.\n" -#: g10/keyedit.c:1305 -msgid "Changing exiration time for the primary key.\n" +#: g10/keyedit.c:1407 +#, fuzzy +msgid "Changing expiration time for the primary key.\n" msgstr "Zmiana daty wa©no╤ci gЁСwnego klucza.\n" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1448 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nie mo©na zmieniФ daty wa©no╤ci klucza w wersji 3.\n" -#: g10/keyedit.c:1362 +#: g10/keyedit.c:1464 msgid "No corresponding signature in secret ring\n" msgstr "Brak odpowiadaj╠cego podpisu w zbiorze kluczy tajnych\n" -#: g10/keyedit.c:1422 +#: g10/keyedit.c:1524 #, c-format msgid "No user id with index %d\n" msgstr "Brak identyfikatora u©ytkownika o numerze %d.\n" -#: g10/keyedit.c:1468 +#: g10/keyedit.c:1570 #, c-format msgid "No secondary key with index %d\n" msgstr "Brak podklucza o indeksie %d\n" -#: g10/keyedit.c:1566 -#, fuzzy +#: g10/keyedit.c:1668 msgid "user ID: \"" -msgstr "Wprowad╪ identyfikator u©ytkownika (user ID): " +msgstr "Identyfikator u©ytkownika: " -#: g10/keyedit.c:1569 -#, fuzzy, c-format +#: g10/keyedit.c:1671 +#, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" -msgstr "Nie ma nic do podpisania kluczem %08lX.\n" +msgstr "" +"\"\n" +"podpisano Twoim kluczem %08lX w %s\n" -#: g10/keyedit.c:1573 -#, fuzzy +#: g10/keyedit.c:1675 msgid "Create a revocation certificate for this signature? (y/N)" -msgstr "generacja certyfikatu uniewa©nienia klucza" +msgstr "StworzyФ certyfikat uniewa©nienia tego podpisu? (t/N)" -#: g10/keyedit.c:1653 -#, fuzzy +#: g10/keyedit.c:1755 msgid "Really create the revocation certificates? (y/N)" -msgstr "generacja certyfikatu uniewa©nienia klucza" +msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)" -#: g10/keyedit.c:1676 -#, fuzzy +#: g10/keyedit.c:1778 msgid "no secret key\n" -msgstr "niepoprawny klucz prywatny" +msgstr "brak klucza prywatnego\n" #: g10/mainproc.c:184 -#, fuzzy, c-format +#, c-format msgid "public key is %08lX\n" -msgstr "klucz publiczny nie odnaleziony" +msgstr "klucz publiczny %08lX\n" #: g10/mainproc.c:212 msgid "public key encrypted data: good DEK\n" @@ -2235,7 +2299,7 @@ #: g10/mainproc.c:252 msgid "WARNING: encrypted message has been manipulated!\n" -msgstr "" +msgstr "OSTRZE╞ENIE: zaszyfrowana wiadomo╤Ф byЁa manipulowana!\n" #: g10/mainproc.c:257 #, c-format @@ -2251,11 +2315,24 @@ msgid "original file name='%.*s'\n" msgstr "pierwotna nazwa pliku='%.*s'\n" -#: g10/mainproc.c:890 +#: g10/mainproc.c:505 g10/mainproc.c:514 +#, fuzzy +msgid "WARNING: invalid notation data found\n" +msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n" + +#: g10/mainproc.c:517 +msgid "Notation: " +msgstr "" + +#: g10/mainproc.c:524 +msgid "Policy: " +msgstr "" + +#: g10/mainproc.c:929 msgid "signature verification suppressed\n" msgstr "wymuszono pominiЙcie sprawdzenia podpisu\n" -#: g10/mainproc.c:896 +#: g10/mainproc.c:935 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" @@ -2263,29 +2340,28 @@ "z u©yciem klucza o identyfikatorze %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:922 g10/mainproc.c:933 +#: g10/mainproc.c:961 g10/mainproc.c:972 msgid "BAD signature from \"" msgstr "NIEPOPRAWNY podpis zЁo©ony przez \"" -#: g10/mainproc.c:923 g10/mainproc.c:934 +#: g10/mainproc.c:962 g10/mainproc.c:973 msgid "Good signature from \"" msgstr "Poprawny podpis zЁo©ony przez \"" -#: g10/mainproc.c:925 -#, fuzzy +#: g10/mainproc.c:964 msgid " aka \"" -msgstr " doЁ╠czono do zbioru: %lu" +msgstr " alias \"" -#: g10/mainproc.c:975 +#: g10/mainproc.c:1015 #, c-format msgid "Can't check signature: %s\n" msgstr "Nie mogЙ sprawdziФ podpisu: %s\n" -#: g10/mainproc.c:1056 +#: g10/mainproc.c:1109 msgid "old style (PGP 2.x) signature\n" msgstr "podpis starego typu (PGP 2.x)\n" -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1114 msgid "invalid root packet detected in proc_tree()\n" msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n" @@ -2321,7 +2397,7 @@ msgid "can't handle public key algorithm %d\n" msgstr "algorytm klucza publicznego niemo©liwy do obsЁu©enia: %d\n" -#: g10/parse-packet.c:872 +#: g10/parse-packet.c:931 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n" @@ -2346,11 +2422,11 @@ msgid " (main key ID %08lX)" msgstr " (gЁСwny ID klucza %08lX)" -#: g10/passphrase.c:190 +#: g10/passphrase.c:192 msgid "Enter passphrase: " msgstr "Wyra©enie przej╤ciowe: " -#: g10/passphrase.c:194 +#: g10/passphrase.c:196 msgid "Repeat passphrase: " msgstr "PowtСrzone wyra©enie przej╤ciowe: " @@ -2359,15 +2435,15 @@ msgstr "" "dane nie zostaЁy zapisane; nale©y u©yФ opcji \"--output\" aby je zapisaФ\n" -#: g10/plaintext.c:208 +#: g10/plaintext.c:266 msgid "Please enter name of data file: " msgstr "Nazwa pliku danych: " -#: g10/plaintext.c:229 +#: g10/plaintext.c:287 msgid "reading stdin ...\n" msgstr "czytam strumieЯ standardowego wej╤cia\n" -#: g10/plaintext.c:302 +#: g10/plaintext.c:360 #, c-format msgid "can't open signed data `%s'\n" msgstr "nie mo©na otworzyФ podpisanego pliku '%s'\n" @@ -2407,10 +2483,9 @@ "wyra©enie przej╤ciowe (hasЁo).\n" #: g10/sig-check.c:187 -#, fuzzy msgid "assuming bad MDC due to an unknown critical bit\n" msgstr "" -"przyjЙto niewa©no╤Ф podpisu z powonu ustawienia nieznanego bitu krytycznego\n" +"przyjЙto niepoprawno╤Ф MDC z powonu ustawienia nieznanego bitu krytycznego\n" #: g10/sig-check.c:283 msgid "" @@ -2439,21 +2514,21 @@ msgstr "" "przyjЙto niewa©no╤Ф podpisu z powonu ustawienia nieznanego bitu krytycznego\n" -#: g10/sign.c:79 +#: g10/sign.c:132 #, c-format msgid "%s signature from: %s\n" msgstr "%s podpis zЁo©ony przez: %s\n" -#: g10/sign.c:210 g10/sign.c:496 +#: g10/sign.c:263 g10/sign.c:554 #, c-format msgid "can't create %s: %s\n" msgstr "nie mogЙ stworzyФ %s: %s\n" -#: g10/sign.c:306 +#: g10/sign.c:361 msgid "signing:" msgstr "podpis:" -#: g10/sign.c:346 +#: g10/sign.c:401 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "OSTRZE╞ENIE: plik '%s' jest pusty\n" @@ -2464,9 +2539,9 @@ msgstr "nie mogЙ obsЁu©yФ linii tekstu dЁu©szej ni© %d znakСw\n" #: g10/textfilter.c:197 -#, fuzzy, c-format +#, c-format msgid "input line longer than %d characters\n" -msgstr "bЁ╠d opakowania: linia dЁu©sza ni© %d znakСw\n" +msgstr "linia dЁu©sza ni© %d znakСw\n" #: g10/tdbio.c:116 g10/tdbio.c:1505 #, c-format @@ -2502,15 +2577,15 @@ msgid "%s: directory does not exist!\n" msgstr "%s: katalog nie istnieje!\n" -#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457 +#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: nie mogЙ utworzyФ: %s\n" #: g10/tdbio.c:472 g10/tdbio.c:521 -#, fuzzy, c-format +#, c-format msgid "%s: can't create lock\n" -msgstr "%s: nie mogЙ utworzyФ: %s\n" +msgstr "%s: nie mogЙ utworzyФ blokady\n" #: g10/tdbio.c:486 #, c-format @@ -2599,7 +2674,8 @@ msgstr "%s: dopisanie rekordu nie powiodЁo siЙ: %s\n" #: g10/tdbio.c:1630 -msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n" +#, fuzzy +msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" "Baza zaufania jest uszkodzona; proszЙ uruchomiФ \"gpgm --fix-trust-db\".\n" @@ -2823,14 +2899,12 @@ msgstr "OSTRZE╞ENIE: dЁugie wpisy ustawieЯ jeszcze nie s╠ obsЁugiwane.\n" #: g10/trustdb.c:1654 -#, fuzzy msgid "duplicated certificate - deleted" -msgstr "PodwСjna kopia certyfikatu - usuniЙta" +msgstr "podwСjny certyfikat - usuniЙty" #: g10/trustdb.c:1692 -#, fuzzy msgid "public key not anymore available" -msgstr "klucz tajny jest niedostЙpny" +msgstr "klucz publiczny jest ju© niedostЙpny" #: g10/trustdb.c:1702 g10/trustdb.c:1791 msgid "Invalid certificate revocation" @@ -2914,7 +2988,7 @@ #: g10/trustdb.c:2568 #, c-format msgid "\t%lu keys inserted\n" -msgstr " %lu kluczy wpisanych\n" +msgstr "\t%lu kluczy wpisanych\n" #: g10/trustdb.c:2571 #, c-format @@ -3066,16 +3140,21 @@ msgid "Overwrite (y/N)? " msgstr "NadpisaФ (t/N)? " -#: g10/openfile.c:92 +#: g10/openfile.c:97 +#, c-format +msgid "%s: unknown suffix\n" +msgstr "" + +#: g10/openfile.c:122 msgid "writing to stdout\n" msgstr "zapisywanie na wyj╤cie standardowe\n" -#: g10/openfile.c:149 +#: g10/openfile.c:181 #, c-format msgid "assuming signed data in `%s'\n" msgstr "przyjЙto obecno╤Ф podpisanych danych w '%s'\n" -#: g10/openfile.c:199 +#: g10/openfile.c:231 #, c-format msgid "%s: new options file created\n" msgstr "%s: stworzono nowy plik ustawieЯ\n" @@ -3094,8 +3173,7 @@ msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" -"OSTRZE╞ENIE: Informacje byЁy szyfrowane sЁabym kluczem szyfru " -"symetrycznego.\n" +"OSTRZE╞ENIE: wiadomo╤Ф byЁa szyfrowana sЁabym kluczem szyfru symetrycznego.\n" #: g10/seskey.c:52 msgid "weak key created - retrying\n" @@ -3135,7 +3213,7 @@ #: g10/helptext.c:66 msgid "keygen.algo" msgstr "" -"WybСr algorytmu.\n" +"WybСr algorytmu:\n" "DSA (znany te© jako DSS) to Algorytm Podpisu Cyfrowego - u©ywaФ go mo©na " "tylko\n" "do tworzenia cyfrowych podpisСw. Jego wybСr jest sugerowany poniewa©\n" @@ -3250,34 +3328,62 @@ msgid "keyedit.remove.subkey.okay" msgstr "Odpowiedz \"tak\" je╤li na pewno chcesz skasowaФ ten podklucz" -#: g10/helptext.c:175 +#: g10/helptext.c:176 +#, fuzzy +msgid "keyedit.delsig.valid" +msgstr "" +"Odpowiedz \"tak\" je╤li chcesz podpisaФ wszystkie identyfikatory klucza" + +#: g10/helptext.c:181 +#, fuzzy +msgid "keyedit.delsig.unknown" +msgstr "" +"Odpowiedz \"tak\" je╤li chcesz podpisaФ wszystkie identyfikatory klucza" + +#: g10/helptext.c:187 +#, fuzzy +msgid "keyedit.delsig.invalid" +msgstr "" +"Odpowiedz \"tak\" je╤li chcesz podpisaФ wszystkie identyfikatory klucza" + +#: g10/helptext.c:191 +msgid "keyedit.delsig.selfsig" +msgstr "" + +#: g10/helptext.c:200 msgid "passphrase.enter" msgstr "" "ProszЙ wprowadziФ wyra©enie przej╤ciowe (tajne zdanie)\n" " Bla, bla, bla ..." -#: g10/helptext.c:182 +#: g10/helptext.c:207 msgid "passphrase.repeat" msgstr "" "ProszЙ powtСrzyФ podane wyra©enie przej╤ciowe dla wyeliminowania pomyЁek." -#: g10/helptext.c:186 +#: g10/helptext.c:211 msgid "detached_signature.filename" msgstr "Nazwa pliku ktСrego dotyczy ten podpis" -#: g10/helptext.c:190 +#: g10/helptext.c:215 msgid "openfile.overwrite.okay" msgstr "Odpowiedz \"tak\" je╤li na pewno chcesz nadpisaФ ten plik" -#: g10/helptext.c:204 +#: g10/helptext.c:229 msgid "No help available" msgstr "Pomoc niedostЙpna" -#: g10/helptext.c:216 +#: g10/helptext.c:241 #, c-format msgid "No help available for `%s'" msgstr "Brak pomocy o '%s'" +#~ msgid "can't lock keyring `%': %s\n" +#~ msgstr "nie mo©na zablokowaФ zbioru kluczy publicznych: %s\n" + +#~ msgid "error writing keyring `%': %s\n" +#~ msgstr "bЁ╠d zapisu zbioru kluczy '%': %s\n" + #~ msgid "can't open file: %s\n" #~ msgstr "nie mo©na otworzyФ pliku: %s\n" @@ -3299,16 +3405,14 @@ #~ msgid "can't write keyring: %s\n" #~ msgstr "niemo©liwy jest zapis zbioru kluczy: %s\n" -#, fuzzy #~ msgid "encrypted message is valid\n" -#~ msgstr "wybrany algorytm geenracji skrСtСw wiadomo╤ci jest niepoprawny\n" +#~ msgstr "zaszyfrowana wiadomo╤Ф jest poprawna\n" -#, fuzzy #~ msgid "Can't check MDC: %s\n" -#~ msgstr "Nie mogЙ sprawdziФ podpisu: %s\n" +#~ msgstr "Sprawdzenie MDC niemo©liwe: %s\n" #~ msgid "Usage: gpgm [options] [files] (-h for help)" -#~ msgstr "SposСb u©ycia: gpgm [opcje] [pliki] (-h podaje pomoc)" +#~ msgstr "WywoЁanie: gpgm [opcje] [pliki] (-h podaje pomoc)" #~ msgid "" #~ "Syntax: gpgm [options] [files]\n" @@ -3395,7 +3499,7 @@ #~ msgstr "bЁ╠d podczas poszukiwania wpisu katalogowego: %s\n" #~ msgid "Hmmm, public key lost?" -#~ msgstr "Hmmm, klucz publiczny starcony?" +#~ msgstr "Hmmm, klucz publiczny utracony?" #~ msgid "did not use primary key for insert_trust_record()\n" #~ msgstr "gЁowny klucz nie zostaЁ u©yty w procedurze insert_trust_record()\n" diff -urN gnupg-0.9.7/po/pt_BR.po gnupg-0.9.8/po/pt_BR.po --- gnupg-0.9.7/po/pt_BR.po Sun May 23 20:02:51 1999 +++ gnupg-0.9.8/po/pt_BR.po Sat Jun 26 13:07:30 1999 @@ -1,10 +1,11 @@ # Portuguese messages for gnupg -# Thiago Jung Bauermann , 1998. +# Thiago Jung Bauermann , 1999. +# Revised by Rafael Caetano dos Santos . # I tried to make this one close to es_ES by Urko Lusa # msgid "" msgstr "" -"POT-Creation-Date: 1999-05-23 15:36+0200\n" +"POT-Creation-Date: 1999-06-26 11:22+0200\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-20 23:46:36-0200\n" "From: Thiago Jung Bauermann \n" @@ -22,259 +23,227 @@ #: util/secmem.c:249 msgid "operation is not possible without initialized secure memory\n" -msgstr "" +msgstr "a operaГЦo nЦo И possМvel sem memСria segura inicializada\n" #: util/secmem.c:250 msgid "(you may have used the wrong program for this task)\n" -msgstr "" +msgstr "(vocЙ pode ter usado o programa errado para esta tarefa)\n" -#: util/miscutil.c:156 +#: util/miscutil.c:156 util/miscutil.c:173 msgid "yes" msgstr "sim" -#: util/miscutil.c:157 +#: util/miscutil.c:157 util/miscutil.c:175 msgid "yY" msgstr "sS" -#: util/errors.c:54 +# INICIO MENU +#: g10/keyedit.c:559 util/miscutil.c:174 +msgid "quit" +msgstr "sair" + +#: util/miscutil.c:176 #, fuzzy +msgid "qQ" +msgstr "s" + +#: util/errors.c:54 msgid "general error" -msgstr "Erro geral" +msgstr "erro geral" #: util/errors.c:55 -#, fuzzy msgid "unknown packet type" -msgstr "Formato desconhecido" +msgstr "formato de pacote desconhecido" #: util/errors.c:56 -#, fuzzy msgid "unknown version" -msgstr "VersЦo desconhecida" +msgstr "versЦo desconhecida" #: util/errors.c:57 -#, fuzzy msgid "unknown pubkey algorithm" -msgstr "Algoritmo de chave pЗblica desconhecido" +msgstr "algoritmo de chave pЗblica desconhecido" #: util/errors.c:58 -#, fuzzy msgid "unknown digest algorithm" -msgstr "Algoritmo de \"digest\" desconhecido" +msgstr "algoritmo de \"digest\" desconhecido" #: util/errors.c:59 -#, fuzzy msgid "bad public key" -msgstr "Chave pЗblica incorreta" +msgstr "chave pЗblica invАlida" #: util/errors.c:60 -#, fuzzy msgid "bad secret key" -msgstr "Chave secreta incorreta" +msgstr "chave secreta incorreta" #: util/errors.c:61 -#, fuzzy msgid "bad signature" -msgstr "Assinatura incorreta" +msgstr "assinatura incorreta" #: util/errors.c:62 -#, fuzzy msgid "checksum error" -msgstr "Erro de \"checksum\"" +msgstr "erro de \"checksum\"" #: util/errors.c:63 -#, fuzzy msgid "bad passphrase" -msgstr "Frase secreta incorreta" +msgstr "frase secreta incorreta" #: util/errors.c:64 -#, fuzzy msgid "public key not found" -msgstr "Chave pЗblica nЦo encontrada" +msgstr "chave pЗblica nЦo encontrada" #: util/errors.c:65 -#, fuzzy msgid "unknown cipher algorithm" -msgstr "Algoritmo de criptografia desconhecido" +msgstr "algoritmo de criptografia desconhecido" +# keyring == molho ??? #: util/errors.c:66 -#, fuzzy msgid "can't open the keyring" -msgstr "NЦo И possМvel abrir o anel de chaves" +msgstr "nЦo И possМvel abrir o chaveiro" #: util/errors.c:67 -#, fuzzy msgid "invalid packet" -msgstr "Valor invАlido" +msgstr "pacote invАlido" #: util/errors.c:68 -#, fuzzy msgid "invalid armor" -msgstr "Armadura invАlida" +msgstr "armadura invАlida" #: util/errors.c:69 -#, fuzzy msgid "no such user id" -msgstr "Identificador de usuАrio inexistente" +msgstr "identificaГЦo de usuАrio inexistente" #: util/errors.c:70 -#, fuzzy msgid "secret key not available" -msgstr "Chave secreta nЦo disponМvel" +msgstr "chave secreta nЦo disponМvel" #: util/errors.c:71 -#, fuzzy msgid "wrong secret key used" -msgstr "Chave secreta incorreta" +msgstr "chave secreta incorreta" +# suportado ??? #: util/errors.c:72 -#, fuzzy msgid "not supported" -msgstr "NЦo suportado" +msgstr "nЦo suportado" #: util/errors.c:73 -#, fuzzy msgid "bad key" -msgstr "Chave incorreta" +msgstr "chave incorreta" #: util/errors.c:74 -#, fuzzy msgid "file read error" -msgstr "Erro de leitura" +msgstr "erro de leitura" #: util/errors.c:75 -#, fuzzy msgid "file write error" -msgstr "Erro de escrita" +msgstr "erro de escrita" #: util/errors.c:76 -#, fuzzy msgid "unknown compress algorithm" -msgstr "Algoritmo de compressЦo desconhecido" +msgstr "algoritmo de compressЦo desconhecido" #: util/errors.c:77 -#, fuzzy msgid "file open error" -msgstr "Erro abrindo arquivo" +msgstr "erro na abertura de arquivo" #: util/errors.c:78 -#, fuzzy msgid "file create error" -msgstr "Erro criando arquivo" +msgstr "erro na criaГЦo de arquivo" +# frase secreta ??? #: util/errors.c:79 -#, fuzzy msgid "invalid passphrase" -msgstr "Frase secreta invАlida" +msgstr "frase secreta invАlida" #: util/errors.c:80 -#, fuzzy msgid "unimplemented pubkey algorithm" -msgstr "Algoritmo de chave pЗblica nЦo implementado" +msgstr "algoritmo de chave pЗblica nЦo implementado" #: util/errors.c:81 -#, fuzzy msgid "unimplemented cipher algorithm" -msgstr "Algoritmo de criptografia nЦo implementado" +msgstr "algoritmo de criptografia nЦo implementado" #: util/errors.c:82 -#, fuzzy msgid "unknown signature class" -msgstr "Classe de assinatura desconhecida" +msgstr "classe de assinatura desconhecida" +# confiabilidade ??? +# do jeito que estА, pode parecer que o BD И confiАvel, quando na verdade +# os dados И que sЦo sobre confianГa #: util/errors.c:83 -#, fuzzy msgid "trust database error" -msgstr "Erro no banco de dados de confianГa" +msgstr "erro no banco de dados de confiabilidade" #: util/errors.c:84 -#, fuzzy msgid "bad MPI" msgstr "MPI incorreto" #: util/errors.c:85 -#, fuzzy msgid "resource limit" -msgstr "Limite de recurso" +msgstr "limite de recurso" #: util/errors.c:86 -#, fuzzy msgid "invalid keyring" -msgstr "Anel de chaves invАlido" +msgstr "chaveiro invАlido" #: util/errors.c:87 -#, fuzzy msgid "bad certificate" -msgstr "Certificado incorreto" +msgstr "certificado incorreto" #: util/errors.c:88 -#, fuzzy msgid "malformed user id" -msgstr "IdentificaГЦo de usuАrio mal formada" +msgstr "identificaГЦo de usuАrio malformada" #: util/errors.c:89 -#, fuzzy msgid "file close error" -msgstr "Erro fechando arquivo" +msgstr "erro no fechamento de arquivo" #: util/errors.c:90 -#, fuzzy msgid "file rename error" -msgstr "Erro renomeando arquivo" +msgstr "erro na renomeaГЦo de arquivo" #: util/errors.c:91 -#, fuzzy msgid "file delete error" -msgstr "Erro deletando arquivo" +msgstr "erro na remoГЦo de arquivo" #: util/errors.c:92 -#, fuzzy msgid "unexpected data" -msgstr "Dados inesperados" +msgstr "dados inesperados" #: util/errors.c:93 -#, fuzzy msgid "timestamp conflict" -msgstr "Conflito com \"timestamp\"" +msgstr "conflito de \"timestamp\"" #: util/errors.c:94 -#, fuzzy msgid "unusable pubkey algorithm" -msgstr "Algoritmo de chave pЗblica inutilizАvel" +msgstr "algoritmo de chave pЗblica inutilizАvel" #: util/errors.c:95 -#, fuzzy msgid "file exists" -msgstr "O arquivo jА existe" +msgstr "o arquivo jА existe" #: util/errors.c:96 -#, fuzzy msgid "weak key" -msgstr "Chave fraca" +msgstr "chave fraca" #: util/errors.c:97 -#, fuzzy msgid "invalid argument" -msgstr "Armadura invАlida" +msgstr "argumento invАlido" #: util/errors.c:98 -#, fuzzy msgid "bad URI" -msgstr "MPI incorreto" +msgstr "URI incorreto" #: util/errors.c:99 -#, fuzzy msgid "unsupported URI" -msgstr "NЦo suportado" +msgstr "URI nЦo suportado" #: util/errors.c:100 -#, fuzzy msgid "network error" -msgstr "Erro geral" +msgstr "erro na rede" #: util/errors.c:102 -#, fuzzy msgid "not encrypted" -msgstr "dados codificados com\n" +msgstr "nЦo criptografado" #: util/logger.c:218 #, c-format @@ -299,12 +268,12 @@ "\n" msgstr "" "O gerador de nЗmeros aleatСrios И apenas um \"remendo\"\n" -"para poder compilar - Ele nЦo И seguro!\n" +"para poder compilar - nЦo И de modo algum um bom gerador!\n" "\n" "NцO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n" "\n" -#: cipher/rndlinux.c:110 +#: cipher/rndlinux.c:135 #, c-format msgid "" "\n" @@ -316,7 +285,7 @@ "para que o sistema possa coletar mais entropia!\n" "(SЦo necessАrios mais %d bytes)\n" -#: g10/g10.c:165 +#: g10/g10.c:174 msgid "" "@Commands:\n" " " @@ -324,131 +293,134 @@ "@Comandos:\n" " " -#: g10/g10.c:167 +#: g10/g10.c:176 msgid "|[file]|make a signature" msgstr "|[arquivo]|faz uma assinatura" -#: g10/g10.c:168 +#: g10/g10.c:177 msgid "|[file]|make a clear text signature" msgstr "|[arquivo]|faz uma assinatura em texto puro" -#: g10/g10.c:169 +#: g10/g10.c:178 msgid "make a detached signature" msgstr "faz uma assinatura separada" -#: g10/g10.c:170 +#: g10/g10.c:179 msgid "encrypt data" -msgstr "codifica dados" +msgstr "criptografa dados" -#: g10/g10.c:171 +#: g10/g10.c:180 msgid "encryption only with symmetric cipher" -msgstr "codifica apenas com criptografia simИtrica" +msgstr "criptografa apenas com criptografia simИtrica" -#: g10/g10.c:172 +#: g10/g10.c:181 msgid "store only" msgstr "apenas armazena" -#: g10/g10.c:173 +#: g10/g10.c:182 msgid "decrypt data (default)" -msgstr "decodifica dados (padrЦo)" +msgstr "descriptografa dados (padrЦo)" -#: g10/g10.c:174 +#: g10/g10.c:183 msgid "verify a signature" msgstr "verifica uma assinatura" -#: g10/g10.c:175 +#: g10/g10.c:184 msgid "list keys" msgstr "lista as chaves" -#: g10/g10.c:177 +#: g10/g10.c:186 msgid "list keys and signatures" msgstr "lista as chaves e as assinaturas" -#: g10/g10.c:178 +#: g10/g10.c:187 msgid "check key signatures" msgstr "confere as assinaturas das chaves" -#: g10/g10.c:179 +#: g10/g10.c:188 msgid "list keys and fingerprints" msgstr "lista as chaves e as impressУes digitais" -#: g10/g10.c:180 +#: g10/g10.c:189 msgid "list secret keys" msgstr "lista as chaves secretas" -#: g10/g10.c:181 +#: g10/g10.c:190 msgid "generate a new key pair" msgstr "gera um novo par de chaves" -#: g10/g10.c:182 +#: g10/g10.c:191 msgid "remove key from the public keyring" -msgstr "remove a chave do anel de chaves pЗblico" +msgstr "remove a chave do chaveiro pЗblico" -#: g10/g10.c:183 +#: g10/g10.c:192 msgid "sign or edit a key" msgstr "assina ou edita uma chave" -#: g10/g10.c:184 +#: g10/g10.c:193 msgid "generate a revocation certificate" msgstr "gera um certificado de revogaГЦo" -#: g10/g10.c:185 +#: g10/g10.c:194 msgid "export keys" msgstr "exporta as chaves" -#: g10/g10.c:186 +#: g10/g10.c:195 msgid "export keys to a key server" -msgstr "" +msgstr "exporta chaves para um servidor" -#: g10/g10.c:187 +#: g10/g10.c:196 msgid "import keys from a key server" -msgstr "" +msgstr "importa chaves de um servidor" -#: g10/g10.c:190 +#: g10/g10.c:199 msgid "import/merge keys" msgstr "importa/funde as chaves" -#: g10/g10.c:192 +#: g10/g10.c:201 msgid "list only the sequence of packets" msgstr "lista apenas as seqЭЙncias de pacotes" -#: g10/g10.c:194 +# ownertrust ??? +#: g10/g10.c:203 msgid "export the ownertrust values" msgstr "exporta os valores de confianГa" -#: g10/g10.c:196 +#: g10/g10.c:205 msgid "import ownertrust values" msgstr "importa os valores de confianГa" -#: g10/g10.c:198 +#: g10/g10.c:207 msgid "|[NAMES]|update the trust database" -msgstr "|[NOMES]|atualiza o banco de dados de confianГa" +msgstr "|[NOMES]|atualiza o banco de dados de confiabilidade" -#: g10/g10.c:200 +#: g10/g10.c:209 msgid "|[NAMES]|check the trust database" -msgstr "|[NOMES]|confere o banco de dados de confianГa" +msgstr "|[NOMES]|confere o banco de dados de confiabilidade" -#: g10/g10.c:201 +#: g10/g10.c:210 msgid "fix a corrupted trust database" -msgstr "conserta um banco de dados de confianГa danificado" +msgstr "" +"conserta um banco de dados de confiabilidade\n" +"danificado" -#: g10/g10.c:202 +#: g10/g10.c:211 msgid "De-Armor a file or stdin" -msgstr "Retira a armadura de um arquivo ou \"stdin\"" +msgstr "Retira a armadura de um arquivo ou de \"stdin\"" -#: g10/g10.c:203 +#: g10/g10.c:212 msgid "En-Armor a file or stdin" msgstr "Cria armadura para um arquivo ou \"stdin\"" -#: g10/g10.c:204 +#: g10/g10.c:213 msgid "|algo [files]|print message digests" msgstr "|algo [arquivos]|imprime \"digests\" de mensagens" -#: g10/g10.c:205 +#: g10/g10.c:214 msgid "print all message digests" msgstr "imprime todos os \"digests\" de mensagens" -#: g10/g10.c:211 +#: g10/g10.c:220 msgid "" "@\n" "Options:\n" @@ -458,155 +430,168 @@ "OpГУes:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:222 msgid "create ascii armored output" -msgstr "cria uma saМda ascii com armadura" +msgstr "cria uma saМda com armadura ascii" -#: g10/g10.c:214 -#, fuzzy +#: g10/g10.c:223 msgid "|NAME|encrypt for NAME" -msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME" +msgstr "|NOME|criptografa para NOME" -#: g10/g10.c:218 +#: g10/g10.c:227 msgid "use this user-id to sign or decrypt" -msgstr "usa este identificador de usuАrio para assinar ou decodificar" +msgstr "" +"usa este identificador de usuАrio para assinar\n" +"ou descriptografar" -#: g10/g10.c:219 +#: g10/g10.c:228 msgid "|N|set compress level N (0 disables)" msgstr "|N|estabelece nМvel de compressЦo N (0 desabilita)" -#: g10/g10.c:221 +#: g10/g10.c:230 msgid "use canonical text mode" msgstr "usa modo de texto canТnico" -#: g10/g10.c:222 +#: g10/g10.c:231 msgid "use as output file" msgstr "usa como arquivo de saМda" -#: g10/g10.c:223 +#: g10/g10.c:232 msgid "verbose" -msgstr "prolixo" +msgstr "detalhado" -#: g10/g10.c:224 +#: g10/g10.c:233 msgid "be somewhat more quiet" msgstr "ser mais silencioso" -#: g10/g10.c:225 +#: g10/g10.c:234 +msgid "don't use the terminal at all" +msgstr "" + +#: g10/g10.c:235 msgid "force v3 signatures" msgstr "forГa assinaturas v3" -#: g10/g10.c:226 -#, fuzzy +#: g10/g10.c:236 msgid "always use a MDC for encryption" -msgstr "usa este identificador de usuАrio para codificar" +msgstr "sempre usar um MDC para criptografar" -#: g10/g10.c:227 +#: g10/g10.c:237 msgid "do not make any changes" -msgstr "" +msgstr "nЦo fazer alteraГУes" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:229 +#: g10/g10.c:239 msgid "batch mode: never ask" -msgstr "processo de lote: nunca perguntar" +msgstr "modo nЦo-interativo: nunca perguntar" -#: g10/g10.c:230 +#: g10/g10.c:240 msgid "assume yes on most questions" msgstr "assumir sim para a maioria das perguntas" -#: g10/g10.c:231 +#: g10/g10.c:241 msgid "assume no on most questions" msgstr "assumir nЦo para a maioria das perguntas" -#: g10/g10.c:232 +#: g10/g10.c:242 msgid "add this keyring to the list of keyrings" -msgstr "adiciona este anel de chaves Ю lista de anИis de chaves" +msgstr "adiciona este chaveiro Ю lista de chaveiros" -#: g10/g10.c:233 +#: g10/g10.c:243 msgid "add this secret keyring to the list" -msgstr "adiciona este anel de chaves secreto Ю lista" +msgstr "adiciona este chaveiro secreto Ю lista" -#: g10/g10.c:234 +#: g10/g10.c:244 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usa NOME como chave secreta padrЦo" -#: g10/g10.c:235 +#: g10/g10.c:245 msgid "|HOST|use this keyserver to lookup keys" -msgstr "" +msgstr "|ENDEREгO|usa este servidor para buscar chaves" -#: g10/g10.c:236 -#, fuzzy +#: g10/g10.c:246 msgid "|NAME|set terminal charset to NAME" -msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME" +msgstr "|NOME|define mapa de caracteres do terminal como NOME" -#: g10/g10.c:237 +#: g10/g10.c:247 msgid "read options from file" msgstr "lЙ opГУes do arquivo" -#: g10/g10.c:239 +#: g10/g10.c:249 msgid "set debugging flags" -msgstr "estabelece parБmetros de depuraГЦo" +msgstr "define parБmetros de depuraГЦo" -#: g10/g10.c:240 +#: g10/g10.c:250 msgid "enable full debugging" msgstr "habilita depuraГЦo completa" -#: g10/g10.c:241 +#: g10/g10.c:251 msgid "|FD|write status info to this FD" -msgstr "|DA|escreve informaГУes de status para este DA" +msgstr "" +"|DA|escreve informaГУes de status para o descritor\n" +"de arquivo DA" -#: g10/g10.c:242 +#: g10/g10.c:252 msgid "do not write comment packets" msgstr "nЦo escreve pacotes de comentАrio" -#: g10/g10.c:243 +#: g10/g10.c:253 msgid "(default is 1)" msgstr "(o padrЦo И 1)" -#: g10/g10.c:244 +#: g10/g10.c:254 msgid "(default is 3)" msgstr "(o padrЦo И 3)" -#: g10/g10.c:246 +#: g10/g10.c:256 msgid "|FILE|load extension module FILE" msgstr "|ARQUIVO|carrega mСdulo de extensЦo ARQUIVO" -#: g10/g10.c:247 +#: g10/g10.c:257 msgid "emulate the mode described in RFC1991" msgstr "emula o modo descrito no RFC1991" -#: g10/g10.c:248 +#: g10/g10.c:258 +msgid "set all packet, cipher and digest options to OpenPGP behavior" +msgstr "" + +#: g10/g10.c:259 msgid "|N|use passphrase mode N" msgstr "|N|usa frase secreta modo N" -#: g10/g10.c:250 +#: g10/g10.c:261 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:252 +#: g10/g10.c:263 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOME|usa algoritmo de criptografia NOME para\n" "frases secretas" -#: g10/g10.c:253 +#: g10/g10.c:264 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOME|usa algoritmo de criptografia NOME" -#: g10/g10.c:254 +#: g10/g10.c:265 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME" -#: g10/g10.c:255 +#: g10/g10.c:266 msgid "|N|use compress algorithm N" msgstr "|N|usa algoritmo de compressЦo N" -#: g10/g10.c:256 +#: g10/g10.c:267 msgid "throw keyid field of encrypted packets" -msgstr "elimina o campo keyid dos pacotes codificados" +msgstr "elimina o campo keyid dos pacotes criptografados" -#: g10/g10.c:258 +#: g10/g10.c:268 +msgid "|NAME=VALUE|use this notation data" +msgstr "" + +#: g10/g10.c:270 msgid "" "@\n" "Examples:\n" @@ -620,31 +605,32 @@ "@\n" "Exemplos:\n" "\n" -" -se -r Bob [arquivo] assina e codifica para usuАrio Bob\n" +" -se -r Bob [arquivo] assina e criptografa para usuАrio Bob\n" " --clearsign [arquivo] cria uma assinatura em texto puro\n" " --detach-sign [arquivo] cria uma assinatura separada\n" " --list-keys [nomes] mostra chaves\n" " --fingerprint [nomes] mostra impressУes digitais\n" -#: g10/g10.c:327 +#: g10/g10.c:347 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:331 +#: g10/g10.c:351 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opГУes] [arquivos] (-h para ajuda)" -#: g10/g10.c:334 +# em cima, "check" estА como "conferir" +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" msgstr "" "Sintaxe: gpg [opГУes] [arquivos]\n" -"assina, verifica, codifica ou decodifica\n" +"assina, verifica, criptografa ou descriptografa\n" "a operaГЦo padrЦo depende dos dados de entrada\n" -#: g10/g10.c:339 +#: g10/g10.c:359 msgid "" "\n" "Supported algorithms:\n" @@ -652,149 +638,173 @@ "\n" "Algoritmos suportados:\n" -#: g10/g10.c:413 +#: g10/g10.c:433 msgid "usage: gpg [options] " msgstr "uso: gpg [opГУes] " -#: g10/g10.c:453 +#: g10/g10.c:473 msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:580 +#: g10/g10.c:605 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de opГУes padrЦo `%s' inexistente\n" -#: g10/g10.c:584 +#: g10/g10.c:609 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de opГУes `%s': %s\n" -#: g10/g10.c:591 +#: g10/g10.c:616 #, c-format msgid "reading options from `%s'\n" msgstr "lendo opГУes de `%s'\n" -#: g10/g10.c:737 +#: g10/g10.c:782 #, c-format msgid "%s is not a valid character set\n" -msgstr "%s nЦo И um mapa de caracteres vАlido\n" +msgstr "%s nЦo И um conjunto de caracteres vАlido\n" -#: g10/g10.c:780 g10/g10.c:792 +#: g10/g10.c:827 g10/g10.c:839 msgid "selected cipher algorithm is invalid\n" -msgstr "algoritmo de criptografia selecionado nЦo И vАlido\n" +msgstr "o algoritmo de criptografia selecionado nЦo И vАlido\n" -#: g10/g10.c:786 g10/g10.c:798 +#: g10/g10.c:833 g10/g10.c:845 msgid "selected digest algorithm is invalid\n" -msgstr "algoritmo de \"digest\" selecionado nЦo И vАlido\n" +msgstr "o algoritmo de \"digest\" selecionado nЦo И vАlido\n" + +#: g10/g10.c:849 +msgid "the given policy URL is invalid\n" +msgstr "" -#: g10/g10.c:801 +#: g10/g10.c:852 #, c-format msgid "compress algorithm must be in range %d..%d\n" -msgstr "algoritmo de compressЦo deve estar na faixa %d..%d\n" +msgstr "o algoritmo de compressЦo deve estar na faixa %d..%d\n" -#: g10/g10.c:803 +#: g10/g10.c:854 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:805 +#: g10/g10.c:856 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:807 +#: g10/g10.c:858 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:810 +#: g10/g10.c:861 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:814 +#: g10/g10.c:865 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:891 +#: g10/g10.c:942 #, c-format msgid "failed to initialize the TrustDB: %s\n" -msgstr "falha ao inicializar o banco de dados de confianГa: %s\n" +msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/g10.c:897 +#: g10/g10.c:948 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:904 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:912 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:925 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:938 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:952 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:964 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:973 +#: g10/g10.c:1024 msgid "--edit-key username [commands]" msgstr "--edit-key nome_do_usuАrio [comandos]" -#: g10/g10.c:987 +#: g10/g10.c:1038 msgid "--delete-secret-key username" msgstr "--delete-secret-key nome_do_usuАrio" -#: g10/g10.c:990 +#: g10/g10.c:1041 msgid "--delete-key username" msgstr "--delete-key nome_do_usuАrio" -#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311 +#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossМvel abrir %s: %s\n" -#: g10/g10.c:1024 +#: g10/g10.c:1075 msgid "-k[v][v][v][c] [userid] [keyring]" -msgstr "-k[v][v][v][c] [id_do_usuАrio] [anel_de_chaves]" +msgstr "-k[v][v][v][c] [id_do_usuАrio] [chaveiro]" -#: g10/g10.c:1083 +#: g10/g10.c:1134 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:1091 +#: g10/g10.c:1142 #, c-format msgid "enarmoring failed: %s\n" msgstr "criaГЦo de armadura falhou: %s\n" -#: g10/g10.c:1157 +# "hash" poderia ser "espalhamento", mas nЦo fica claro +#: g10/g10.c:1208 #, c-format msgid "invalid hash algorithm `%s'\n" -msgstr "algoritmo de distribuiГЦo invАlido `%s'\n" +msgstr "algoritmo de hash invАlido `%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1283 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:1236 +#: g10/g10.c:1287 msgid "Go ahead and type your message ...\n" msgstr "VА em frente e digite sua mensagem ...\n" -#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "impossМvel abrir `%s'\n" +#: g10/g10.c:1457 +msgid "" +"the first character of a notation name must be a letter or an underscore\n" +msgstr "" + +#: g10/g10.c:1463 +msgid "" +"a notation name must have only letters, digits, dots or underscores and end " +"with an '='\n" +msgstr "" + +#: g10/g10.c:1469 +msgid "dots in a notation name must be surrounded by other characters\n" +msgstr "" + +#: g10/g10.c:1477 +msgid "a notation value must not use any control characters\n" +msgstr "" + #: g10/armor.c:296 #, c-format msgid "armor: %s\n" @@ -813,18 +823,16 @@ msgstr "cabeГalho de assinatura em texto puro invАlido\n" #: g10/armor.c:389 -#, fuzzy msgid "nested clear text signatures\n" -msgstr "|[arquivo]|faz uma assinatura em texto puro" +msgstr "assinaturas em texto puro aninhadas\n" #: g10/armor.c:500 msgid "invalid dash escaped line: " msgstr "linha com hМfen invАlida: " #: g10/armor.c:512 -#, fuzzy msgid "unexpected armor:" -msgstr "Dados inesperados" +msgstr "armadura inesperada:" #: g10/armor.c:629 #, c-format @@ -857,19 +865,20 @@ msgstr "erro na linha \"trailer\"\n" #: g10/armor.c:1001 -#, fuzzy msgid "no valid OpenPGP data found.\n" -msgstr "nenum dado RFC1991 ou OpenPGP vАlido encontrado.\n" +msgstr "nenhum dado OpenPGP vАlido encontrado.\n" #: g10/armor.c:1005 #, c-format msgid "invalid armor: line longer than %d characters\n" -msgstr "" +msgstr "armadura invАlida: linha maior que %d caracteres\n" #: g10/armor.c:1009 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" +"caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs " +"foi usado\n" #: g10/pkclist.c:137 #, c-format @@ -909,13 +918,14 @@ #: g10/pkclist.c:158 msgid " q = quit\n" -msgstr "" +msgstr " q = sai\n" +# ??? #. a string with valid answers #: g10/pkclist.c:163 #, fuzzy msgid "sSmMqQ" -msgstr "iImMqQ" +msgstr "sSmMqQ" #: g10/pkclist.c:167 msgid "Your decision? " @@ -932,14 +942,14 @@ "\n" msgstr "" "NЦo foi possМvel encontrar uma rota de confianГa vАlida para a chave.\n" -"Vamos ver se И possМvel designar alguns valores de confianГa perdidos.\n" +"Vamos ver se И possМvel designar alguns valores de confianГa ausentes.\n" "\n" #: g10/pkclist.c:260 msgid "" "No path leading to one of our keys found.\n" "\n" -msgstr "Nenhuma rota que leva a uma de nossas chaves encontrada.\n" +msgstr "Nenhuma rota encontrada que leve a uma de nossas chaves.\n" #: g10/pkclist.c:262 msgid "" @@ -964,12 +974,12 @@ #: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403 msgid "Use this key anyway? " -msgstr "Usa esta chave de qualquer modo?" +msgstr "Usa esta chave de qualquer modo? " #: g10/pkclist.c:291 -#, fuzzy, c-format +#, c-format msgid "key %08lX: subkey has been revoked!\n" -msgstr "chave %08lX: a chave foi revogada!\n" +msgstr "chave %08lX: a subchave foi revogada!\n" #: g10/pkclist.c:321 #, c-format @@ -987,13 +997,13 @@ msgstr "%08lX: NСs NцO confiamos nesta chave\n" #: g10/pkclist.c:347 -#, fuzzy, c-format +#, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" "but it is accepted anyway\n" msgstr "" -"%08lX: NЦo se tem certeza de que esta chave realmente pertence ao dono\n" -"mas И aceitada de qualquer modo\n" +"%08lX: NЦo se tem certeza de que esta chave realmente pertence ao dono,\n" +"mas И aceita de qualquer modo\n" #: g10/pkclist.c:353 msgid "This key probably belongs to the owner\n" @@ -1001,7 +1011,7 @@ #: g10/pkclist.c:358 msgid "This key belongs to us\n" -msgstr "Esta chave pertence a nСs (nСs temos a chave secreta)\n" +msgstr "Esta chave pertence a nСs\n" #: g10/pkclist.c:398 msgid "" @@ -1028,9 +1038,8 @@ msgstr " Isto pode significar que a assinatura И falsificada.\n" #: g10/pkclist.c:459 -#, fuzzy msgid "WARNING: This subkey has been revoked by its owner!\n" -msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" +msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n" #: g10/pkclist.c:480 msgid "Note: This key has expired!\n" @@ -1056,18 +1065,25 @@ #: g10/pkclist.c:513 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" -msgstr "AVISO: Esta chave nЦo estА certificada com assinaturas confiАveis!\n" +msgstr "" +"AVISO: Esta chave nЦo estА certificada com assinaturas suficientemente\n" +" confiАveis!\n" #: g10/pkclist.c:516 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " NЦo se tem certeza de que a assinatura pertence ao dono.\n" -#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673 +#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:591 +#: g10/pkclist.c:588 g10/pkclist.c:687 +#, fuzzy, c-format +msgid "%s: skipped: public key already present\n" +msgstr "%s: erro de leitura de bloco de chaves: %s\n" + +#: g10/pkclist.c:611 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1075,20 +1091,20 @@ "VocЙ nЦo especificou um ID de usuАrio. (pode-se usar \"-r\")\n" "\n" -#: g10/pkclist.c:596 +#: g10/pkclist.c:616 msgid "Enter the user ID: " -msgstr "Digite o identificador de usuАrio:" +msgstr "Digite o identificador de usuАrio: " -#: g10/pkclist.c:607 +#: g10/pkclist.c:627 msgid "No such user ID.\n" msgstr "Identificador de usuАrio inexistente.\n" -#: g10/pkclist.c:653 +#: g10/pkclist.c:673 #, c-format msgid "%s: error checking key: %s\n" -msgstr "%s: erro verificando chave: %s\n" +msgstr "%s: erro na verificaГЦo da chave: %s\n" -#: g10/pkclist.c:679 +#: g10/pkclist.c:711 msgid "no valid addressees\n" msgstr "nenhum endereГo vАlido\n" @@ -1096,6 +1112,7 @@ msgid "writing self signature\n" msgstr "escrevendo auto-assinatura\n" +# key binding ??? #: g10/keygen.c:160 msgid "writing key binding signature\n" msgstr "escrevendo assinatura ligada a uma chave\n" @@ -1134,9 +1151,8 @@ msgstr "Sua opГЦo? " #: g10/keygen.c:409 -#, fuzzy msgid "Do you really want to create a sign and encrypt key? " -msgstr "VocЙ realmente quer deletar as chaves selecionadas? " +msgstr "VocЙ realmente quer criar uma chave para assinatura e criptografia? " #: g10/keygen.c:430 msgid "Invalid selection.\n" @@ -1176,9 +1192,9 @@ #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. #: g10/keygen.c:466 -#, fuzzy, c-format +#, c-format msgid "keysize too large; %d is largest value allowed.\n" -msgstr "tamanho muito pequeno; 768 И o valor mМnimo permitido.\n" +msgstr "tamanho muito grande; %d И o valor mАximo permitido.\n" #: g10/keygen.c:471 msgid "" @@ -1198,7 +1214,7 @@ "vulnerable to attacks!\n" msgstr "" "Tudo bem, mas tenha em mente que a radiaГЦo de seu monitor e teclado tambИm " -"И vulnerАvel a ataques!\n" +"sЦo vulnerАveis a ataques!\n" #: g10/keygen.c:483 msgid "Do you really need such a large keysize? " @@ -1262,8 +1278,8 @@ "\n" msgstr "" "\n" -"VocЙ precisa de um identificador de usuАrio para identificar sua chave; o\n" -"programa constrСi o identificador a partir do Nome Completo, ComentАrio e\n" +"VocЙ precisa de uma identificaГЦo de usuАrio para identificar sua chave; o\n" +"programa constrСi a identificaГЦo a partir do Nome Completo, ComentАrio e\n" "EndereГo EletrТnico desta forma:\n" " \"Heinrich Heine (Der Dichter) \"\n" "\n" @@ -1278,7 +1294,7 @@ #: g10/keygen.c:612 msgid "Name may not start with a digit\n" -msgstr "O nome nЦo deve comeГar com um dМgito\n" +msgstr "O nome nЦo pode comeГar com um dМgito\n" #: g10/keygen.c:614 msgid "Name must be at least 5 characters long\n" @@ -1303,7 +1319,7 @@ #: g10/keygen.c:669 #, c-format msgid "You are using the `%s' character set.\n" -msgstr "" +msgstr "VocЙ estА usando o conjunto de caracteres `%s'.\n" #: g10/keygen.c:675 #, c-format @@ -1312,7 +1328,7 @@ " \"%s\"\n" "\n" msgstr "" -"VocЙ selecionou este identificador de usuАrio:\n" +"VocЙ selecionou esta identificaГЦo de usuАrio:\n" " \"%s\"\n" "\n" @@ -1332,7 +1348,7 @@ "VocЙ precisa de uma frase secreta para proteger sua chave.\n" "\n" -#: g10/keyedit.c:433 g10/keygen.c:748 +#: g10/keyedit.c:455 g10/keygen.c:748 msgid "passphrase not correctly repeated; try again.\n" msgstr "A frase secreta nЦo foi repetida corretamente; tente outra vez.\n" @@ -1349,7 +1365,6 @@ "\n" #: g10/keygen.c:775 -#, fuzzy msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -1357,10 +1372,8 @@ "generator a better chance to gain enough entropy.\n" msgstr "" "Precisamos gerar muitos bytes aleatСrios. и uma boa idИia realizar outra\n" -"atividade (trabalhar em outra janela, mover o mouse, usar a rede e os " -"disco)\n" -"durante a geraГЦo dos nЗmeros primos; isso dА ao gerador de nЗmeros " -"aleatСrios\n" +"atividade (digitar no teclado, mover o mouse, usar os discos) durante a\n" +"geraГЦo dos nЗmeros primos; isso dА ao gerador de nЗmeros aleatСrios\n" "uma chance melhor de conseguir entropia suficiente.\n" #: g10/keygen.c:845 @@ -1372,7 +1385,8 @@ msgstr "O par de chaves DSA terА 1024 bits.\n" #: g10/keygen.c:859 -msgid "Key generation cancelled.\n" +#, fuzzy +msgid "Key generation canceled.\n" msgstr "GeraГЦo de chaves cancelada.\n" #: g10/keygen.c:869 @@ -1390,39 +1404,39 @@ msgstr "chaves pЗblica e privada criadas e assinadas.\n" #: g10/keygen.c:949 -#, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" 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" +"o comando \"--edit-key\" para gerar uma chave secundАria para esse fim.\n" #: g10/keygen.c:963 g10/keygen.c:1062 #, c-format msgid "Key generation failed: %s\n" msgstr "A geraГЦo de chaves falhou: %s\n" -#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52 -#, fuzzy, c-format +#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105 +#, 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" +"a chave foi criada %lu segundos no futuro\n" +"(viagem no tempo ou problema no relСgio)\n" -#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54 -#, fuzzy, c-format +#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107 +#, 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" +"a chave foi criada %lu segundos no futuro\n" +"(viagem no tempo ou problema no relСgio)\n" #: g10/keygen.c:1040 msgid "Really create? " msgstr "Realmente criar? " -#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467 +#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467 #: g10/tdbio.c:528 #, c-format msgid "%s: can't open: %s\n" @@ -1431,7 +1445,7 @@ #: g10/encode.c:113 #, c-format msgid "error creating passphrase: %s\n" -msgstr "erro criando frase secreta: %s\n" +msgstr "erro na criaГЦo da frase secreta: %s\n" #: g10/encode.c:167 g10/encode.c:287 #, c-format @@ -1443,25 +1457,25 @@ msgid "reading from `%s'\n" msgstr "lendo de `%s'\n" -#: g10/encode.c:417 -#, fuzzy, c-format +#: g10/encode.c:431 +#, c-format msgid "%s/%s encrypted for: %s\n" -msgstr "%s codificado para: %s\n" +msgstr "%s/%s criptografado para: %s\n" #: g10/export.c:147 -#, fuzzy, c-format +#, c-format msgid "%s: user not found: %s\n" -msgstr "%s: usuАrio nЦo encontrado\n" +msgstr "%s: usuАrio nЦo encontrado: %s\n" #: g10/export.c:156 -#, fuzzy, c-format +#, c-format msgid "certificate read problem: %s\n" -msgstr "erro de leitura do usuАrio `%s': %s\n" +msgstr "erro de leitura do certificado: %s\n" #: g10/export.c:165 -#, fuzzy, c-format +#, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" -msgstr "chave %08lX: chave secreta sem chave pЗblica - ignorada\n" +msgstr "chave %08lX: nЦo И uma chave rfc2440 - ignorada\n" #: g10/export.c:203 msgid "WARNING: nothing exported\n" @@ -1481,9 +1495,9 @@ msgstr "usando chave secundАria %08lX ao invИs de chave primАria %08lX\n" #: g10/import.c:116 -#, fuzzy, c-format +#, c-format msgid "can't open `%s': %s\n" -msgstr "impossМvel abrir %s: %s\n" +msgstr "impossМvel abrir `%s': %s\n" #: g10/import.c:160 #, c-format @@ -1496,9 +1510,9 @@ msgstr "%lu chaves processadas atИ agora\n" #: g10/import.c:172 -#, fuzzy, c-format +#, c-format msgid "error reading `%s': %s\n" -msgstr "erro lendo registro de chave: %s\n" +msgstr "erro na leitura de `%s': %s\n" #: g10/import.c:175 #, c-format @@ -1576,22 +1590,22 @@ #: g10/import.c:372 msgid "no default public keyring\n" -msgstr "sem anel de chaves pЗblico padrЦo\n" +msgstr "sem chaveiro pЗblico padrЦo\n" -#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501 +#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "escrevendo para `%s'\n" -#: g10/import.c:379 g10/import.c:435 -#, fuzzy -msgid "can't lock keyring `%': %s\n" -msgstr "impossМvel bloquear anel de chaves pЗblico: %s\n" +#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#, fuzzy, c-format +msgid "can't lock keyring `%s': %s\n" +msgstr "impossМvel bloquear chaveiro `%s': %s\n" -#: g10/import.c:382 -#, fuzzy -msgid "error writing keyring `%': %s\n" -msgstr "%s: erro escrevendo registro de versЦo: %s\n" +#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648 +#, c-format +msgid "error writing keyring `%s': %s\n" +msgstr "%s: erro na escrita do chaveiro `%s': %s\n" #: g10/import.c:387 #, c-format @@ -1613,11 +1627,6 @@ 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:438 g10/import.c:547 g10/import.c:648 -#, fuzzy, c-format -msgid "error writing keyring `%s': %s\n" -msgstr "%s: erro escrevendo registro de versЦo: %s\n" - #: g10/import.c:444 #, c-format msgid "key %08lX: 1 new user-id\n" @@ -1653,11 +1662,6 @@ msgid "key %08lX: not changed\n" msgstr "chave %08lX: nЦo modificada\n" -#: g10/import.c:544 g10/import.c:645 -#, fuzzy, c-format -msgid "can't lock keyring `%s': %s\n" -msgstr "impossМvel bloquear anel de chaves pЗblico: %s\n" - #: g10/import.c:552 #, c-format msgid "key %08lX: secret key imported\n" @@ -1667,7 +1671,7 @@ #: g10/import.c:556 #, c-format msgid "key %08lX: already in secret keyring\n" -msgstr "chave %08lX: jА no anel de chaves secreto\n" +msgstr "chave %08lX: jА existe no chaveiro secreto\n" #: g10/import.c:561 #, c-format @@ -1707,14 +1711,14 @@ msgstr "chave %08lX: auto-assinatura invАlida\n" #: g10/import.c:709 -#, fuzzy, c-format +#, c-format msgid "key %08lX: no subkey for key binding\n" -msgstr "chave %08lX.%lu: LigaГЦo de subchave vАlida\n" +msgstr "chave %08lX: sem subchave para ligaГЦo de chaves\n" #: g10/import.c:718 -#, fuzzy, c-format +#, c-format msgid "key %08lX: invalid subkey binding\n" -msgstr "chave %08lX.%lu: LigaГЦo de subchave invАlida: %s\n" +msgstr "chave %08lX: ligaГЦo de subchave invАlida\n" #: g10/import.c:750 #, c-format @@ -1722,33 +1726,33 @@ msgstr "chave %08lX: id de usuАrio ignorado '" #: g10/import.c:773 -#, fuzzy, c-format +#, c-format msgid "key %08lX: skipped subkey\n" -msgstr "chave %08lX: 1 nova subchave\n" +msgstr "chave %08lX: subchave ignorada\n" #. here we violate the rfc a bit by still allowing #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense #: g10/import.c:798 -#, fuzzy, c-format +#, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" -msgstr "chave %08lX: certificado de revogaГЦo no local errado - ignorado\n" +msgstr "chave %08lX: assinatura nЦo exportАvel (classe %02x) - ignorada\n" #: g10/import.c:807 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" -msgstr "chave %08lX: certificado de revogaГЦo no local errado - ignorado\n" +msgstr "chave %08lX: certificado de revogaГЦo no local errado - ignorada\n" #: g10/import.c:815 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" -msgstr "chave %08lX: certificado de revogaГЦo invАlido: %s - ignorado\n" +msgstr "chave %08lX: certificado de revogaГЦo invАlido: %s - ignorada\n" #: g10/import.c:915 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "" +msgstr "chave %08lX: detectado ID de usuАrio duplicado - unido\n" #: g10/import.c:966 #, c-format @@ -1760,68 +1764,68 @@ msgid "key %08lX: our copy has no self-signature\n" msgstr "chave %08lX: nossa cСpia nЦo tem auto-assinatura\n" -#: g10/keyedit.c:91 +#: g10/keyedit.c:92 #, c-format msgid "%s: user not found\n" msgstr "%s: usuАrio nЦo encontrado\n" -#: g10/keyedit.c:177 +#: g10/keyedit.c:153 msgid "[revocation]" -msgstr "" +msgstr "[revogaГЦo]" -#: g10/keyedit.c:178 +#: g10/keyedit.c:154 msgid "[self-signature]" msgstr "[auto-assinatura]" -#: g10/keyedit.c:196 +#: g10/keyedit.c:218 msgid "1 bad signature\n" msgstr "1 assinatura incorreta\n" -#: g10/keyedit.c:198 +#: g10/keyedit.c:220 #, c-format msgid "%d bad signatures\n" msgstr "%d assinaturas incorretas\n" -#: g10/keyedit.c:200 +#: g10/keyedit.c:222 msgid "1 signature not checked due to a missing key\n" msgstr "1 assinatura nЦo verificada por falta de chave\n" -#: g10/keyedit.c:202 +#: g10/keyedit.c:224 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d assinaturas nЦo verificadas por falta de chaves\n" -#: g10/keyedit.c:204 +#: g10/keyedit.c:226 msgid "1 signature not checked due to an error\n" -msgstr "1 assinatura nЦo checada por causa de um erro\n" +msgstr "1 assinatura nЦo checada devido a um erro\n" -#: g10/keyedit.c:206 +#: g10/keyedit.c:228 #, c-format msgid "%d signatures not checked due to errors\n" -msgstr "%d assinaturas nЦo verificadas por causa de erros\n" +msgstr "%d assinaturas nЦo verificadas devido a erros\n" -#: g10/keyedit.c:208 +#: g10/keyedit.c:230 msgid "1 user id without valid self-signature detected\n" msgstr "1 id de usuАrio sem auto-assinatura vАlida detectado\n" -#: g10/keyedit.c:210 +#: g10/keyedit.c:232 #, c-format msgid "%d user ids without valid self-signatures detected\n" msgstr "%d ids de usuАrios sem auto-assinaturas vАlidas detectados\n" #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. -#: g10/keyedit.c:290 +#: g10/keyedit.c:312 #, c-format msgid "Already signed by key %08lX\n" msgstr "JА assinado pela chave %08lX\n" -#: g10/keyedit.c:298 +#: g10/keyedit.c:320 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nada para assinar com a chave %08lX\n" -#: g10/keyedit.c:307 +#: g10/keyedit.c:329 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -1829,35 +1833,37 @@ "VocЙ tem certeza de que quer assinar esta chave com\n" "sua chave: \"" -#: g10/keyedit.c:316 +#: g10/keyedit.c:338 msgid "" "The signature will be marked as non-exportable.\n" "\n" msgstr "" +"A assinatura serА marcada como nЦo-exportАvel.\n" +"\n" -#: g10/keyedit.c:321 +#: g10/keyedit.c:343 msgid "Really sign? " msgstr "Realmente assinar? " -#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75 +#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "assinatura falhou: %s\n" -#: g10/keyedit.c:400 +#: g10/keyedit.c:422 msgid "This key is not protected.\n" msgstr "Esta chave nЦo И protegida.\n" -#: g10/keyedit.c:403 +#: g10/keyedit.c:425 msgid "Key is protected.\n" msgstr "A chave И protegida.\n" -#: g10/keyedit.c:420 +#: g10/keyedit.c:442 #, c-format msgid "Can't edit this key: %s\n" msgstr "ImpossМvel editar esta chave: %s\n" -#: g10/keyedit.c:425 +#: g10/keyedit.c:447 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -1865,7 +1871,7 @@ "Digite a nova frase para esta chave secreta.\n" "\n" -#: g10/keyedit.c:437 +#: g10/keyedit.c:459 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -1873,378 +1879,413 @@ "VocЙ nЦo quer uma frase secreta - provavelmente isto И uma *mА* idИia!\n" "\n" -#: g10/keyedit.c:440 +#: g10/keyedit.c:462 msgid "Do you really want to do this? " msgstr "VocЙ realmente quer fazer isso? " -#: g10/keyedit.c:501 +#: g10/keyedit.c:523 msgid "moving a key signature to the correct place\n" msgstr "movendo a assinatura da chave para o local correto\n" -#: g10/keyedit.c:537 -msgid "quit" -msgstr "sair" - -#: g10/keyedit.c:537 +#: g10/keyedit.c:559 msgid "quit this menu" msgstr "sair deste menu" -#: g10/keyedit.c:538 +#: g10/keyedit.c:560 msgid "q" msgstr "s" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save" msgstr "gravar" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save and quit" msgstr "gravar e sair" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "help" msgstr "ajuda" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "show this help" msgstr "mostra esta ajuda" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "fpr" -msgstr "" +msgstr "imp" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "show fingerprint" msgstr "mostra impressЦo digital" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list" msgstr "lista" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 msgid "list key and user ids" -msgstr "lista chave e identificadores de usuАrios" +msgstr "lista chave e identificaГУes de usuАrios" -#: g10/keyedit.c:544 +# ??? +#: g10/keyedit.c:566 msgid "l" -msgstr "" +msgstr "l" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "uid" -msgstr "" +msgstr "uid" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "select user id N" msgstr "seleciona id de usuАrio N" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "key" msgstr "chave" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "select secondary key N" msgstr "seleciona chave secundАria N" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "check" msgstr "verifica" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "list signatures" msgstr "lista assinaturas" -#: g10/keyedit.c:548 +# ??? +#: g10/keyedit.c:570 msgid "c" -msgstr "v" +msgstr "c" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign" msgstr "assina" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign the key" msgstr "assina a chave" -#: g10/keyedit.c:550 +# ??? +#: g10/keyedit.c:572 msgid "s" -msgstr "a" +msgstr "s" -#: g10/keyedit.c:551 +#: g10/keyedit.c:573 #, fuzzy msgid "lsign" -msgstr "assina" +msgstr "lassina" -#: g10/keyedit.c:551 -#, fuzzy +#: g10/keyedit.c:573 msgid "sign the key locally" -msgstr "assina a chave" +msgstr "assina a chave localmente" -#: g10/keyedit.c:552 +#: g10/keyedit.c:574 msgid "debug" msgstr "depura" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "adduid" msgstr "" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "add a user id" msgstr "adiciona um novo id de usuАrio" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "deluid" msgstr "" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "delete user id" -msgstr "deleta id de usuАrio" +msgstr "remove id de usuАrio" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "addkey" msgstr "" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "add a secondary key" msgstr "adiciona nova chave secundАria" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delkey" msgstr "" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delete a secondary key" -msgstr "deleta uma chave secundАria" +msgstr "remove uma chave secundАria" + +#: g10/keyedit.c:579 +#, fuzzy +msgid "delsig" +msgstr "lassina" + +#: g10/keyedit.c:579 +#, fuzzy +msgid "delete signatures" +msgstr "lista assinaturas" -#: g10/keyedit.c:557 +#: g10/keyedit.c:580 msgid "expire" msgstr "expira" -#: g10/keyedit.c:557 +#: g10/keyedit.c:580 msgid "change the expire date" -msgstr "muda a data em que a chave expira" +msgstr "muda a data de expiraГЦo" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle" -msgstr "comuta" +msgstr "alterna" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle between secret and public key listing" -msgstr "comuta entre listagem de chave secreta e pЗblica" +msgstr "alterna entre listagem de chave secreta e pЗblica" -#: g10/keyedit.c:560 +#: g10/keyedit.c:583 msgid "t" msgstr "c" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "pref" msgstr "" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "list preferences" msgstr "lista preferЙncias" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "passwd" msgstr "senha" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "change the passphrase" msgstr "muda a frase secreta" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "trust" msgstr "confianca" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "change the ownertrust" msgstr "muda os valores de confianГa" -#: g10/keyedit.c:564 +#: g10/keyedit.c:587 #, fuzzy msgid "revsig" -msgstr "assina" +msgstr "revsig" -#: g10/keyedit.c:564 -#, fuzzy +#: g10/keyedit.c:587 msgid "revoke signatures" -msgstr "forГa assinaturas v3" +msgstr "revoga assinaturas" -#: g10/keyedit.c:565 +#: g10/keyedit.c:588 #, fuzzy msgid "revkey" -msgstr "chave" +msgstr "revkey" -#: g10/keyedit.c:565 -#, fuzzy +#: g10/keyedit.c:588 msgid "revoke a secondary key" -msgstr "deleta uma chave secundАria" +msgstr "revoga uma chave secundАria" -#: g10/keyedit.c:584 +#: g10/keyedit.c:607 msgid "can't do that in batchmode\n" -msgstr "impossМvel fazer isso em modo de processo por lotes\n" +msgstr "impossМvel fazer isso em modo nЦo-interativo\n" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:613 +#: g10/keyedit.c:636 msgid "Secret key is available.\n" -msgstr "Chave secreta disponМvel\n" +msgstr "Chave secreta disponМvel.\n" -#: g10/keyedit.c:642 +#: g10/keyedit.c:665 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:669 -#, fuzzy +#: g10/keyedit.c:692 msgid "Need the secret key to do this.\n" msgstr "A chave secreta И necessАria para fazer isto.\n" -#: g10/keyedit.c:691 +#: g10/keyedit.c:714 msgid "Save changes? " msgstr "Salvar alteraГУes? " -#: g10/keyedit.c:694 +#: g10/keyedit.c:717 msgid "Quit without saving? " msgstr "Sair sem salvar? " -#: g10/keyedit.c:704 +#: g10/keyedit.c:727 #, c-format msgid "update failed: %s\n" msgstr "atualizaГЦo falhou: %s\n" -#: g10/keyedit.c:711 +#: g10/keyedit.c:734 #, c-format msgid "update secret failed: %s\n" msgstr "atualizaГЦo da chave secreta falhou: %s\n" -#: g10/keyedit.c:718 +#: g10/keyedit.c:741 msgid "Key not changed so no update needed.\n" -msgstr "Chave sem mudanГas, nenhuma atualizaГЦo И necessАria.\n" +msgstr "Chave nЦo alterada, nenhuma atualizaГЦo И necessАria.\n" -#: g10/keyedit.c:721 g10/keyedit.c:780 -#, fuzzy, c-format +#: g10/keyedit.c:744 g10/keyedit.c:803 +#, c-format msgid "update of trustdb failed: %s\n" -msgstr "atualizaГЦo da confianГa falhou: %s\n" +msgstr "atualizaГЦo do banco de dados de confiabilidade falhou: %s\n" -#: g10/keyedit.c:754 +#: g10/keyedit.c:777 msgid "Really sign all user ids? " msgstr "Realmente assinar todos os ids de usuАrio? " -#: g10/keyedit.c:755 +#: g10/keyedit.c:778 msgid "Hint: Select the user ids to sign\n" msgstr "SugestЦo: Selecione os ids de usuАrio para assinar\n" -#: g10/keyedit.c:791 +#: g10/keyedit.c:814 g10/keyedit.c:835 msgid "You must select at least one user id.\n" msgstr "VocЙ precisa selecionar pelo menos um id de usuАrio.\n" -#: g10/keyedit.c:793 +#: g10/keyedit.c:816 msgid "You can't delete the last user id!\n" -msgstr "VocЙ nЦo pode deletar o Зltimo id de usuАrio!\n" +msgstr "VocЙ nЦo pode remover o Зltimo id de usuАrio!\n" -#: g10/keyedit.c:796 +#: g10/keyedit.c:819 msgid "Really remove all selected user ids? " msgstr "Realmente remover todos os ids de usuАrio selecionados? " -#: g10/keyedit.c:797 +#: g10/keyedit.c:820 msgid "Really remove this user id? " msgstr "Realmente remover este id de usuАrio? " -#: g10/keyedit.c:820 g10/keyedit.c:842 +#: g10/keyedit.c:858 g10/keyedit.c:880 msgid "You must select at least one key.\n" msgstr "VocЙ deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:824 +#: g10/keyedit.c:862 msgid "Do you really want to delete the selected keys? " -msgstr "VocЙ realmente quer deletar as chaves selecionadas? " +msgstr "VocЙ realmente quer remover as chaves selecionadas? " -#: g10/keyedit.c:825 +#: g10/keyedit.c:863 msgid "Do you really want to delete this key? " -msgstr "VocЙ realmente quer deletar esta chave? " +msgstr "VocЙ realmente quer remover esta chave? " -#: g10/keyedit.c:846 -#, fuzzy +#: g10/keyedit.c:884 msgid "Do you really want to revoke the selected keys? " -msgstr "VocЙ realmente quer deletar as chaves selecionadas? " +msgstr "VocЙ realmente quer revogar as chaves selecionadas? " -#: g10/keyedit.c:847 -#, fuzzy +#: g10/keyedit.c:885 msgid "Do you really want to revoke this key? " -msgstr "VocЙ realmente quer deletar esta chave? " +msgstr "VocЙ realmente quer revogar esta chave? " -#: g10/keyedit.c:901 +# help ou ajuda ??? +#: g10/keyedit.c:939 msgid "Invalid command (try \"help\")\n" -msgstr "Comando invАlido (tente \"ajuda\")\n" +msgstr "Comando invАlido (tente \"help\")\n" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 +msgid "Delete this good signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1298 +msgid "Delete this invalid signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1302 +msgid "Delete this unknown signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1308 +#, fuzzy +msgid "Really delete this self-signature? (y/N)" +msgstr "Realmente gerar os certificados de revogaГЦo? (s/N)" + +#: g10/keyedit.c:1322 +#, fuzzy, c-format +msgid "Deleted %d signature.\n" +msgstr "%d assinaturas incorretas\n" + +#: g10/keyedit.c:1323 +#, fuzzy, c-format +msgid "Deleted %d signatures.\n" +msgstr "%d assinaturas incorretas\n" + +#: g10/keyedit.c:1326 +#, fuzzy +msgid "Nothing deleted.\n" +msgstr "AVISO: nada exportado\n" + +#: g10/keyedit.c:1395 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as seleГУes das chaves secretas.\n" -#: g10/keyedit.c:1299 +#: g10/keyedit.c:1401 msgid "Please select at most one secondary key.\n" msgstr "Por favor selecione no mАximo uma chave secundАria.\n" -#: g10/keyedit.c:1303 -msgid "Changing exiration time for a secondary key.\n" -msgstr "Modificando data de expiraГЦo para a chave secundАria.\n" - -#: g10/keyedit.c:1305 -msgid "Changing exiration time for the primary key.\n" -msgstr "Modificando data de expiraГЦo para a chave primАria.\n" +#: g10/keyedit.c:1405 +#, fuzzy +msgid "Changing expiration time for a secondary key.\n" +msgstr "Modificando a data de expiraГЦo para a chave secundАria.\n" + +#: g10/keyedit.c:1407 +#, fuzzy +msgid "Changing expiration time for the primary key.\n" +msgstr "Modificando a data de expiraГЦo para a chave primАria.\n" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1448 msgid "You can't change the expiration date of a v3 key\n" msgstr "VocЙ nЦo pode modificar a data de expiraГЦo de uma chave v3\n" -#: g10/keyedit.c:1362 +#: g10/keyedit.c:1464 msgid "No corresponding signature in secret ring\n" -msgstr "Nenhuma assinatura correspondente no anel de chaves secreto\n" +msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n" -#: g10/keyedit.c:1422 +#: g10/keyedit.c:1524 #, c-format msgid "No user id with index %d\n" msgstr "Nenhum id de usuАrio com Мndice %d\n" -#: g10/keyedit.c:1468 +#: g10/keyedit.c:1570 #, c-format msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundАria com Мndice %d\n" -#: g10/keyedit.c:1566 -#, fuzzy +#: g10/keyedit.c:1668 msgid "user ID: \"" msgstr "Digite o identificador de usuАrio:" -#: g10/keyedit.c:1569 -#, fuzzy, c-format +#: g10/keyedit.c:1671 +#, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" -msgstr "Nada para assinar com a chave %08lX\n" +msgstr "" +"\"\n" +"assinado com sua chave %08lX em %s\n" -#: g10/keyedit.c:1573 -#, fuzzy +#: g10/keyedit.c:1675 msgid "Create a revocation certificate for this signature? (y/N)" -msgstr "gera um certificado de revogaГЦo" +msgstr "Gerar um certificado de revogaГЦo para esta assinatura? (s/N)" -#: g10/keyedit.c:1653 -#, fuzzy +#: g10/keyedit.c:1755 msgid "Really create the revocation certificates? (y/N)" -msgstr "gera um certificado de revogaГЦo" +msgstr "Realmente gerar os certificados de revogaГЦo? (s/N)" -#: g10/keyedit.c:1676 -#, fuzzy +#: g10/keyedit.c:1778 msgid "no secret key\n" -msgstr "Chave secreta incorreta" +msgstr "nenhuma chave secreta\n" #: g10/mainproc.c:184 -#, fuzzy, c-format +#, c-format msgid "public key is %08lX\n" -msgstr "Chave pЗblica nЦo encontrada" +msgstr "a chave pЗblica И %08lX\n" #: g10/mainproc.c:212 -#, fuzzy msgid "public key encrypted data: good DEK\n" -msgstr "dados codificados com chave pЗblica: DEK bom\n" +msgstr "dados criptografados com chave pЗblica: DEK vАlido\n" #. fixme: defer this message until we have parsed all packets of #. * this type - do this by building a list of keys with their stati @@ -2253,20 +2294,20 @@ #: g10/mainproc.c:219 #, c-format msgid "public key decryption failed: %s\n" -msgstr "decodificaГЦo de chave pЗblica falhou: %s\n" +msgstr "descriptografia de chave pЗblica falhou: %s\n" #: g10/mainproc.c:247 msgid "decryption okay\n" -msgstr "decodificaГЦo correta\n" +msgstr "descriptografia correta\n" #: g10/mainproc.c:252 msgid "WARNING: encrypted message has been manipulated!\n" -msgstr "" +msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n" #: g10/mainproc.c:257 #, c-format msgid "decryption failed: %s\n" -msgstr "decodifiaГЦo falhou: %s\n" +msgstr "descriptografia falhou: %s\n" #: g10/mainproc.c:275 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" @@ -2277,39 +2318,52 @@ msgid "original file name='%.*s'\n" msgstr "nome de arquivo original='%.*s'\n" -#: g10/mainproc.c:890 +#: g10/mainproc.c:505 g10/mainproc.c:514 +#, fuzzy +msgid "WARNING: invalid notation data found\n" +msgstr "nenhum dado OpenPGP vАlido encontrado.\n" + +#: g10/mainproc.c:517 +msgid "Notation: " +msgstr "" + +#: g10/mainproc.c:524 +msgid "Policy: " +msgstr "" + +#: g10/mainproc.c:929 msgid "signature verification suppressed\n" -msgstr "verifiaГЦo de assinatura suprimida\n" +msgstr "verificaГЦo de assinatura suprimida\n" -#: g10/mainproc.c:896 +# XXX Verificar +#: g10/mainproc.c:935 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" -msgstr "Assinatura feita %.*s usando %s ID da chave %08lX\n" +msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:922 g10/mainproc.c:933 +#: g10/mainproc.c:961 g10/mainproc.c:972 msgid "BAD signature from \"" msgstr "Assinatura INCORRETA de \"" -#: g10/mainproc.c:923 g10/mainproc.c:934 +#: g10/mainproc.c:962 g10/mainproc.c:973 msgid "Good signature from \"" -msgstr "Assinatura correta de\"" +msgstr "Assinatura correta de \"" -#: g10/mainproc.c:925 -#, fuzzy +#: g10/mainproc.c:964 msgid " aka \"" -msgstr " importados: %lu" +msgstr " ou \"" -#: g10/mainproc.c:975 +#: g10/mainproc.c:1015 #, c-format msgid "Can't check signature: %s\n" msgstr "ImpossМvel verificar assinatura: %s\n" -#: g10/mainproc.c:1056 +#: g10/mainproc.c:1109 msgid "old style (PGP 2.x) signature\n" msgstr "assinatura antiga (PGP2.x)\n" -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1114 msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz invАlido detectado em proc_tree()\n" @@ -2319,13 +2373,12 @@ msgstr "impossМvel desabilitar core dumps: %s\n" #: g10/misc.c:96 -#, fuzzy msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um arquivo core!\n" #: g10/misc.c:203 msgid "Experimental algorithms should not be used!\n" -msgstr "" +msgstr "Algoritmos experimentais nЦo devem ser usados!\n" #: g10/misc.c:217 msgid "" @@ -2338,16 +2391,18 @@ #: g10/misc.c:239 msgid "this cipher algorithm is depreciated; please use a more standard one!\n" msgstr "" +"este algoritmo de criptografia И depreciado; por favor use algum\n" +"algoritmo padrЦo!\n" #: g10/parse-packet.c:112 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "impossМvel manipular algoritmo de chave pЗblica %d\n" -#: g10/parse-packet.c:872 +#: g10/parse-packet.c:931 #, c-format msgid "subpacket of type %d has critical bit set\n" -msgstr "" +msgstr "subpacote de tipo %d tem bit crМtico ligado\n" #: g10/passphrase.c:157 msgid "" @@ -2356,24 +2411,24 @@ "user: \"" msgstr "" "\n" -"VocЙ precisa de uma frase para desbloquear a chave secreta do\n" +"VocЙ precisa de uma frase secreta para desbloquear a chave secreta do\n" "usuАrio: \"" #: g10/passphrase.c:166 #, fuzzy, c-format msgid "%u-bit %s key, ID %08lX, created %s" -msgstr "(chave %u-bit/%s, ID %08lX, criada em %s)\n" +msgstr "chave de %u-bit/%s, ID %08lX, criada em %s\n" #: g10/passphrase.c:171 #, c-format msgid " (main key ID %08lX)" -msgstr "" +msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:190 +#: g10/passphrase.c:192 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:194 +#: g10/passphrase.c:196 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -2381,15 +2436,15 @@ 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:208 +#: g10/plaintext.c:266 msgid "Please enter name of data file: " msgstr "Por favor digite o nome do arquivo de dados: " -#: g10/plaintext.c:229 +#: g10/plaintext.c:287 msgid "reading stdin ...\n" msgstr "lendo \"stdin\" ...\n" -#: g10/plaintext.c:302 +#: g10/plaintext.c:360 #, c-format msgid "can't open signed data `%s'\n" msgstr "impossМvel abrir dados assinados `%s'\n" @@ -2400,9 +2455,8 @@ msgstr "destinatАrio anТnimo; tentando chave secreta %08lX ...\n" #: g10/pubkey-enc.c:85 -#, fuzzy msgid "okay, we are the anonymous recipient.\n" -msgstr "correto, nСs somos o destinatАrio anТnimo.\n" +msgstr "certo, nСs somos o destinatАrio anТnimo.\n" #: g10/pubkey-enc.c:137 msgid "old encoding of the DEK is not supported\n" @@ -2425,11 +2479,11 @@ #: g10/seckey-cert.c:227 msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "" -"AVISO: Chave fraca detectada - por favor mude a frase secreta novamente\n" +"AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n" #: g10/sig-check.c:187 msgid "assuming bad MDC due to an unknown critical bit\n" -msgstr "" +msgstr "assumindo MDC incorreto devido a um bit crМtico desconhecido\n" #: g10/sig-check.c:283 msgid "" @@ -2438,14 +2492,14 @@ "esta И uma chave ElGamal gerada pelo PGP que NцO И segura para assinaturas!\n" #: g10/sig-check.c:291 -#, fuzzy, c-format +#, c-format msgid "public key is %lu second newer than the signature\n" -msgstr "lid %lu: id de usuАrio sem assinatura\n" +msgstr "a chave pЗblica И %lu segundo mais nova que a assinatura\n" #: g10/sig-check.c:292 -#, fuzzy, c-format +#, c-format msgid "public key is %lu seconds newer than the signature\n" -msgstr "lid %lu: id de usuАrio sem assinatura\n" +msgstr "a chave pЗblica И %lu segundos mais nova que a assinatura\n" #: g10/sig-check.c:308 #, c-format @@ -2454,23 +2508,23 @@ #: g10/sig-check.c:365 msgid "assuming bad signature due to an unknown critical bit\n" -msgstr "" +msgstr "assumindo assinatura incorreta devido a um bit crМtico desconhecido\n" -#: g10/sign.c:79 +#: g10/sign.c:132 #, c-format msgid "%s signature from: %s\n" msgstr "%s assinatura de: %s\n" -#: g10/sign.c:210 g10/sign.c:496 +#: g10/sign.c:263 g10/sign.c:554 #, c-format msgid "can't create %s: %s\n" msgstr "impossМvel criar %s: %s\n" -#: g10/sign.c:306 +#: g10/sign.c:361 msgid "signing:" msgstr "assinando:" -#: g10/sign.c:346 +#: g10/sign.c:401 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVISO: `%s' И um arquivo vazio\n" @@ -2478,27 +2532,26 @@ #: g10/textfilter.c:128 #, c-format msgid "can't handle text lines longer than %d characters\n" -msgstr "" +msgstr "impossМvel manejar linhas de texto maiores que %d caracteres\n" #: g10/textfilter.c:197 #, c-format msgid "input line longer than %d characters\n" -msgstr "" +msgstr "linha de entrada maior que %d caracteres\n" #: g10/tdbio.c:116 g10/tdbio.c:1505 -#, fuzzy, c-format +#, c-format msgid "trustdb rec %lu: lseek failed: %s\n" -msgstr "banco de dados de confianГa rec %lu: lseek falhou: %s\n" +msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n" #: g10/tdbio.c:122 g10/tdbio.c:1512 -#, fuzzy, c-format +#, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" -msgstr "banco de dados de confianГa rec %lu: escrita falhou (n=%d): %s\n" +msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n" #: g10/tdbio.c:232 -#, fuzzy msgid "trustdb transaction too large\n" -msgstr "transaГЦo de banco de dados de confianГa muito grande\n" +msgstr "transaГЦo de banco de dados de confiabilidade muito grande\n" #: g10/tdbio.c:424 #, c-format @@ -2520,15 +2573,15 @@ msgid "%s: directory does not exist!\n" msgstr "%s: diretСrio inexistente!\n" -#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457 +#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossМvel criar: %s\n" #: g10/tdbio.c:472 g10/tdbio.c:521 -#, fuzzy, c-format +#, c-format msgid "%s: can't create lock\n" -msgstr "%s: impossМvel criar: %s\n" +msgstr "%s: impossМvel criar trava\n" #: g10/tdbio.c:486 #, c-format @@ -2536,24 +2589,24 @@ msgstr "%s: falha ao criar registro de versЦo: %s" #: g10/tdbio.c:490 -#, fuzzy, c-format +#, c-format msgid "%s: invalid trustdb created\n" -msgstr "%s: banco de dados de confianГa invАlido criado\n" +msgstr "%s: banco de dados de confiabilidade invАlido criado\n" #: g10/tdbio.c:493 -#, fuzzy, c-format +#, c-format msgid "%s: trustdb created\n" -msgstr "%s: banco de dados de confianГa criado\n" +msgstr "%s: banco de dados de confiabilidade criado\n" #: g10/tdbio.c:530 -#, fuzzy, c-format +#, c-format msgid "%s: invalid trustdb\n" -msgstr "%s: banco de dados de confianГa invАlido\n" +msgstr "%s: banco de dados de confiabilidade invАlido\n" #: g10/tdbio.c:563 #, c-format msgid "%s: failed to create hashtable: %s\n" -msgstr "%s: falha ao criar tabela \"hash\": %s\n" +msgstr "%s: falha ao criar tabela de \"hash\": %s\n" #: g10/tdbio.c:571 #, c-format @@ -2574,17 +2627,17 @@ #: g10/tdbio.c:1132 #, c-format msgid "trustdb: lseek failed: %s\n" -msgstr "banco de dados de confianГa: lseek falhou: %s\n" +msgstr "banco de dados de confiabilidade: lseek falhou: %s\n" #: g10/tdbio.c:1140 #, c-format msgid "trustdb: read failed (n=%d): %s\n" -msgstr "banco de dados de confianГa: leitura falhou (n=%d): %s\n" +msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n" #: g10/tdbio.c:1161 #, c-format msgid "%s: not a trustdb file\n" -msgstr "%s: nЦo И um banco de dados de confianГa\n" +msgstr "%s: nЦo И um banco de dados de confiabilidade\n" #: g10/tdbio.c:1177 #, c-format @@ -2602,7 +2655,7 @@ msgstr "%s: erro lendo registro livre: %s\n" #: g10/tdbio.c:1479 -#, fuzzy, c-format +#, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: erro escrevendo registro de diretСrio: %s\n" @@ -2618,15 +2671,15 @@ #: g10/tdbio.c:1630 #, fuzzy -msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n" +msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -"O banco de dados de confianГa estА danificado; por favor rode\n" +"O banco de dados de confiabilidade estА danificado; por favor rode\n" "\"gpgm --fix-trust-db\".\n" #: g10/trustdb.c:163 -#, fuzzy, c-format +#, c-format msgid "trust record %lu, req type %d: read failed: %s\n" -msgstr "registro de confianГa %lu, tipo req %d: leitura falhou: %s\n" +msgstr "registro de confianГa %lu, tipo req %d: falha na leitura: %s\n" #: g10/trustdb.c:178 #, c-format @@ -2639,17 +2692,17 @@ msgstr "registro de confianГa %lu: remoГЦo falhou: %s\n" #: g10/trustdb.c:206 -#, fuzzy, c-format +#, c-format msgid "trustdb: sync failed: %s\n" -msgstr "banco de dados de confianГa: sincronizaГЦo falhou: %s\n" +msgstr "banco de dados de confiabilidade: sincronizaГЦo falhou: %s\n" #: g10/trustdb.c:386 -#, fuzzy, c-format +#, c-format msgid "error reading dir record for LID %lu: %s\n" msgstr "erro lendo registro de diretСrio para LID %lu: %s\n" #: g10/trustdb.c:393 -#, fuzzy, c-format +#, c-format msgid "lid %lu: expected dir record, got type %d\n" msgstr "lid %lu: registro de diretСrio esperado, tipo %d recebido\n" @@ -2681,12 +2734,13 @@ #: g10/trustdb.c:525 #, c-format msgid "key %08lX: secret and public key don't match\n" -msgstr "chave %08lX: chaves secreta e pЗblica nЦo combinam\n" +msgstr "chave %08lX: chaves secreta e pЗblica nЦo sЦo correspondentes\n" #: g10/trustdb.c:535 #, c-format msgid "key %08lX: can't put it into the trustdb\n" -msgstr "chave %08lX: impossМvel colocА-la no banco de dados de confianГa\n" +msgstr "" +"chave %08lX: impossМvel colocА-la no banco de dados de confiabilidade\n" #: g10/trustdb.c:541 #, c-format @@ -2694,14 +2748,14 @@ msgstr "chave %08lX: pedido de registro falhou\n" #: g10/trustdb.c:550 -#, fuzzy, c-format +#, c-format msgid "key %08lX: already in trusted key table\n" -msgstr "chave %08lX: jА estА na tabela de chaves secretas\n" +msgstr "chave %08lX: jА estА na tabela de chaves confiАveis\n" #: g10/trustdb.c:553 -#, fuzzy, c-format +#, c-format msgid "key %08lX: accepted as trusted key.\n" -msgstr "chave %08lX: aceita como chave secreta.\n" +msgstr "chave %08lX: aceita como chave confiАvel.\n" #: g10/trustdb.c:561 #, c-format @@ -2709,25 +2763,25 @@ msgstr "enumeraГЦo de chaves secretas falhou: %s\n" #: g10/trustdb.c:851 -#, fuzzy, c-format +#, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" msgstr "" -"NOTA: assinatura rec %lu[%d] em lista de sugestУes de %lu mas marcada\n" -"como verificada\n" +"NOTA: assinatura rec %lu[%d] estА na lista de sugestУes de %lu mas estА\n" +" marcada como verificada\n" #: g10/trustdb.c:855 -#, fuzzy, c-format +#, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n" msgstr "" -"NOTA: assinatura rec %lu[%d] em lista de sugestУes de %lu mas nЦo\n" -"marcada\n" +"NOTA: assinatura rec %lu[%d] estА na lista de sugestУes de %lu mas nЦo estА\n" +" marcada\n" #. we need the dir record #: g10/trustdb.c:862 #, c-format msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n" msgstr "" -"assinatura rec %lu[%d] em lista de sugestУes de %lu nЦo aponta para\n" +"assinatura rec %lu[%d] na lista de sugestУes de %lu nЦo aponta para\n" "um registro de diretСrio\n" #: g10/trustdb.c:868 @@ -2771,7 +2825,7 @@ #: g10/trustdb.c:988 #, c-format msgid "lid %lu does not have a key\n" -msgstr "lid %lu nЦo tem uma chave\n" +msgstr "lid %lu nЦo tem chave\n" #: g10/trustdb.c:998 #, c-format @@ -2819,6 +2873,7 @@ #: g10/trustdb.c:1403 msgid "Valid user ID revocation skipped due to a newer self signature\n" msgstr "" +"RevogaГЦo vАlida de ID de usuАrio ignorada devido a nova auto-assinatura\n" #: g10/trustdb.c:1410 msgid "Valid user ID revocation\n" @@ -2828,9 +2883,10 @@ msgid "Invalid user ID revocation" msgstr "RevogaГЦo de ID de usuАrio invАlida" +# muitas ou demais ??? #: g10/trustdb.c:1512 msgid "Too many preferences" -msgstr "Muitas preferЙncias" +msgstr "PreferЙncias demais" #: g10/trustdb.c:1526 msgid "Too many preference items" @@ -2841,14 +2897,12 @@ msgstr "AVISO: ainda И impossМvel manipular registros de preferЙncias longos\n" #: g10/trustdb.c:1654 -#, fuzzy msgid "duplicated certificate - deleted" -msgstr "Certificado duplicado - deletado" +msgstr "certificado duplicado - removido" #: g10/trustdb.c:1692 -#, fuzzy msgid "public key not anymore available" -msgstr "Chave secreta nЦo disponМvel" +msgstr "a chave pЗblica nЦo estА mais disponМvel" #: g10/trustdb.c:1702 g10/trustdb.c:1791 msgid "Invalid certificate revocation" @@ -2858,11 +2912,12 @@ msgid "Invalid certificate" msgstr "Certificado invАlido" +# trauzir sombra ??? #: g10/trustdb.c:1720 #, c-format msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" msgstr "" -"uid %08lX.%lu/%02X%02X: tem diretСrio sombra %lu mas ainda nЦo estА\n" +"uid %08lX.%lu/%02X%02X: tem diretСrio \"shadow\" %lu mas ainda nЦo estА\n" "marcado\n" #: g10/trustdb.c:1734 @@ -2960,7 +3015,7 @@ msgstr "%s: correto\n" #: g10/trustdb.c:2632 -#, fuzzy, c-format +#, c-format msgid "lid %lu: dir record w/o key - skipped\n" msgstr "lid %lu: registro de diretСrio sem chave - ignorado\n" @@ -2987,7 +3042,7 @@ #: g10/trustdb.c:2754 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" -msgstr "chave %08lX.%lu: inserida no banco de dados de confianГa\n" +msgstr "chave %08lX.%lu: inserida no banco de dados de confiabilidade\n" #: g10/trustdb.c:2762 #, c-format @@ -3006,39 +3061,39 @@ msgstr "chave %08lX.%lu: verificaГЦo de confianГa falhou: %s\n" #: g10/trustdb.c:2881 -#, fuzzy, c-format +#, c-format msgid "user '%s' not found: %s\n" msgstr "usuАrio `%s' nЦo encontrado: %s\n" #: g10/trustdb.c:2883 -#, fuzzy, c-format +#, c-format msgid "problem finding '%s' in trustdb: %s\n" -msgstr "problemas encontrando `%s' no banco de dados de confianГa: %s\n" +msgstr "problemas na procura de `%s' no banco de dados de confiabilidade: %s\n" #: g10/trustdb.c:2886 -#, fuzzy, c-format +#, c-format msgid "user '%s' not in trustdb - inserting\n" msgstr "" -"usuАrio `%s' nЦo encontrado no banco de dados de confianГa - inserindo\n" +"usuАrio `%s' nЦo encontrado no banco de dados de confiabilidade - inserindo\n" #: g10/trustdb.c:2889 -#, fuzzy, c-format +#, c-format msgid "failed to put '%s' into trustdb: %s\n" -msgstr "falha ao colocar `%s' no banco de dados de confianГa: %s\n" +msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n" #: g10/ringedit.c:316 #, c-format msgid "%s: can't create keyring: %s\n" -msgstr "%s: impossМvel criar anel de chaves: %s\n" +msgstr "%s: impossМvel criar chaveiro: %s\n" #: g10/ringedit.c:333 g10/ringedit.c:1349 #, c-format msgid "%s: keyring created\n" -msgstr "%s: anel de chaves criado\n" +msgstr "%s: chaveiro criado\n" #: g10/ringedit.c:1526 msgid "WARNING: 2 files with confidential information exists.\n" -msgstr "AVISO: 2 arquivos com informaГУes confidenciais existem.\n" +msgstr "AVISO: existem 2 arquivos com informaГУes confidenciais.\n" #: g10/ringedit.c:1527 #, c-format @@ -3057,6 +3112,8 @@ #: g10/skclist.c:88 g10/skclist.c:125 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" +"a chave nЦo estА marcada como insegura - impossМvel usА-la com o pseudo " +"RNG!\n" #: g10/skclist.c:113 #, c-format @@ -3076,22 +3133,27 @@ #: g10/openfile.c:65 #, c-format msgid "File `%s' exists. " -msgstr "Arquivo `%s' existe. " +msgstr "Arquivo `%s' jА existe. " #: g10/openfile.c:67 msgid "Overwrite (y/N)? " msgstr "Sobrescrever (s/N)? " -#: g10/openfile.c:92 +#: g10/openfile.c:97 +#, c-format +msgid "%s: unknown suffix\n" +msgstr "" + +#: g10/openfile.c:122 msgid "writing to stdout\n" -msgstr "escrevendo para \"stdout\"\n" +msgstr "escrevendo em \"stdout\"\n" -#: g10/openfile.c:149 +#: g10/openfile.c:181 #, c-format msgid "assuming signed data in `%s'\n" msgstr "assumindo dados assinados em `%s'\n" -#: g10/openfile.c:199 +#: g10/openfile.c:231 #, c-format msgid "%s: new options file created\n" msgstr "%s: novo arquivo de opГУes criado\n" @@ -3099,19 +3161,18 @@ #: g10/encr-data.c:66 #, c-format msgid "%s encrypted data\n" -msgstr "dados codificados com\n" +msgstr "dados criptografados com %s\n" #: g10/encr-data.c:68 #, c-format msgid "encrypted with unknown algorithm %d\n" -msgstr "codificado com algoritmo desconhecido %d\n" +msgstr "criptografado com algoritmo desconhecido %d\n" #: g10/encr-data.c:85 -#, fuzzy msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" -"AVISO: A mensagem foi codificada com uma chave fraca na criptografia\n" +"AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n" "simИtrica.\n" #: g10/seskey.c:52 @@ -3123,7 +3184,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" "impossМvel evitar chave fraca para criptografia simИtrica;\n" -"tentado %d vezes!\n" +"tentadas %d vezes!\n" #. begin of list #: g10/helptext.c:48 @@ -3222,31 +3283,53 @@ msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/helptext.c:175 +#: g10/helptext.c:176 +msgid "keyedit.delsig.valid" +msgstr "" + +#: g10/helptext.c:181 +msgid "keyedit.delsig.unknown" +msgstr "" + +#: g10/helptext.c:187 +msgid "keyedit.delsig.invalid" +msgstr "" + +#: g10/helptext.c:191 +msgid "keyedit.delsig.selfsig" +msgstr "" + +#: g10/helptext.c:200 msgid "passphrase.enter" msgstr "" -#: g10/helptext.c:182 +#: g10/helptext.c:207 msgid "passphrase.repeat" msgstr "" -#: g10/helptext.c:186 +#: g10/helptext.c:211 msgid "detached_signature.filename" msgstr "" -#: g10/helptext.c:190 +#: g10/helptext.c:215 msgid "openfile.overwrite.okay" msgstr "" -#: g10/helptext.c:204 +#: g10/helptext.c:229 msgid "No help available" msgstr "Nenhuma ajuda disponМvel" -#: g10/helptext.c:216 +#: g10/helptext.c:241 #, c-format msgid "No help available for `%s'" msgstr "Nenhuma ajuda disponМvel para `%s'" +#~ msgid "can't lock keyring `%': %s\n" +#~ msgstr "impossМvel bloquear chaveiro `%': %s\n" + +#~ msgid "error writing keyring `%': %s\n" +#~ msgstr "erro na escrita do chaveiro `%': %s\n" + #~ msgid "can't open file: %s\n" #~ msgstr "impossМvel abrir arquivo: %s\n" @@ -3254,7 +3337,7 @@ #~ msgstr "erro de leitura: %s\n" #~ msgid "can't write to keyring: %s\n" -#~ msgstr "impossМvel escrever para o anel de chaves: %s\n" +#~ msgstr "impossМvel escrever para o chaveiro: %s\n" #~ msgid "writing keyblock\n" #~ msgstr "escrevendo bloco de chaves\n" @@ -3263,10 +3346,10 @@ #~ msgstr "impossМvel escrever bloco de chaves: %s\n" #~ msgid "can't lock secret keyring: %s\n" -#~ msgstr "impossМvel bloquear anel de chaves secreto: %s\n" +#~ msgstr "impossМvel bloquear chaveiro secreto: %s\n" #~ msgid "can't write keyring: %s\n" -#~ msgstr "impossМvel escrever anel de chaves: %s\n" +#~ msgstr "impossМvel escrever chaveiro: %s\n" #, fuzzy #~ msgid "encrypted message is valid\n" @@ -3328,7 +3411,7 @@ #, fuzzy #~ msgid "user '%s' not in trustdb\n" -#~ msgstr "usuАrio `%s' nЦo estА no banco de dados de confianГa\n" +#~ msgstr "usuАrio `%s' nЦo estА no banco de dados de confiabilidade\n" #~ msgid "" #~ "# List of assigned trustvalues, created %s\n" @@ -3354,13 +3437,14 @@ #~ msgid "key not in trustdb, searching ring.\n" #~ msgstr "" -#~ "chave nЦo encontrada no banco de dados de confianГa, procurando no anel\n" +#~ "chave nЦo encontrada no banco de dados de confiabilidade, procurando no " +#~ "chaveiro\n" #~ msgid "key not in ring: %s\n" -#~ msgstr "chave nЦo encontrada no anel: %s\n" +#~ msgstr "chave nЦo encontrada no chaveiro: %s\n" #~ msgid "Oops: key is now in trustdb???\n" -#~ msgstr "Oops: agora a chave estА no banco de dados de confianГa???\n" +#~ msgstr "Oops: agora a chave estА no banco de dados de confiabilidade???\n" #~ msgid "insert trust record failed: %s\n" #~ msgstr "inserГЦo de registro de confianГa falhou: %s\n" diff -urN gnupg-0.9.7/po/ru.po gnupg-0.9.8/po/ru.po --- gnupg-0.9.7/po/ru.po Sun May 23 20:02:52 1999 +++ gnupg-0.9.8/po/ru.po Sat Jun 26 13:07:31 1999 @@ -9,7 +9,7 @@ # QingLong (couldn't send an email to let you know) msgid "" msgstr "" -"POT-Creation-Date: 1999-05-23 15:36+0200\n" +"POT-Creation-Date: 1999-06-26 11:22+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck \n" @@ -36,14 +36,22 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "" -#: util/miscutil.c:156 +#: util/miscutil.c:156 util/miscutil.c:173 msgid "yes" msgstr "да(y)" -#: util/miscutil.c:157 +#: util/miscutil.c:157 util/miscutil.c:175 msgid "yY" msgstr "yY" +#: g10/keyedit.c:559 util/miscutil.c:174 +msgid "quit" +msgstr "выход" + +#: util/miscutil.c:176 +msgid "qQ" +msgstr "" + #: util/errors.c:54 #, fuzzy msgid "general error" @@ -311,7 +319,7 @@ "НЕ ПОЛЬЗУЙТЕСЬ ДАННЫМИ СОЗДАННЫМИ ЭТОЙ ПРОГРАММОЙ!\n" "\n" -#: cipher/rndlinux.c:110 +#: cipher/rndlinux.c:135 #, c-format msgid "" "\n" @@ -322,7 +330,7 @@ "Недостаточно случайных данных. Пожалуйста, поделайте что-нибудь, чтобы\n" "ОС могла набрать дополнительные случайные числа! (нужно еще %d байт)\n" -#: g10/g10.c:165 +#: g10/g10.c:174 msgid "" "@Commands:\n" " " @@ -330,136 +338,136 @@ "@Команды:\n" " " -#: g10/g10.c:167 +#: g10/g10.c:176 #, fuzzy msgid "|[file]|make a signature" msgstr "|[файл]|создать подпись" -#: g10/g10.c:168 +#: g10/g10.c:177 #, fuzzy msgid "|[file]|make a clear text signature" msgstr "|[файл]|создать текстовую подпись" -#: g10/g10.c:169 +#: g10/g10.c:178 msgid "make a detached signature" msgstr "создать отдельную подпись" -#: g10/g10.c:170 +#: g10/g10.c:179 msgid "encrypt data" msgstr "зашифровать данные" -#: g10/g10.c:171 +#: g10/g10.c:180 msgid "encryption only with symmetric cipher" msgstr "зашифровать симметричным алгоритмом" -#: g10/g10.c:172 +#: g10/g10.c:181 msgid "store only" msgstr "только сохранить" -#: g10/g10.c:173 +#: g10/g10.c:182 msgid "decrypt data (default)" msgstr "расшифровать данные (по умолчанию)" -#: g10/g10.c:174 +#: g10/g10.c:183 msgid "verify a signature" msgstr "проверить подпись" -#: g10/g10.c:175 +#: g10/g10.c:184 msgid "list keys" msgstr "список ключей" -#: g10/g10.c:177 +#: g10/g10.c:186 msgid "list keys and signatures" msgstr "список ключей и подписей" -#: g10/g10.c:178 +#: g10/g10.c:187 msgid "check key signatures" msgstr "проверить подпись на ключе" -#: g10/g10.c:179 +#: g10/g10.c:188 msgid "list keys and fingerprints" msgstr "список ключей с их \"отпечатками пальцев\"" -#: g10/g10.c:180 +#: g10/g10.c:189 msgid "list secret keys" msgstr "список секретных ключей" -#: g10/g10.c:181 +#: g10/g10.c:190 msgid "generate a new key pair" msgstr "сгенерировать новую пару ключей (открытый и секретный)" -#: g10/g10.c:182 +#: g10/g10.c:191 msgid "remove key from the public keyring" msgstr "удалить ключ со связки" -#: g10/g10.c:183 +#: g10/g10.c:192 msgid "sign or edit a key" msgstr "подписать или редактировать ключ" -#: g10/g10.c:184 +#: g10/g10.c:193 msgid "generate a revocation certificate" msgstr "сгенерировать отзывающий сертификат" -#: g10/g10.c:185 +#: g10/g10.c:194 msgid "export keys" msgstr "экспортировать ключи" -#: g10/g10.c:186 +#: g10/g10.c:195 msgid "export keys to a key server" msgstr "" -#: g10/g10.c:187 +#: g10/g10.c:196 msgid "import keys from a key server" msgstr "" -#: g10/g10.c:190 +#: g10/g10.c:199 msgid "import/merge keys" msgstr "импортировать/добавить ключи" -#: g10/g10.c:192 +#: g10/g10.c:201 msgid "list only the sequence of packets" msgstr "напечатать только последовательность пакетов" -#: g10/g10.c:194 +#: g10/g10.c:203 #, fuzzy msgid "export the ownertrust values" msgstr "экспортировать параметры доверия\n" -#: g10/g10.c:196 +#: g10/g10.c:205 #, fuzzy msgid "import ownertrust values" msgstr "импортировать параметры доверия\n" -#: g10/g10.c:198 +#: g10/g10.c:207 #, fuzzy msgid "|[NAMES]|update the trust database" msgstr "|[ИМЕНА]|проверить базу данных доверия" -#: g10/g10.c:200 +#: g10/g10.c:209 msgid "|[NAMES]|check the trust database" msgstr "|[ИМЕНА]|проверить базу данных доверия" -#: g10/g10.c:201 +#: g10/g10.c:210 msgid "fix a corrupted trust database" msgstr "исправить разрушенную базу данных доверия" -#: g10/g10.c:202 +#: g10/g10.c:211 msgid "De-Armor a file or stdin" msgstr "Декодировать stdin или файл из ASCII-представления" -#: g10/g10.c:203 +#: g10/g10.c:212 msgid "En-Armor a file or stdin" msgstr "Закодировать stdin или файл в ASCII-представление" -#: g10/g10.c:204 +#: g10/g10.c:213 msgid "|algo [files]|print message digests" msgstr "|algo [files]|напечатать дайджест сообщения" -#: g10/g10.c:205 +#: g10/g10.c:214 msgid "print all message digests" msgstr "напечатать все дайджесты сообщения" -#: g10/g10.c:211 +#: g10/g10.c:220 msgid "" "@\n" "Options:\n" @@ -469,157 +477,169 @@ "Параметры:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:222 msgid "create ascii armored output" msgstr "вывод в ASCII-представлении" -#: g10/g10.c:214 +#: g10/g10.c:223 #, fuzzy msgid "|NAME|encrypt for NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:218 +#: g10/g10.c:227 msgid "use this user-id to sign or decrypt" msgstr "" "использовать указанный идентификатор пользователя для подписи или расшифровки" -#: g10/g10.c:219 +#: g10/g10.c:228 msgid "|N|set compress level N (0 disables)" msgstr "|N|установить уровень сжатия (0 - не сжимать)" -#: g10/g10.c:221 +#: g10/g10.c:230 msgid "use canonical text mode" msgstr "использовать канонический текстовый режим" -#: g10/g10.c:222 +#: g10/g10.c:231 msgid "use as output file" msgstr "использовать в качестве выходного файла" -#: g10/g10.c:223 +#: g10/g10.c:232 msgid "verbose" msgstr "многословный" -#: g10/g10.c:224 +#: g10/g10.c:233 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:225 +#: g10/g10.c:234 +msgid "don't use the terminal at all" +msgstr "" + +#: g10/g10.c:235 #, fuzzy msgid "force v3 signatures" msgstr "проверить подпись на ключе" -#: g10/g10.c:226 +#: g10/g10.c:236 #, fuzzy msgid "always use a MDC for encryption" msgstr "использовать указанный идентификатор пользователя для шифрования" -#: g10/g10.c:227 +#: g10/g10.c:237 msgid "do not make any changes" msgstr "Keine wirklichen дnderungen durchfЭhren" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:229 +#: g10/g10.c:239 msgid "batch mode: never ask" msgstr "пакетный режим: ничего не спрашивать" -#: g10/g10.c:230 +#: g10/g10.c:240 msgid "assume yes on most questions" msgstr "отвечать \"да\" на большинство вопросов" -#: g10/g10.c:231 +#: g10/g10.c:241 msgid "assume no on most questions" msgstr "отвечать \"нет\" на большинство вопросов" -#: g10/g10.c:232 +#: g10/g10.c:242 msgid "add this keyring to the list of keyrings" msgstr "добавить эту связку к списку связок ключей" -#: g10/g10.c:233 +#: g10/g10.c:243 msgid "add this secret keyring to the list" msgstr "добавить эту секретную связку к списку связок ключей" -#: g10/g10.c:234 +#: g10/g10.c:244 msgid "|NAME|use NAME as default secret key" msgstr "|ИМЯ|использовать ИМЯ в качестве секретного ключа по умолчанию" -#: g10/g10.c:235 +#: g10/g10.c:245 msgid "|HOST|use this keyserver to lookup keys" msgstr "" -#: g10/g10.c:236 +#: g10/g10.c:246 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:237 +#: g10/g10.c:247 msgid "read options from file" msgstr "читать параметры из файла" -#: g10/g10.c:239 +#: g10/g10.c:249 msgid "set debugging flags" msgstr "установить отладочные флаги" -#: g10/g10.c:240 +#: g10/g10.c:250 msgid "enable full debugging" msgstr "разрешить всю отладку" -#: g10/g10.c:241 +#: g10/g10.c:251 msgid "|FD|write status info to this FD" msgstr "|FD| записывать информацию о состоянии в дескриптор (FD)" -#: g10/g10.c:242 +#: g10/g10.c:252 msgid "do not write comment packets" msgstr "не писать пакеты с комментариями" -#: g10/g10.c:243 +#: g10/g10.c:253 msgid "(default is 1)" msgstr "(по умолчанию 1)" -#: g10/g10.c:244 +#: g10/g10.c:254 msgid "(default is 3)" msgstr "(по умолчанию 3)" -#: g10/g10.c:246 +#: g10/g10.c:256 #, fuzzy msgid "|FILE|load extension module FILE" msgstr "|ФАЙЛ|загрузить ФАЙЛ с расширяющими модулями" -#: g10/g10.c:247 +#: g10/g10.c:257 msgid "emulate the mode described in RFC1991" msgstr "эмулировать режим описанный в RFC1991" -#: g10/g10.c:248 +#: g10/g10.c:258 +msgid "set all packet, cipher and digest options to OpenPGP behavior" +msgstr "" + +#: g10/g10.c:259 #, fuzzy msgid "|N|use passphrase mode N" msgstr "|N|использовать ключевую фразу режима N\n" -#: g10/g10.c:250 +#: g10/g10.c:261 #, fuzzy msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ для ключевых фраз" -#: g10/g10.c:252 +#: g10/g10.c:263 #, fuzzy msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ для ключевых фраз" -#: g10/g10.c:253 +#: g10/g10.c:264 msgid "|NAME|use cipher algorithm NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:254 +#: g10/g10.c:265 msgid "|NAME|use message digest algorithm NAME" msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ" -#: g10/g10.c:255 +#: g10/g10.c:266 msgid "|N|use compress algorithm N" msgstr "|N|использовать алгоритм сжатия N" -#: g10/g10.c:256 +#: g10/g10.c:267 msgid "throw keyid field of encrypted packets" msgstr "выбрасывать поле keyid у зашифрованных пакетов" -#: g10/g10.c:258 +#: g10/g10.c:268 +msgid "|NAME=VALUE|use this notation data" +msgstr "" + +#: g10/g10.c:270 #, fuzzy msgid "" "@\n" @@ -640,17 +660,17 @@ " --list-keys [names] показать список ключей\n" " --fingerprint [names] показать \"отпечатки пальцев\" ключей\n" -#: g10/g10.c:327 +#: g10/g10.c:347 msgid "Please report bugs to .\n" msgstr "" "Пожалуйста, отправляйте сообщения об ошибках по адресу " ".\n" -#: g10/g10.c:331 +#: g10/g10.c:351 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Использование: gpg [параметры] [файлы] (-h для помощи)" -#: g10/g10.c:334 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -660,7 +680,7 @@ "подписывает, проверяет подписи, шифрует или расшифровывает\n" "режим работы зависит от входных данных\n" -#: g10/g10.c:339 +#: g10/g10.c:359 msgid "" "\n" "Supported algorithms:\n" @@ -668,151 +688,174 @@ "\n" "Поддерживаемые алгоритмы:\n" -#: g10/g10.c:413 +#: g10/g10.c:433 msgid "usage: gpg [options] " msgstr "Использование: gpg [параметры] " -#: g10/g10.c:453 +#: g10/g10.c:473 msgid "conflicting commands\n" msgstr "WidersprЭchliche Kommandos\n" -#: g10/g10.c:580 +#: g10/g10.c:605 #, fuzzy, c-format msgid "NOTE: no default option file `%s'\n" msgstr "замечание: файл параметров по умолчанию `%s' отсутствует\n" -#: g10/g10.c:584 +#: g10/g10.c:609 #, c-format msgid "option file `%s': %s\n" msgstr "файл параметров `%s': %s\n" -#: g10/g10.c:591 +#: g10/g10.c:616 #, c-format msgid "reading options from `%s'\n" msgstr "читаются параметры из `%s'\n" -#: g10/g10.c:737 +#: g10/g10.c:782 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "Недопустимый символ в комментарии.\n" -#: g10/g10.c:780 g10/g10.c:792 +#: g10/g10.c:827 g10/g10.c:839 msgid "selected cipher algorithm is invalid\n" msgstr "выбран недопустимый алгоритм шифрования\n" -#: g10/g10.c:786 g10/g10.c:798 +#: g10/g10.c:833 g10/g10.c:845 msgid "selected digest algorithm is invalid\n" msgstr "выбран недопустимый дайджест-алгоритм\n" -#: g10/g10.c:801 +#: g10/g10.c:849 +msgid "the given policy URL is invalid\n" +msgstr "" + +#: g10/g10.c:852 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "алгоритм упаковки может иметь значения от %d до %d\n" -#: g10/g10.c:803 +#: g10/g10.c:854 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed должен быть больше 0\n" -#: g10/g10.c:805 +#: g10/g10.c:856 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed должен быть больше 1\n" -#: g10/g10.c:807 +#: g10/g10.c:858 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:810 +#: g10/g10.c:861 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "замечание: простой S2K режим (0) очень не рекомендуется\n" -#: g10/g10.c:814 +#: g10/g10.c:865 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "недопустимый режим S2K: должен быть 0, 1 или 3\n" -#: g10/g10.c:891 +#: g10/g10.c:942 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Ошибка инициализации базы данных доверия: %s\n" -#: g10/g10.c:897 +#: g10/g10.c:948 msgid "--store [filename]" msgstr "--store [имя файла]" -#: g10/g10.c:904 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [имя файла]" -#: g10/g10.c:912 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [имя файла]" -#: g10/g10.c:925 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [имя файла]" -#: g10/g10.c:938 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [имя файла]" -#: g10/g10.c:952 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [имя файла]" -#: g10/g10.c:964 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [имя файла]" -#: g10/g10.c:973 +#: g10/g10.c:1024 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key имя-пользователя" -#: g10/g10.c:987 +#: g10/g10.c:1038 msgid "--delete-secret-key username" msgstr "--delete-secret-key имя-пользователя" -#: g10/g10.c:990 +#: g10/g10.c:1041 msgid "--delete-key username" msgstr "--delete-key имя-пользователя" -#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311 +#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "невозможно открыть файл `%s': %s\n" -#: g10/g10.c:1024 +#: g10/g10.c:1075 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [идентификатор пользователя] [связка ключей]" -#: g10/g10.c:1083 +#: g10/g10.c:1134 #, c-format msgid "dearmoring failed: %s\n" msgstr "ошибка декодирования: %s\n" -#: g10/g10.c:1091 +#: g10/g10.c:1142 #, c-format msgid "enarmoring failed: %s\n" msgstr "ошибка кодирования: %s\n" -#: g10/g10.c:1157 +#: g10/g10.c:1208 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "недопустимый хэш-алгоритм `%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1283 msgid "[filename]" msgstr "[имя файла]" -#: g10/g10.c:1236 +#: g10/g10.c:1287 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "невозможно открыть файл `%s'\n" +#: g10/g10.c:1457 +msgid "" +"the first character of a notation name must be a letter or an underscore\n" +msgstr "" + +#: g10/g10.c:1463 +msgid "" +"a notation name must have only letters, digits, dots or underscores and end " +"with an '='\n" +msgstr "" + +#: g10/g10.c:1469 +msgid "dots in a notation name must be surrounded by other characters\n" +msgstr "" + +#: g10/g10.c:1477 +msgid "a notation value must not use any control characters\n" +msgstr "" + #: g10/armor.c:296 #, fuzzy, c-format msgid "armor: %s\n" @@ -1080,12 +1123,17 @@ msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Нет уверенности, что подпись принадлежит владельцу.\n" -#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673 +#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: пропущен: %s\n" -#: g10/pkclist.c:591 +#: g10/pkclist.c:588 g10/pkclist.c:687 +#, c-format +msgid "%s: skipped: public key already present\n" +msgstr "" + +#: g10/pkclist.c:611 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1094,20 +1142,20 @@ "\"-r\").\n" "\n" -#: g10/pkclist.c:596 +#: g10/pkclist.c:616 msgid "Enter the user ID: " msgstr "Введите идентификатор пользователя: " -#: g10/pkclist.c:607 +#: g10/pkclist.c:627 msgid "No such user ID.\n" msgstr "Нет такого идентификатора пользователя.\n" -#: g10/pkclist.c:653 +#: g10/pkclist.c:673 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: ошибка при проверке ключа: %s\n" -#: g10/pkclist.c:679 +#: g10/pkclist.c:711 msgid "no valid addressees\n" msgstr "нет допустимых адресов\n" @@ -1353,7 +1401,7 @@ "Для защиты вашего ключа нужна ключевая фраза.\n" "\n" -#: g10/keyedit.c:433 g10/keygen.c:748 +#: g10/keyedit.c:455 g10/keygen.c:748 msgid "passphrase not correctly repeated; try again.\n" msgstr "ключевая фраза не была воспроизведена, попробуйте снова.\n" @@ -1392,7 +1440,7 @@ #: g10/keygen.c:859 #, fuzzy -msgid "Key generation cancelled.\n" +msgid "Key generation canceled.\n" msgstr "Генерация ключа отменена: %s\n" #: g10/keygen.c:869 @@ -1425,7 +1473,7 @@ msgid "Key generation failed: %s\n" msgstr "Генерация ключа не удалась: %s\n" -#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52 +#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105 #, fuzzy, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1433,7 +1481,7 @@ "открытый ключ сгенерирован в будущем (искривление времени или неправильно " "установлены часы)\n" -#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54 +#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107 #, fuzzy, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1446,7 +1494,7 @@ msgid "Really create? " msgstr "Действительно создать? " -#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467 +#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467 #: g10/tdbio.c:528 #, c-format msgid "%s: can't open: %s\n" @@ -1467,7 +1515,7 @@ msgid "reading from `%s'\n" msgstr "Читается из `%s'\n" -#: g10/encode.c:417 +#: g10/encode.c:431 #, fuzzy, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s зашифровано для: %s\n" @@ -1603,19 +1651,19 @@ msgid "no default public keyring\n" msgstr "нет связки открытых ключей по умолчанию\n" -#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501 +#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "записывается в `%s'\n" -#: g10/import.c:379 g10/import.c:435 -#, fuzzy -msgid "can't lock keyring `%': %s\n" +#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#, fuzzy, c-format +msgid "can't lock keyring `%s': %s\n" msgstr "невозможно заблокировать связку открытых ключей: %s\n" -#: g10/import.c:382 -#, fuzzy -msgid "error writing keyring `%': %s\n" +#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648 +#, fuzzy, c-format +msgid "error writing keyring `%s': %s\n" msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" #: g10/import.c:387 @@ -1638,11 +1686,6 @@ msgid "key %08lX: can't read original keyblock: %s\n" msgstr "ключ %08lX: невозможно прочитать original keyblock: %s\n" -#: g10/import.c:438 g10/import.c:547 g10/import.c:648 -#, fuzzy, c-format -msgid "error writing keyring `%s': %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - #: g10/import.c:444 #, c-format msgid "key %08lX: 1 new user-id\n" @@ -1678,11 +1721,6 @@ msgid "key %08lX: not changed\n" msgstr "ключ %08lX: не изменен\n" -#: g10/import.c:544 g10/import.c:645 -#, fuzzy, c-format -msgid "can't lock keyring `%s': %s\n" -msgstr "невозможно заблокировать связку открытых ключей: %s\n" - #: g10/import.c:552 #, c-format msgid "key %08lX: secret key imported\n" @@ -1785,56 +1823,56 @@ msgid "key %08lX: our copy has no self-signature\n" msgstr "ключ %08lX: наша копия не имеет само-подписи\n" -#: g10/keyedit.c:91 +#: g10/keyedit.c:92 #, c-format msgid "%s: user not found\n" msgstr "%s: пользователь не найден\n" -#: g10/keyedit.c:177 +#: g10/keyedit.c:153 msgid "[revocation]" msgstr "" -#: g10/keyedit.c:178 +#: g10/keyedit.c:154 #, fuzzy msgid "[self-signature]" msgstr "[само-подпись]\n" -#: g10/keyedit.c:196 +#: g10/keyedit.c:218 #, fuzzy msgid "1 bad signature\n" msgstr "1 плохая подпись\n" -#: g10/keyedit.c:198 +#: g10/keyedit.c:220 #, c-format msgid "%d bad signatures\n" msgstr "%d плохих подписей\n" -#: g10/keyedit.c:200 +#: g10/keyedit.c:222 #, fuzzy msgid "1 signature not checked due to a missing key\n" msgstr "1 подпись не проверена из-за отсутствия ключа\n" -#: g10/keyedit.c:202 +#: g10/keyedit.c:224 #, fuzzy, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%s подписей не проверено из-за отсутствия ключей\n" -#: g10/keyedit.c:204 +#: g10/keyedit.c:226 #, fuzzy msgid "1 signature not checked due to an error\n" msgstr "1 подпись не проверена из-за ошибки\n" -#: g10/keyedit.c:206 +#: g10/keyedit.c:228 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%s подписей не проверено из-за ошибок\n" -#: g10/keyedit.c:208 +#: g10/keyedit.c:230 #, fuzzy msgid "1 user id without valid self-signature detected\n" msgstr "обнаружен 1 идентификатор пользователя без допустимой само-подписи\n" -#: g10/keyedit.c:210 +#: g10/keyedit.c:232 #, c-format msgid "%d user ids without valid self-signatures detected\n" msgstr "" @@ -1842,52 +1880,52 @@ #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. -#: g10/keyedit.c:290 +#: g10/keyedit.c:312 #, fuzzy, c-format msgid "Already signed by key %08lX\n" msgstr "Уже подписано ключом %08lX.\n" -#: g10/keyedit.c:298 +#: g10/keyedit.c:320 #, fuzzy, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Нечего подписывать ключам %08lX\n" -#: g10/keyedit.c:307 +#: g10/keyedit.c:329 #, fuzzy msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" msgstr "Вы действительно уверены, что хотите подписать этот ключ своим:\n" -#: g10/keyedit.c:316 +#: g10/keyedit.c:338 msgid "" "The signature will be marked as non-exportable.\n" "\n" msgstr "" -#: g10/keyedit.c:321 +#: g10/keyedit.c:343 msgid "Really sign? " msgstr "Действительно подписать? " -#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75 +#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128 #, fuzzy, c-format msgid "signing failed: %s\n" msgstr "ошибка подписывания: %s\n" -#: g10/keyedit.c:400 +#: g10/keyedit.c:422 msgid "This key is not protected.\n" msgstr "Этот ключ не защищен.\n" -#: g10/keyedit.c:403 +#: g10/keyedit.c:425 msgid "Key is protected.\n" msgstr "Этот ключ защищен.\n" -#: g10/keyedit.c:420 +#: g10/keyedit.c:442 #, c-format msgid "Can't edit this key: %s\n" msgstr "Невозможно редактировать этот ключ: %s\n" -#: g10/keyedit.c:425 +#: g10/keyedit.c:447 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -1895,7 +1933,7 @@ "Введите новую ключевую фразу для этого секретного ключа.\n" "\n" -#: g10/keyedit.c:437 +#: g10/keyedit.c:459 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -1903,382 +1941,421 @@ "Вы не хотите ключевую фразу - это скорее всего *плохая* идея!\n" "\n" -#: g10/keyedit.c:440 +#: g10/keyedit.c:462 msgid "Do you really want to do this? " msgstr "Вы действительно этого хотите? " -#: g10/keyedit.c:501 +#: g10/keyedit.c:523 msgid "moving a key signature to the correct place\n" msgstr "" -#: g10/keyedit.c:537 -msgid "quit" -msgstr "выход" - -#: g10/keyedit.c:537 +#: g10/keyedit.c:559 msgid "quit this menu" msgstr "выйти из меню" -#: g10/keyedit.c:538 +#: g10/keyedit.c:560 msgid "q" msgstr "" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save" msgstr "записать" -#: g10/keyedit.c:539 +#: g10/keyedit.c:561 msgid "save and quit" msgstr "записать и выйти" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "help" msgstr "помощь" -#: g10/keyedit.c:540 +#: g10/keyedit.c:562 msgid "show this help" msgstr "показать помощь" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 msgid "fpr" msgstr "" -#: g10/keyedit.c:542 +#: g10/keyedit.c:564 #, fuzzy msgid "show fingerprint" msgstr "показать \"отпечаток пальца\"" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 #, fuzzy msgid "list" msgstr "список" -#: g10/keyedit.c:543 +#: g10/keyedit.c:565 #, fuzzy msgid "list key and user ids" msgstr "список ключей и идентификаторов пользователей" -#: g10/keyedit.c:544 +#: g10/keyedit.c:566 msgid "l" msgstr "" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "uid" msgstr "" -#: g10/keyedit.c:545 +#: g10/keyedit.c:567 msgid "select user id N" msgstr "выбрать идентификатор пользователя N" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "key" msgstr "ключ" -#: g10/keyedit.c:546 +#: g10/keyedit.c:568 msgid "select secondary key N" msgstr "выбрать дополнительный ключ N" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 msgid "check" msgstr "проверка" -#: g10/keyedit.c:547 +#: g10/keyedit.c:569 #, fuzzy msgid "list signatures" msgstr "список ключей и их подписей" -#: g10/keyedit.c:548 +#: g10/keyedit.c:570 msgid "c" msgstr "" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 msgid "sign" msgstr "подписать" -#: g10/keyedit.c:549 +#: g10/keyedit.c:571 #, fuzzy msgid "sign the key" msgstr "подписать ключ" -#: g10/keyedit.c:550 +#: g10/keyedit.c:572 msgid "s" msgstr "" -#: g10/keyedit.c:551 +#: g10/keyedit.c:573 #, fuzzy msgid "lsign" msgstr "подписать" -#: g10/keyedit.c:551 +#: g10/keyedit.c:573 #, fuzzy msgid "sign the key locally" msgstr "подписать ключ" -#: g10/keyedit.c:552 +#: g10/keyedit.c:574 msgid "debug" msgstr "отладка" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "adduid" msgstr "" -#: g10/keyedit.c:553 +#: g10/keyedit.c:575 msgid "add a user id" msgstr "добавить идентификатор пользователя" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 msgid "deluid" msgstr "" -#: g10/keyedit.c:554 +#: g10/keyedit.c:576 #, fuzzy msgid "delete user id" msgstr "удалить идентификатор пользователя" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 msgid "addkey" msgstr "" -#: g10/keyedit.c:555 +#: g10/keyedit.c:577 #, fuzzy msgid "add a secondary key" msgstr "добавить дополнительный ключ" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delkey" msgstr "" -#: g10/keyedit.c:556 +#: g10/keyedit.c:578 msgid "delete a secondary key" msgstr "удалить дополнительный ключ" -#: g10/keyedit.c:557 +#: g10/keyedit.c:579 +#, fuzzy +msgid "delsig" +msgstr "подписать" + +#: g10/keyedit.c:579 +#, fuzzy +msgid "delete signatures" +msgstr "список ключей и их подписей" + +#: g10/keyedit.c:580 msgid "expire" msgstr "" -#: g10/keyedit.c:557 +#: g10/keyedit.c:580 #, fuzzy msgid "change the expire date" msgstr "изменить ключевую фразу" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle" msgstr "" -#: g10/keyedit.c:558 +#: g10/keyedit.c:581 msgid "toggle between secret and public key listing" msgstr "переключить между списком секретных и открытых ключей" -#: g10/keyedit.c:560 +#: g10/keyedit.c:583 msgid "t" msgstr "" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "pref" msgstr "" -#: g10/keyedit.c:561 +#: g10/keyedit.c:584 msgid "list preferences" msgstr "" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 msgid "passwd" msgstr "" -#: g10/keyedit.c:562 +#: g10/keyedit.c:585 #, fuzzy msgid "change the passphrase" msgstr "изменить ключевую фразу" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "trust" msgstr "" -#: g10/keyedit.c:563 +#: g10/keyedit.c:586 msgid "change the ownertrust" msgstr "изменить параметры доверия" -#: g10/keyedit.c:564 +#: g10/keyedit.c:587 #, fuzzy msgid "revsig" msgstr "подписать" -#: g10/keyedit.c:564 +#: g10/keyedit.c:587 #, fuzzy msgid "revoke signatures" msgstr "проверить подпись на ключе" -#: g10/keyedit.c:565 +#: g10/keyedit.c:588 #, fuzzy msgid "revkey" msgstr "ключ" -#: g10/keyedit.c:565 +#: g10/keyedit.c:588 #, fuzzy msgid "revoke a secondary key" msgstr "удалить дополнительный ключ" -#: g10/keyedit.c:584 +#: g10/keyedit.c:607 msgid "can't do that in batchmode\n" msgstr "невозможно сделать это в пакетном режиме.\n" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:613 +#: g10/keyedit.c:636 #, fuzzy msgid "Secret key is available.\n" msgstr "Имеется секретный ключ.\n" -#: g10/keyedit.c:642 +#: g10/keyedit.c:665 #, fuzzy msgid "Command> " msgstr "Команда> " -#: g10/keyedit.c:669 +#: g10/keyedit.c:692 #, fuzzy msgid "Need the secret key to do this.\n" msgstr "Чтобы это сделать, нужен секретный ключ.\n" -#: g10/keyedit.c:691 +#: g10/keyedit.c:714 msgid "Save changes? " msgstr "Сохранить изменения? " -#: g10/keyedit.c:694 +#: g10/keyedit.c:717 msgid "Quit without saving? " msgstr "Выйти без сохранения? " -#: g10/keyedit.c:704 +#: g10/keyedit.c:727 #, fuzzy, c-format msgid "update failed: %s\n" msgstr "обновление не удалось: %s\n" -#: g10/keyedit.c:711 +#: g10/keyedit.c:734 #, fuzzy, c-format msgid "update secret failed: %s\n" msgstr "обновление секрета не удалось: %s\n" -#: g10/keyedit.c:718 +#: g10/keyedit.c:741 msgid "Key not changed so no update needed.\n" msgstr "Ключ не изменился, обновление не нужно.\n" -#: g10/keyedit.c:721 g10/keyedit.c:780 +#: g10/keyedit.c:744 g10/keyedit.c:803 #, fuzzy, c-format msgid "update of trustdb failed: %s\n" msgstr "обновление базы данных доверия не удалось: %s\n" -#: g10/keyedit.c:754 +#: g10/keyedit.c:777 msgid "Really sign all user ids? " msgstr "Действительно подписать все идентификаторы пользователя? " -#: g10/keyedit.c:755 +#: g10/keyedit.c:778 msgid "Hint: Select the user ids to sign\n" msgstr "" "Подсказка: выберите идентификаторы пользователя которые хотите подписать\n" -#: g10/keyedit.c:791 +#: g10/keyedit.c:814 g10/keyedit.c:835 msgid "You must select at least one user id.\n" msgstr "Вы должны выбрать хотя бы один идентификатор пользователя.\n" -#: g10/keyedit.c:793 +#: g10/keyedit.c:816 msgid "You can't delete the last user id!\n" msgstr "Вы не можете удалить последний идентификатор пользователя!\n" -#: g10/keyedit.c:796 +#: g10/keyedit.c:819 #, fuzzy msgid "Really remove all selected user ids? " msgstr "Действительно удалить все выбранные идентификаторы пользователя? " -#: g10/keyedit.c:797 +#: g10/keyedit.c:820 #, fuzzy msgid "Really remove this user id? " msgstr "Действительно удалить этот идентификатор пользователя? " -#: g10/keyedit.c:820 g10/keyedit.c:842 +#: g10/keyedit.c:858 g10/keyedit.c:880 msgid "You must select at least one key.\n" msgstr "Вы должны выбрать хотя бы один ключ.\n" -#: g10/keyedit.c:824 +#: g10/keyedit.c:862 #, fuzzy msgid "Do you really want to delete the selected keys? " msgstr "Вы действительно хотите удалить выбранные ключи? " -#: g10/keyedit.c:825 +#: g10/keyedit.c:863 #, fuzzy msgid "Do you really want to delete this key? " msgstr "Вы действительно хотите удалить этот ключ? " -#: g10/keyedit.c:846 +#: g10/keyedit.c:884 #, fuzzy msgid "Do you really want to revoke the selected keys? " msgstr "Вы действительно хотите удалить выбранные ключи? " -#: g10/keyedit.c:847 +#: g10/keyedit.c:885 #, fuzzy msgid "Do you really want to revoke this key? " msgstr "Вы действительно хотите удалить этот ключ? " -#: g10/keyedit.c:901 +#: g10/keyedit.c:939 msgid "Invalid command (try \"help\")\n" msgstr "Недопустимая команда (попробуйте \"help\")\n" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 +msgid "Delete this good signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1298 +msgid "Delete this invalid signature? (y/N/q)" +msgstr "" + +#: g10/keyedit.c:1302 +#, fuzzy +msgid "Delete this unknown signature? (y/N/q)" +msgstr "сгенерировать отзывающий сертификат" + +#: g10/keyedit.c:1308 +#, fuzzy +msgid "Really delete this self-signature? (y/N)" +msgstr "сгенерировать отзывающий сертификат" + +#: g10/keyedit.c:1322 +#, fuzzy, c-format +msgid "Deleted %d signature.\n" +msgstr "%d плохих подписей\n" + +#: g10/keyedit.c:1323 +#, fuzzy, c-format +msgid "Deleted %d signatures.\n" +msgstr "%d плохих подписей\n" + +#: g10/keyedit.c:1326 +#, fuzzy +msgid "Nothing deleted.\n" +msgstr "ВНИМАНИЕ: Используется ключ к которому нет доверия!\n" + +#: g10/keyedit.c:1395 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:1299 +#: g10/keyedit.c:1401 #, fuzzy msgid "Please select at most one secondary key.\n" msgstr "Вы должны выбрать хотя бы один ключ.\n" -#: g10/keyedit.c:1303 -msgid "Changing exiration time for a secondary key.\n" +#: g10/keyedit.c:1405 +msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:1305 -msgid "Changing exiration time for the primary key.\n" +#: g10/keyedit.c:1407 +msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1448 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:1362 +#: g10/keyedit.c:1464 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:1422 +#: g10/keyedit.c:1524 #, c-format msgid "No user id with index %d\n" msgstr "Нет идентификатора пользователя с индексом %d\n" -#: g10/keyedit.c:1468 +#: g10/keyedit.c:1570 #, c-format msgid "No secondary key with index %d\n" msgstr "Нет дополнительного ключа с индексом %d\n" -#: g10/keyedit.c:1566 +#: g10/keyedit.c:1668 #, fuzzy msgid "user ID: \"" msgstr "Введите идентификатор пользователя: " -#: g10/keyedit.c:1569 +#: g10/keyedit.c:1671 #, fuzzy, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" msgstr "Нечего подписывать ключам %08lX\n" -#: g10/keyedit.c:1573 +#: g10/keyedit.c:1675 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N)" msgstr "сгенерировать отзывающий сертификат" -#: g10/keyedit.c:1653 +#: g10/keyedit.c:1755 #, fuzzy msgid "Really create the revocation certificates? (y/N)" msgstr "сгенерировать отзывающий сертификат" -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1778 #, fuzzy msgid "no secret key\n" msgstr "Плохой секретный ключ" @@ -2326,38 +2403,51 @@ msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:890 +#: g10/mainproc.c:505 g10/mainproc.c:514 +#, fuzzy +msgid "WARNING: invalid notation data found\n" +msgstr "не найдено допустимых RFC1991 или OpenPGP данных.\n" + +#: g10/mainproc.c:517 +msgid "Notation: " +msgstr "" + +#: g10/mainproc.c:524 +msgid "Policy: " +msgstr "" + +#: g10/mainproc.c:929 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:896 +#: g10/mainproc.c:935 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Подпись сделана %.*s, используя %s ключ %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:922 g10/mainproc.c:933 +#: g10/mainproc.c:961 g10/mainproc.c:972 msgid "BAD signature from \"" msgstr "ПЛОХАЯ подпись от \"" -#: g10/mainproc.c:923 g10/mainproc.c:934 +#: g10/mainproc.c:962 g10/mainproc.c:973 msgid "Good signature from \"" msgstr "Хорошая подпись от \"" -#: g10/mainproc.c:925 +#: g10/mainproc.c:964 msgid " aka \"" msgstr "" -#: g10/mainproc.c:975 +#: g10/mainproc.c:1015 #, c-format msgid "Can't check signature: %s\n" msgstr "Невозможно проверить подпись: %s\n" -#: g10/mainproc.c:1056 +#: g10/mainproc.c:1109 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1114 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -2391,7 +2481,7 @@ msgid "can't handle public key algorithm %d\n" msgstr "невозможно заблокировать связку открытых ключей: %s\n" -#: g10/parse-packet.c:872 +#: g10/parse-packet.c:931 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" @@ -2416,12 +2506,12 @@ msgid " (main key ID %08lX)" msgstr "" -#: g10/passphrase.c:190 +#: g10/passphrase.c:192 #, fuzzy msgid "Enter passphrase: " msgstr "Введите ключевую фразу: %s\n" -#: g10/passphrase.c:194 +#: g10/passphrase.c:196 #, fuzzy msgid "Repeat passphrase: " msgstr "Повторите ключевую фразу: %s\n" @@ -2430,15 +2520,15 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "данные не были сохранены; воспользуйтесь --\"output\" для сохранения\n" -#: g10/plaintext.c:208 +#: g10/plaintext.c:266 msgid "Please enter name of data file: " msgstr "Пожалуйста, введите имя файла данных: " -#: g10/plaintext.c:229 +#: g10/plaintext.c:287 msgid "reading stdin ...\n" msgstr "" -#: g10/plaintext.c:302 +#: g10/plaintext.c:360 #, c-format msgid "can't open signed data `%s'\n" msgstr "невозможно открыть подписанные данные `%s' .\n" @@ -2505,22 +2595,22 @@ msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" -#: g10/sign.c:79 +#: g10/sign.c:132 #, fuzzy, c-format msgid "%s signature from: %s\n" msgstr "ПЛОХАЯ подпись от \"" -#: g10/sign.c:210 g10/sign.c:496 +#: g10/sign.c:263 g10/sign.c:554 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "%s: невозможно открыть: %s\n" -#: g10/sign.c:306 +#: g10/sign.c:361 #, fuzzy msgid "signing:" msgstr "подписать" -#: g10/sign.c:346 +#: g10/sign.c:401 #, fuzzy, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "%s: предупреждение: пустой файл.\n" @@ -2569,7 +2659,7 @@ msgid "%s: directory does not exist!\n" msgstr "" -#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457 +#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457 #, fuzzy, c-format msgid "%s: can't create: %s\n" msgstr "%s: невозможно открыть: %s\n" @@ -2667,7 +2757,7 @@ #: g10/tdbio.c:1630 #, fuzzy -msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n" +msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "База данных доверия разрушена: запустите \"gpgm --fix-trust-db\".\n" #: g10/trustdb.c:163 @@ -3126,17 +3216,22 @@ msgid "Overwrite (y/N)? " msgstr "Переписать (y/N)? " -#: g10/openfile.c:92 +#: g10/openfile.c:97 +#, c-format +msgid "%s: unknown suffix\n" +msgstr "" + +#: g10/openfile.c:122 #, fuzzy msgid "writing to stdout\n" msgstr "записывается в `%s'\n" -#: g10/openfile.c:149 +#: g10/openfile.c:181 #, fuzzy, c-format msgid "assuming signed data in `%s'\n" msgstr "невозможно открыть подписанные данные `%s' .\n" -#: g10/openfile.c:199 +#: g10/openfile.c:231 #, c-format msgid "%s: new options file created\n" msgstr "" @@ -3267,10 +3362,26 @@ msgid "keyedit.remove.subkey.okay" msgstr "" +#: g10/helptext.c:176 +msgid "keyedit.delsig.valid" +msgstr "" + +#: g10/helptext.c:181 +msgid "keyedit.delsig.unknown" +msgstr "" + +#: g10/helptext.c:187 +msgid "keyedit.delsig.invalid" +msgstr "" + +#: g10/helptext.c:191 +msgid "keyedit.delsig.selfsig" +msgstr "" + # ################################ # ####### Help msgids ############ # ################################ -#: g10/helptext.c:175 +#: g10/helptext.c:200 msgid "passphrase.enter" msgstr "" "Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n" @@ -3285,30 +3396,38 @@ "werden,\n" "sind i.d.R. eine gute Wahl" -#: g10/helptext.c:182 +#: g10/helptext.c:207 msgid "passphrase.repeat" msgstr "" "Um sicher zu gehen, daъ Sie sich bei der Eingabe der \"Passphrase\" nicht\n" "vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n" "Эbereinstimmen, wird die \"Passphrase\" akzeptiert." -#: g10/helptext.c:186 +#: g10/helptext.c:211 #, fuzzy msgid "detached_signature.filename" msgstr "имя файла для отдельной подписи" -#: g10/helptext.c:190 +#: g10/helptext.c:215 msgid "openfile.overwrite.okay" msgstr "Вы желаете перезаписать файл (возможна потеря данных)" -#: g10/helptext.c:204 +#: g10/helptext.c:229 msgid "No help available" msgstr "Помощь отсутствует." -#: g10/helptext.c:216 +#: g10/helptext.c:241 #, c-format msgid "No help available for `%s'" msgstr "Помощь для `%s' отсутствует." + +#, fuzzy +#~ msgid "can't lock keyring `%': %s\n" +#~ msgstr "невозможно заблокировать связку открытых ключей: %s\n" + +#, fuzzy +#~ msgid "error writing keyring `%': %s\n" +#~ msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" #~ msgid "can't open file: %s\n" #~ msgstr "невозможно открыть файл: %s\n" diff -urN gnupg-0.9.7/scripts/gnupg.spec gnupg-0.9.8/scripts/gnupg.spec --- gnupg-0.9.7/scripts/gnupg.spec Sun May 23 20:03:12 1999 +++ gnupg-0.9.8/scripts/gnupg.spec Sat Jun 26 13:07:51 1999 @@ -2,7 +2,7 @@ # gnupg -- gnu privacy guard # This is a template. The dist target uses it to create the real file. # -%define version 0.9.7 +%define version 0.9.8 %define name gnupg Summary: GPL public key crypto Name: %{name} @@ -16,9 +16,13 @@ BuildRoot: /tmp/rpmbuild_%{name} %changelog +* Sat May 29 1999 Fabio Coatti +- Some corrections in French description, thanks to +GaКl QuИri * Mon May 17 1999 Fabio Coatti -- Added French description, provided by Christophe Labouisse +- Added French description, provided by +Christophe Labouisse * Thu May 06 1999 Fabio Coatti - Upgraded for 0.9.6 (removed gpgm) @@ -49,9 +53,9 @@ alle specifiche OpenPGP (RFC2440). %description -l fr -GnuPG est remplacement complet et "libre" de PGP. Comme il n'utilise +GnuPG est un remplacement complet et ╚ libre ╩ de PGP. Comme il n'utilise ni IDEA ni RSA il peut Йtre utilisИ sans restriction. GnuPG est conforme -avec la spИcification OpenPGP (RFC2440). +Ю la spИcification OpenPGP (RFC2440). %prep rm -rf $RPM_BUILD_ROOT diff -urN gnupg-0.9.7/scripts/gnupg.spec.in gnupg-0.9.8/scripts/gnupg.spec.in --- gnupg-0.9.7/scripts/gnupg.spec.in Mon May 17 21:49:05 1999 +++ gnupg-0.9.8/scripts/gnupg.spec.in Mon May 31 11:48:57 1999 @@ -16,9 +16,13 @@ BuildRoot: /tmp/rpmbuild_%{name} %changelog +* Sat May 29 1999 Fabio Coatti +- Some corrections in French description, thanks to +GaКl QuИri * Mon May 17 1999 Fabio Coatti -- Added French description, provided by Christophe Labouisse +- Added French description, provided by +Christophe Labouisse * Thu May 06 1999 Fabio Coatti - Upgraded for 0.9.6 (removed gpgm) @@ -49,9 +53,9 @@ alle specifiche OpenPGP (RFC2440). %description -l fr -GnuPG est remplacement complet et "libre" de PGP. Comme il n'utilise +GnuPG est un remplacement complet et ╚ libre ╩ de PGP. Comme il n'utilise ni IDEA ni RSA il peut Йtre utilisИ sans restriction. GnuPG est conforme -avec la spИcification OpenPGP (RFC2440). +Ю la spИcification OpenPGP (RFC2440). %prep rm -rf $RPM_BUILD_ROOT diff -urN gnupg-0.9.7/tools/ChangeLog gnupg-0.9.8/tools/ChangeLog --- gnupg-0.9.7/tools/ChangeLog Thu Dec 10 20:15:37 1998 +++ gnupg-0.9.8/tools/ChangeLog Tue Jun 8 13:36:29 1999 @@ -1,3 +1,8 @@ +Tue Jun 8 13:36:25 CEST 1999 Werner Koch + + * mpicalc.c (main): hex digits may now be lowercase + (do_mulm): new. + Thu Dec 10 20:15:36 CET 1998 Werner Koch * mpicalc.c (main): Moved initialization out of definition. diff -urN gnupg-0.9.7/tools/Makefile.in gnupg-0.9.8/tools/Makefile.in --- gnupg-0.9.7/tools/Makefile.in Sun May 23 20:02:35 1999 +++ gnupg-0.9.8/tools/Makefile.in Sat Jun 26 13:07:17 1999 @@ -70,6 +70,7 @@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@ DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ diff -urN gnupg-0.9.7/tools/mpicalc.c gnupg-0.9.8/tools/mpicalc.c --- gnupg-0.9.7/tools/mpicalc.c Thu Apr 22 16:54:15 1999 +++ gnupg-0.9.8/tools/mpicalc.c Sun Jun 6 20:15:17 1999 @@ -131,6 +131,18 @@ } static void +do_mulm(void) +{ + if( stackidx < 3 ) { + fputs("stack underflow\n", stderr); + return; + } + mpi_mulm( stack[stackidx-3], stack[stackidx-3], + stack[stackidx-2], stack[stackidx-1] ); + stackidx -= 2; +} + +static void do_div(void) { if( stackidx < 2 ) { @@ -237,7 +249,7 @@ while( (c=getc(stdin)) != EOF ) { if( !state ) { /* waiting */ - if( isdigit(c) || (c >='A' && c <= 'F') ) { + if( isdigit(c) ) { state = 1; ungetc(c, stdin); strbuf[0] = '0'; @@ -275,6 +287,9 @@ case '*': do_mul(); break; + case 'm': + do_mulm(); + break; case '/': do_div(); break; @@ -338,7 +353,7 @@ } } else if( state == 1 ) { /* in a number */ - if( !(isdigit(c) || (c >='A' && c <= 'F')) ) { /* store the number */ + if( !isxdigit(c) ) { /* store the number */ state = 0; ungetc(c, stdin); if( stridx < 1000 ) diff -urN gnupg-0.9.7/util/ChangeLog gnupg-0.9.8/util/ChangeLog --- gnupg-0.9.7/util/ChangeLog Sun May 23 14:20:27 1999 +++ gnupg-0.9.8/util/ChangeLog Sat Jun 26 12:16:00 1999 @@ -1,3 +1,37 @@ +Sat Jun 26 12:15:59 CEST 1999 Werner Koch + + + * dotlock.c (create_dotlock): s/uts/utsbuf/ cause there an Amdahl + system with the name UTS (Dave Dykstra). + + * secmem.c (DEFAULT_POOLSIZE): Doubled the size. + +Fri Jun 18 00:18:02 CEST 1999 Michael Roth + + * iobuf.c: file_filter() Detection of EOF on terminals + improved/fixed (see Bug #21). + +Mon Jun 14 21:18:54 CEST 1999 Michael Roth + + * ttyio.c: tty_no_terminal() new. + +Sat Jun 5 15:30:33 CEST 1999 Werner Koch + + * strgutil.c (set_native_charset): Support Latin-2 + +Tue Jun 1 16:01:46 CEST 1999 Werner Koch + + * iobuf.c (iobuf_get_real_fname): Made global and now keep a + copy of the name in the iobuf struct. + +Mon May 31 19:41:10 CEST 1999 Werner Koch + + * iobuf.c (file_filter,block_filter): Speed patches (RИmi). + +Thu May 27 09:40:55 CEST 1999 Werner Koch + + * miscutil.c (answer_is_yes_no_quit): New. + Sun May 23 14:20:22 CEST 1999 Werner Koch * dotlock.c: Tweaked to make it compile under mingw32 diff -urN gnupg-0.9.7/util/Makefile.in gnupg-0.9.8/util/Makefile.in --- gnupg-0.9.7/util/Makefile.in Sun May 23 20:02:20 1999 +++ gnupg-0.9.8/util/Makefile.in Sat Jun 26 13:07:03 1999 @@ -70,6 +70,7 @@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@ DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ diff -urN gnupg-0.9.7/util/dotlock.c gnupg-0.9.8/util/dotlock.c --- gnupg-0.9.7/util/dotlock.c Sun May 23 13:21:41 1999 +++ gnupg-0.9.8/util/dotlock.c Sat Jun 26 10:20:31 1999 @@ -74,7 +74,7 @@ int fd = -1; char pidstr[16]; #ifndef HAVE_DOSISH_SYSTEM - struct utsname uts; + struct utsname utsbuf; #endif const char *nodename; const char *dirpart; @@ -93,10 +93,10 @@ /* fixme: add the hostname to the second line (FQDN or IP addr?) */ /* create a temporary file */ - if( uname( &uts ) ) + if( uname( &utsbuf ) ) nodename = "unknown"; else - nodename = uts.nodename; + nodename = utsbuf.nodename; if( !(dirpart = strrchr( file_to_lock, '/' )) ) { dirpart = "."; diff -urN gnupg-0.9.7/util/iobuf.c gnupg-0.9.8/util/iobuf.c --- gnupg-0.9.7/util/iobuf.c Fri May 21 17:23:47 1999 +++ gnupg-0.9.8/util/iobuf.c Fri Jun 18 07:48:05 1999 @@ -58,7 +58,6 @@ static int underflow(IOBUF a); -static const char *get_real_fname( IOBUF a ); /**************** * Read data from a file into buf which has an allocated length of *LEN. @@ -89,33 +88,34 @@ FILE *fp = a->fp; size_t size = *ret_len; size_t nbytes = 0; - int c, rc = 0; - char *p; + int rc = 0; if( control == IOBUFCTRL_UNDERFLOW ) { assert( size ); /* need a buffer */ - for(; size; size-- ) { - if( (c=getc(fp)) == EOF ) { - if( ferror(fp) && errno != EPIPE ) { - log_error("%s: read error: %s\n", - a->fname, strerror(errno)); - rc = G10ERR_READ_FILE; - } - else if( !nbytes ) - rc = -1; /* okay: we can return EOF now. */ - break; + if ( feof(fp)) { /* On terminals you could easiely read as many EOFs as you call */ + rc = -1; /* fread() or fgetc() repeatly. Every call will block until you press */ + *ret_len = 0; /* CTRL-D. So we catch this case before we call fread() again. */ + } + else { + clearerr( fp ); + nbytes = fread( buf, 1, size, fp ); + if( feof(fp) && !nbytes ) + rc = -1; /* okay: we can return EOF now. */ + else if( ferror(fp) && errno != EPIPE ) { + log_error("%s: read error: %s\n", + a->fname, strerror(errno)); + rc = G10ERR_READ_FILE; } - buf[nbytes++] = c & 0xff; + *ret_len = nbytes; } - *ret_len = nbytes; } else if( control == IOBUFCTRL_FLUSH ) { - for(p=buf; nbytes < size; nbytes++, p++ ) { - if( putc(*p, fp) == EOF ) { - log_error("%s: write error: %s\n", - a->fname, strerror(errno)); + if( size ) { + clearerr( fp ); + nbytes = fwrite( buf, 1, size, fp ); + if( ferror(fp) ) { + log_error("%s: write error: %s\n", a->fname, strerror(errno)); rc = G10ERR_WRITE_FILE; - break; } } *ret_len = nbytes; @@ -149,7 +149,7 @@ { block_filter_ctx_t *a = opaque; size_t size = *ret_len; - int c, rc = 0; + int c, needed, rc = 0; char *p; if( control == IOBUFCTRL_UNDERFLOW ) { @@ -239,15 +239,20 @@ } } - for(; !rc && size && a->size; size--, a->size-- ) { - if( (c=iobuf_get(chain)) == -1 ) { + while( !rc && size && a->size ) { + needed = size < a->size ? size : a->size; + c = iobuf_read( chain, p, needed ); + if( c < needed ) { + if( c == -1 ) c = 0; log_error("block_filter %p: read error (size=%lu,a->size=%lu)\n", - a, (ulong)size, (ulong)a->size); + a, (ulong)size+c, (ulong)a->size+c); rc = G10ERR_READ_FILE; } else { - *p++ = c; - n++; + size -= c; + a->size -= c; + p += c; + n += c; } } } @@ -449,6 +454,7 @@ a->no = ++number; a->subno = 0; a->opaque = NULL; + a->real_fname = NULL; return a; } @@ -462,6 +468,7 @@ if( a && a->directfp ) { fclose( a->directfp ); + m_free( a->real_fname ); if( DBG_IOBUF ) log_debug("iobuf_close -> %p\n", a->directfp ); return 0; @@ -477,6 +484,7 @@ if( a->filter && (rc = a->filter(a->filter_ov, IOBUFCTRL_FREE, a->chain, NULL, &dummy_len)) ) log_error("IOBUFCTRL_FREE failed on close: %s\n", g10_errstr(rc) ); + m_free(a->real_fname); m_free(a->d.buf); m_free(a); } @@ -489,7 +497,7 @@ const char *s; if( a && a->use == 2 ) { - s = get_real_fname(a); + s = iobuf_get_real_fname(a); if( s && *s ) remove(s); /* remove the file. Fixme: this will fail for MSDOZE*/ } /* because the file is still open */ @@ -550,6 +558,8 @@ fcx->fp = fp; fcx->print_only_name = print_only; strcpy(fcx->fname, fname ); + if( !print_only ) + a->real_fname = m_strdup( fname ); a->filter = file_filter; a->filter_ov = fcx; file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); @@ -614,6 +624,8 @@ fcx->fp = fp; fcx->print_only_name = print_only; strcpy(fcx->fname, fname ); + if( !print_only ) + a->real_fname = m_strdup( fname ); a->filter = file_filter; a->filter_ov = fcx; file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); @@ -644,6 +656,7 @@ fcx = m_alloc( sizeof *fcx + strlen(fname) ); fcx->fp = fp; strcpy(fcx->fname, fname ); + a->real_fname = m_strdup( fname ); a->filter = file_filter; a->filter_ov = fcx; file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); @@ -670,6 +683,7 @@ fcx = m_alloc( sizeof *fcx + strlen(fname) ); fcx->fp = fp; strcpy(fcx->fname, fname ); + a->real_fname = m_strdup( fname ); a->filter = file_filter; a->filter_ov = fcx; file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); @@ -703,6 +717,7 @@ return NULL; a = iobuf_alloc(1, 8192 ); a->directfp = fp; + a->real_fname = m_strdup( fname ); if( DBG_IOBUF ) log_debug("iobuf_fopen -> %p\n", a->directfp ); @@ -745,6 +760,10 @@ */ b = m_alloc(sizeof *b); memcpy(b, a, sizeof *b ); + /* fixme: it is stupid to keep a copy of the name at every level + * but we need the name somewhere because the name known by file_filter + * may have been released when we need the name of the file */ + b->real_fname = a->real_fname? m_strdup(a->real_fname):NULL; /* remove the filter stuff from the new stream */ a->filter = NULL; a->filter_ov = NULL; @@ -811,6 +830,7 @@ b = a->chain; assert(b); m_free(a->d.buf); + m_free(a->real_fname); memcpy(a,b, sizeof *a); m_free(b); return 0; @@ -847,6 +867,7 @@ */ b = a->chain; m_free(a->d.buf); + m_free(a->real_fname); memcpy(a,b, sizeof *a); m_free(b); if( DBG_IOBUF ) @@ -884,6 +905,7 @@ log_debug("iobuf-%d.%d: pop `%s' in underflow\n", a->no, a->subno, a->desc ); m_free(a->d.buf); + m_free(a->real_fname); memcpy(a, b, sizeof *a); m_free(b); print_chain(a); @@ -952,6 +974,7 @@ a->no, a->subno, a->desc ); print_chain(a); m_free(a->d.buf); + m_free(a->real_fname); memcpy(a,b, sizeof *a); m_free(b); print_chain(a); @@ -1058,28 +1081,40 @@ if( a->unget.buf || a->nlimit ) { /* handle special cases */ - for(n=0 ; n < buflen; n++, buf++ ) { + for(n=0 ; n < buflen; n++ ) { if( (c = iobuf_readbyte(a)) == -1 ) { if( !n ) return -1; /* eof */ break; } else - *buf = c; + if( buf ) *buf = c; + if( buf ) buf++; } return n; } n = 0; do { - for( ; n < buflen && a->d.start < a->d.len; n++ ) - *buf++ = a->d.buf[a->d.start++]; + if( n < buflen && a->d.start < a->d.len ) { + unsigned size = a->d.len - a->d.start; + if( size > buflen - n ) + size = buflen - n; + if( buf ) + memcpy( buf, a->d.buf + a->d.start, size ); + n += size; + a->d.start += size; + if( buf ) + buf += size; + } if( n < buflen ) { if( (c=underflow(a)) == -1 ) { a->nbytes += n; return n? n : -1/*EOF*/; } - *buf++ = c; n++; + if( buf ) + *buf++ = c; + n++; } } while( n < buflen ); a->nbytes += n; @@ -1140,8 +1175,14 @@ BUG(); do { - for( ; buflen && a->d.len < a->d.size; buflen--, buf++ ) - a->d.buf[a->d.len++] = *buf; + if( buflen && a->d.len < a->d.size ) { + unsigned size = a->d.size - a->d.len; + if( size > buflen ) size = buflen; + memcpy( a->d.buf + a->d.len, buf, size ); + buflen -= size; + buf += size; + a->d.len += size; + } if( buflen ) { if( iobuf_flush(a) ) return -1; @@ -1237,6 +1278,7 @@ return 0; } + /* Hmmm: file_filter may have already been removed */ for( ; a; a = a->chain ) if( !a->chain && a->filter == file_filter ) { file_filter_ctx_t *b = a->filter_ov; @@ -1317,9 +1359,13 @@ /**************** * Retrieve the real filename */ -static const char * -get_real_fname( IOBUF a ) +const char * +iobuf_get_real_fname( IOBUF a ) { + if( a->real_fname ) + return a->real_fname; + + /* the old solution */ for( ; a; a = a->chain ) if( !a->chain && a->filter == file_filter ) { file_filter_ctx_t *b = a->filter_ov; diff -urN gnupg-0.9.7/util/memory.c gnupg-0.9.8/util/memory.c --- gnupg-0.9.7/util/memory.c Thu May 20 11:17:34 1999 +++ gnupg-0.9.8/util/memory.c Tue Jun 1 15:38:27 1999 @@ -48,9 +48,10 @@ #define EXTRA_ALIGN 0 #endif -static void membug( const char *fmt, ... ); #ifdef M_DEBUG + static void membug( const char *fmt, ... ); + #ifndef M_GUARD #define M_GUARD 1 #endif @@ -318,7 +319,6 @@ check_mem(e->user_p-4-EXTRA_ALIGN, info); } -#endif /* M_DEBUG */ static void membug( const char *fmt, ... ) @@ -337,6 +337,7 @@ abort(); } +#endif /* M_DEBUG */ void m_print_stats( const char *prefix ) diff -urN gnupg-0.9.7/util/miscutil.c gnupg-0.9.8/util/miscutil.c --- gnupg-0.9.7/util/miscutil.c Wed Apr 28 12:09:49 1999 +++ gnupg-0.9.8/util/miscutil.c Tue Jun 15 18:33:22 1999 @@ -125,7 +125,7 @@ * Print a string to FP, but filter all control characters out. */ void -print_string( FILE *fp, byte *p, size_t n, int delim ) +print_string( FILE *fp, const byte *p, size_t n, int delim ) { for( ; n; n--, p++ ) if( iscntrl( *p ) || *p == delim ) { @@ -160,6 +160,29 @@ return 1; if( strchr( short_yes, *s ) && !s[1] ) return 1; + return 0; +} + + +/**************** + * Return 1 for yes, -1 for quit, or 0 for no + */ +int +answer_is_yes_no_quit( const char *s ) +{ + char *long_yes = _("yes"); + char *long_quit = _("quit"); + char *short_yes = _("yY"); + char *short_quit = _("qQ"); + + if( !stricmp(s, long_yes ) ) + return 1; + if( !stricmp(s, long_quit ) ) + return -1; + if( strchr( short_yes, *s ) && !s[1] ) + return 1; + if( strchr( short_quit, *s ) && !s[1] ) + return -1; return 0; } diff -urN gnupg-0.9.7/util/secmem.c gnupg-0.9.8/util/secmem.c --- gnupg-0.9.7/util/secmem.c Sun Apr 11 10:34:00 1999 +++ gnupg-0.9.8/util/secmem.c Sat Jun 26 11:21:37 1999 @@ -40,7 +40,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -#define DEFAULT_POOLSIZE 8196 +#define DEFAULT_POOLSIZE 16384 typedef struct memblock_struct MEMBLOCK; struct memblock_struct { @@ -184,7 +184,7 @@ static void compress_pool(void) { - + /* fixme: we really should do this */ } void @@ -290,6 +290,7 @@ max_alloced = cur_alloced; if( cur_blocks > max_blocks ) max_blocks = cur_blocks; + return &mb->u.aligned.c; } diff -urN gnupg-0.9.7/util/strgutil.c gnupg-0.9.8/util/strgutil.c --- gnupg-0.9.7/util/strgutil.c Fri May 21 18:46:24 1999 +++ gnupg-0.9.8/util/strgutil.c Sat Jun 5 15:26:30 1999 @@ -27,8 +27,7 @@ #include "memory.h" -static int use_koi8 = 0; -static ushort koi82unicode[128] = { +static ushort koi8_unicode[128] = { 0x2500,0x2502,0x250c,0x2510,0x2514,0x2518,0x251c,0x2524, 0x252c,0x2534,0x253c,0x2580,0x2584,0x2588,0x258c,0x2590, 0x2591,0x2592,0x2593,0x2320,0x25a0,0x2219,0x221a,0x2248, @@ -47,7 +46,6 @@ 0x042c,0x042b,0x0417,0x0428,0x042d,0x0429,0x0427,0x042a }; -#if 0 static ushort latin2_unicode[128] = { 0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087, 0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F, @@ -66,7 +64,9 @@ 0x0111,0x0144,0x0148,0x00F3,0x00F4,0x0151,0x00F6,0x00F7, 0x0159,0x016F,0x00FA,0x0171,0x00FC,0x00FD,0x0163,0x02D9 }; -#endif + +static const char *active_charset_name = "iso-8859-1"; +static ushort *active_charset = NULL; void @@ -261,10 +261,18 @@ int set_native_charset( const char *newset ) { - if( !stricmp( newset, "iso-8859-1" ) ) - use_koi8 = 0; - else if( !stricmp( newset, "koi8-r" ) ) - use_koi8 = 1; + if( !stricmp( newset, "iso-8859-1" ) ) { + active_charset_name = "iso-8859-1"; + active_charset = NULL; + } + else if( !stricmp( newset, "iso-8859-2" ) ) { + active_charset_name = "iso-8859-2"; + active_charset = latin2_unicode; + } + else if( !stricmp( newset, "koi8-r" ) ) { + active_charset_name = "koi8-r"; + active_charset = koi8_unicode; + } else return G10ERR_GENERAL; return 0; @@ -273,7 +281,7 @@ const char* get_native_charset() { - return use_koi8? "koi8-r" : "iso-8859-1"; + return active_charset_name; } /**************** @@ -288,7 +296,7 @@ byte *p; size_t length=0; - if( use_koi8 ) { + if( active_charset ) { for(s=string; *s; s++ ) { length++; if( *s & 0x80 ) @@ -297,7 +305,7 @@ buffer = m_alloc( length + 1 ); for(p=buffer, s=string; *s; s++ ) { if( *s & 0x80 ) { - ushort val = koi82unicode[ *s & 0x7f ]; + ushort val = active_charset[ *s & 0x7f ]; if( val < 0x0800 ) { *p++ = 0xc0 | ( (val >> 6) & 0x1f ); *p++ = 0x80 | ( val & 0x3f ); diff -urN gnupg-0.9.7/util/ttyio.c gnupg-0.9.8/util/ttyio.c --- gnupg-0.9.7/util/ttyio.c Fri Apr 16 15:35:46 1999 +++ gnupg-0.9.8/util/ttyio.c Tue Jun 15 11:40:32 1999 @@ -58,6 +58,7 @@ static int initialized; static int last_prompt_len; static int batchmode; +static int no_terminal; #ifdef HAVE_TCGETATTR static struct termios termsave; @@ -130,11 +131,22 @@ return old; } +int +tty_no_terminal(int onoff) +{ + int old = no_terminal; + no_terminal = onoff ? 1 : 0; + return old; +} + void tty_printf( const char *fmt, ... ) { va_list arg_ptr; + if (no_terminal) + return; + if( !initialized ) init_ttyfp(); @@ -188,6 +200,9 @@ void tty_print_string( byte *p, size_t n ) { + if (no_terminal) + return; + if( !initialized ) init_ttyfp(); @@ -236,6 +251,11 @@ exit(2); } + if (no_terminal) { + log_error("Sorry, no terminal at all requested - can't get input\n"); + exit(2); + } + if( !initialized ) init_ttyfp(); @@ -349,9 +369,12 @@ void tty_kill_prompt() { + if ( no_terminal ) + return; if( !initialized ) init_ttyfp(); + if( batchmode ) last_prompt_len = 0; if( !last_prompt_len ) diff -urN gnupg-0.9.7/zlib/Makefile.in gnupg-0.9.8/zlib/Makefile.in --- gnupg-0.9.7/zlib/Makefile.in Sun May 23 20:02:15 1999 +++ gnupg-0.9.8/zlib/Makefile.in Sat Jun 26 13:06:59 1999 @@ -75,6 +75,7 @@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@ DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v0.9.8 (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE3dLcJaLeriVdUjc0RAuLFAJ9B3Fu/08yR65ZcA0O+HdaNXrtRiwCfVxzh O1GlHYjU8vQTFT53/Zdva4c= =k3Kj -----END PGP SIGNATURE-----