-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 NotDashEscaped: You need GnuPG to verify this message This is a patch file against 0.9.9. Please check the signature of this patch file: zcat somepath/gnupg-0.9.10.diff.gz | gpg --verify Change to directory gnupg-0.9.9 (or however you renamed it) and give this command: zcat somepath/gnupg-0.9.10.diff.gz | patch -p1 It is a good idea to rename your current directory to gnupg-0.9.10 now. Prereq: 0.9.9 diff -urN gnupg-0.9.9/VERSION gnupg-0.9.10/VERSION --- gnupg-0.9.9/VERSION Fri Jul 23 11:37:29 1999 +++ gnupg-0.9.10/VERSION Wed Aug 4 09:20:52 1999 @@ -1 +1 @@ -0.9.9 +0.9.10 diff -urN gnupg-0.9.9/ChangeLog gnupg-0.9.10/ChangeLog --- gnupg-0.9.9/ChangeLog Fri Jul 23 13:53:08 1999 +++ gnupg-0.9.10/ChangeLog Wed Aug 4 10:34:47 1999 @@ -1,5 +1,15 @@ -Fri Jul 23 13:53:03 CEST 1999 Werner Koch +Wed Aug 4 10:34:46 CEST 1999 Werner Koch + + + * VERSION: Set to 0.9.10. + +Mon Jul 26 09:34:46 CEST 1999 Werner Koch + * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): remove init of ac_cv_... + + * Makefile.am (DISCLEANFILES): New + +Fri Jul 23 13:53:03 CEST 1999 Werner Koch * VERSION: Set to 0.9.9. diff -urN gnupg-0.9.9/Makefile.am gnupg-0.9.10/Makefile.am --- gnupg-0.9.9/Makefile.am Mon Jul 12 17:06:24 1999 +++ gnupg-0.9.10/Makefile.am Sun Jul 25 14:06:24 1999 @@ -2,13 +2,18 @@ if COMPILE_LIBGCRYPT gcrypt = gcrypt +my_clean_gcrypt = else gcrypt = +my_clean_gcrypt = gcrypt/Makefile endif SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks ${gcrypt} EXTRA_DIST = VERSION PROJECTS BUGS - +# gettext never gets it right, so we take here care of deleting the +# symlink. my_clean_gcrypt is just a kludge until we can include +# libgcrypt. +DISTCLEANFILES = g10defs.h intl/libintl.h ${my_clean_gcrypt} dist-hook: @set -e; \ diff -urN gnupg-0.9.9/Makefile.in gnupg-0.9.10/Makefile.in --- gnupg-0.9.9/Makefile.in Fri Jul 23 14:25:16 1999 +++ gnupg-0.9.10/Makefile.in Wed Aug 4 10:43:03 1999 @@ -109,9 +109,15 @@ l = @l@ @COMPILE_LIBGCRYPT_TRUE@gcrypt = gcrypt @COMPILE_LIBGCRYPT_FALSE@gcrypt = +@COMPILE_LIBGCRYPT_TRUE@my_clean_gcrypt = +@COMPILE_LIBGCRYPT_FALSE@my_clean_gcrypt = gcrypt/Makefile SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks ${gcrypt} EXTRA_DIST = VERSION PROJECTS BUGS +# gettext never gets it right, so we take here care of deleting the +# symlink. my_clean_gcrypt is just a kludge until we can include +# libgcrypt. +DISTCLEANFILES = g10defs.h intl/libintl.h ${my_clean_gcrypt} ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = config.h @@ -356,6 +362,7 @@ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic diff -urN gnupg-0.9.9/NEWS gnupg-0.9.10/NEWS --- gnupg-0.9.9/NEWS Fri Jul 23 11:40:52 1999 +++ gnupg-0.9.10/NEWS Wed Aug 4 08:48:30 1999 @@ -1,3 +1,11 @@ +Noteworthy changes in version 0.9.10 +------------------------------------ + + * Some strange new options to help pgpgpg + + * Cleaned up the dox a bit. + + Noteworthy changes in version 0.9.9 ----------------------------------- diff -urN gnupg-0.9.9/README gnupg-0.9.10/README --- gnupg-0.9.9/README Fri Jul 23 11:38:55 1999 +++ gnupg-0.9.10/README Wed Aug 4 08:49:38 1999 @@ -2,7 +2,7 @@ GnuPG - The GNU Privacy Guard ------------------------------- - Version 0.9.9 + Version 0.9.10 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 @@ -12,28 +12,6 @@ GnuPG works best on GNU/Linux or *BSD. Other Unices are also supported but are not as well tested as the Free Unices. - Please verify the tar file with the PGP2 or OpenPGP - signatures provided. My PGP2 key is well known and published in - the "Global Trust Register for 1998", ISBN 0-9532397-0-5. - - I have included my pubring as "g10/pubring.asc", which contains - the key used to make GnuPG signatures: - - "pub 1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) " - "Key fingerprint = 6BD9 050F D8FC 941B 4341 2DCC 68B7 AB89 5754 8DCD" - - You may want to add this DSA key to your GnuPG pubring and use it in - the future to verify new releases. Because you verified this README - file and _checked_that_it_is_really_my PGP2 key 0C9857A5, you can be - quite sure that the above fingerprint is correct. - - Please subscribe to announce@gnupg.org by sending a mail with - a subject of "subscribe" to "announce-request@gnupg.org". If you - 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 (technical advices may count as a violation - of ITAR). See the file COPYING for copyright and warranty information. @@ -62,23 +40,99 @@ Here is a quick summary: - 1) "./configure" + 1) Check that you have unmodified sources. The below on how to do this. + Don't skip it - this is an important step! - 2) "make" + 2) Unpack the TAR. With GNU tar you can do it this way: + "tar xzvf gnupg-x.y.z.tar.gz" - 3) "make install" + 3) "cd gnupg-x.y.z" - 4) You end up with a "gpg" binary in /usr/local/bin. - Note: Because some programs rely on the existence of a + 4) "./configure" + + 5) "make" + + 6) "make install" + + 7) You end up with a "gpg" binary in /usr/local/bin. + Note: Because some old 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 + "cd /usr/local/bin; ln -s gpg gpgm" - 5) To avoid swapping out of sensitive data, you can install "gpg" as + 8) 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 "no-secmem-warning" to ~/.gnupg/options + How to Verify the Source + ------------------------ + + In order to check that the version of GnuPG which you are going to + install is an original and unmodified one, you can do it in one of + the following ways: + + a) If you already have a trusted Version of GnuPG installed, you + can simply check the supplied signature: + + $ gpg --verify gnupg-x.y.z.tar.gz.asc + + This checks that the detached signature gnupg-x.y.z.tar.gz.asc + is indeed a a signature of gnupg-x.y.z.tar.gz. The key used to + create this signature is: + + "pub 1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) " + + If you do not have this key, you can get it from the source in + the file g10/pubring.asc (use "gpg --import g10/pubring.gpg" to + add it to the keyring) or from any keyserver. You have to make + sure that this is really the key and not a faked one. You can do + this by comparing the output of: + + $ gpg --fingerprint 0x57548DCD + + with the elsewhere published fingerprint, or - if you are able to + _positively_ verify the signature of this README file - with + this fingerprint: "6BD9 050F D8FC 941B 4341 2DCC 68B7 AB89 5754 8DCD" + + Please note, that you have to use an old version of GnuPG to + do all this stuff. *Never* use the version which you are going + to check! + + + b) If you have a trusted Version of PGP 2 or 5 installed, you + can check the supplied PGP 2 signature: + + $ pgp gnupg-x.y.z.tar.gz.sig gnupg-x.y.z.tar.gz + + This checks that the detached signature gnupg-x.y.z.tar.gz.sig + is indeed a a signature of gnupg-x.y.z.tar.gz. Please note, + that this signature has been created with a RSA signature and + you probably can't use this method (due to legal reasons) when + you are in the U.S. The key used to create this signature is + the same as the one used to sign this README file. It should be + available at the keyservers and is also included in the source + of GnuPG in g10/pubring.asc. + + "pub 768R/0C9857A5 1995-09-30 Werner Koch " + + The finperprint of this key is published in printed form in the + "Global Trust Register for 1998", ISBN 0-9532397-0-5. + + + c) If you don't have any of the above programs, you have to verify + the MD5 checksum: + + $ md5sum gnupg-x.y.z.tar.gz.sig + + This should yield an output similar to this: + + fd9351b26b3189c1d577f0970f9dcadc gnupg-x.y.z.tar.gz + + Now check that this checksum is _exactly_ the same as the one + published via the anouncement list and probably via Usenet. + + Introduction ------------ @@ -409,15 +463,15 @@ inner structure of a encrypted packet. This command should list all kinds of rfc2440 messages. - gpgm --list-trustdb + gpg --list-trustdb List the contents of the trust DB in a human readable format - gpgm --list-trustdb + gpg --list-trustdb List the tree of certificates for the given usernames - gpgm --list-trust-path username + gpg --list-trust-path username List the possible trust paths for the given username. The length of such a trust path is limited by the option --max-cert-depth @@ -435,8 +489,23 @@ See http://www.gnupg.org/mirrors.html for a list of FTP mirrors and use them if possible. - To avoid possible legal problems we have decided, not to use - the normal www.gnu.org webserver. + We have some mailing lists dedicated to GnuPG: + + gnupg-announce@gnupg.org For important announcements like + new versions and such stuff. + This is a moderated list and has + very low traffic. + gnupg-users@gnupg.org For general user discussion and + help. + gnupg-devel@gnupg.org GnuPG developers main forum. + + You subscribe to one of the list by sending mail with a subject + of "subscribe" to x-request@gnupg.org, where x is the name of the + mailing list (gnupg-announce, gnupg-users, etc.). An archive of + the mailing lists is available at http://lists.gnupg.org . + + The gnupg.org domain is hosted in Germany to avoid possible legal + problems (technical advices may count as a violation of ITAR). Please direct bug reports to or post them direct to the mailing list . @@ -447,12 +516,13 @@ Have fun and remember: Echelon is looking at you kid. +- -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- -Version: GnuPG v0.9.8a (GNU/Linux) +Version: GnuPG v0.9.9 (GNU/Linux) Comment: For info see http://www.gnupg.org -iQB1AwUBN5g4Lx0Z9MEMmFelAQE+RwL/Ws+kNklTHJnABT8YU8BqN8x310DyUm+e -ViS23npv3S/kRnHbCOOQo4cEjUYZFFrJXzQgodBvKbLVzMgdj4XQvkulTSBYK6pm -B7GeQptWRCNJ7m+Hw0Z4gwJ7giQTdfF8 -=pJ7c +iQB1AwUBN6figR0Z9MEMmFelAQHydwL+LuKC3W6kRkm0clwab3v8I7zlX0bagxzA +RStlHXdO6ln1Mo3s3nBuCfrS6LogiUgNRFhNJQ5+rjrTydz00nzcorbyTalqvMlq +Gnsu9Pd/pTPzvk6kP79yDdoBxfaQGcgw +=W8uz -----END PGP SIGNATURE----- diff -urN gnupg-0.9.9/THANKS gnupg-0.9.10/THANKS --- gnupg-0.9.9/THANKS Fri Jul 23 11:08:56 1999 +++ gnupg-0.9.10/THANKS Sat Jul 24 10:53:19 1999 @@ -3,6 +3,7 @@ code. Here is a list of those people. Help me keep it complete and free of errors. +Allan Clark allanc@sco.com Anand Kumria wildfire@progsoc.uts.edu.au Ariel T Glenn ariel@columbia.edu Bodo Moeller Bodo_Moeller@public.uni-hamburg.de diff -urN gnupg-0.9.9/TODO gnupg-0.9.10/TODO --- gnupg-0.9.9/TODO Fri Jul 23 10:58:17 1999 +++ gnupg-0.9.10/TODO Sun Aug 1 21:10:07 1999 @@ -47,5 +47,5 @@ trustdb. * Evaluate whether it make sense to replace the namehashs either by using the user ID directly or by using pointers into the trustdb. - + * --gen-prime may trigger a log_bug; should be a log_fatal. diff -urN gnupg-0.9.9/acinclude.m4 gnupg-0.9.10/acinclude.m4 --- gnupg-0.9.9/acinclude.m4 Thu Jul 15 08:54:09 1999 +++ gnupg-0.9.10/acinclude.m4 Mon Jul 26 09:34:25 1999 @@ -575,7 +575,6 @@ esac if test "$tmp_do_check" = "yes"; then -ac_cv_sys_symbol_underscore="" AC_REQUIRE([GNUPG_PROG_NM])dnl AC_REQUIRE([GNUPG_SYS_NM_PARSE])dnl AC_MSG_CHECKING([for _ prefix in compiled symbols]) diff -urN gnupg-0.9.9/aclocal.m4 gnupg-0.9.10/aclocal.m4 --- gnupg-0.9.9/aclocal.m4 Fri Jul 23 11:43:31 1999 +++ gnupg-0.9.10/aclocal.m4 Wed Aug 4 09:21:12 1999 @@ -578,7 +578,6 @@ esac if test "$tmp_do_check" = "yes"; then -ac_cv_sys_symbol_underscore="" AC_REQUIRE([GNUPG_PROG_NM])dnl AC_REQUIRE([GNUPG_SYS_NM_PARSE])dnl AC_MSG_CHECKING([for _ prefix in compiled symbols]) diff -urN gnupg-0.9.9/checks/ChangeLog gnupg-0.9.10/checks/ChangeLog --- gnupg-0.9.9/checks/ChangeLog Sun Apr 18 10:11:31 1999 +++ gnupg-0.9.10/checks/ChangeLog Wed Aug 4 10:34:19 1999 @@ -1,3 +1,8 @@ +Wed Aug 4 10:34:18 CEST 1999 Werner Koch + + + * defs.inc (echo_n): New and used instead of /bin/echo "\c" + Sun Apr 18 10:11:28 CEST 1999 Werner Koch * mkdemodirs: New diff -urN gnupg-0.9.9/checks/Makefile.am gnupg-0.9.10/checks/Makefile.am --- gnupg-0.9.9/checks/Makefile.am Fri Apr 16 15:16:54 1999 +++ gnupg-0.9.10/checks/Makefile.am Sun Jul 25 14:01:11 1999 @@ -23,7 +23,7 @@ CLEANFILES = prepared.stamp x y yy z out err $(DATA_FILES) \ plain-1 plain-2 plain-3 options trustdb.gpg *.lock .\#lk* \ pubring.gpg secring.gpg pubring.pkr secring.skr - +DISTCLEANFILES = pubring.gpg~ all-local: prepared.stamp diff -urN gnupg-0.9.9/checks/Makefile.in gnupg-0.9.10/checks/Makefile.in --- gnupg-0.9.9/checks/Makefile.in Fri Jul 23 14:26:23 1999 +++ gnupg-0.9.10/checks/Makefile.in Wed Aug 4 10:43:53 1999 @@ -120,6 +120,7 @@ CLEANFILES = prepared.stamp x y yy z out err $(DATA_FILES) plain-1 plain-2 plain-3 options trustdb.gpg *.lock .\#lk* pubring.gpg secring.gpg pubring.pkr secring.skr +DISTCLEANFILES = pubring.gpg~ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -218,6 +219,7 @@ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: mostlyclean-am: mostlyclean-generic diff -urN gnupg-0.9.9/checks/clearsig.test gnupg-0.9.10/checks/clearsig.test --- gnupg-0.9.9/checks/clearsig.test Fri Feb 19 15:05:35 1999 +++ gnupg-0.9.10/checks/clearsig.test Fri Jul 30 10:37:53 1999 @@ -73,7 +73,7 @@ # bash's builtin echo needs the option -e so we use the external one. # ====================================== echo "this is a sig test" >y -/bin/echo " \c" >>y +echo_n " " >>y echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 --clearsign -o x --yes y $srcdir/run-gpg --verify x diff -urN gnupg-0.9.9/checks/defs.inc gnupg-0.9.10/checks/defs.inc --- gnupg-0.9.9/checks/defs.inc Wed May 19 15:51:36 1999 +++ gnupg-0.9.10/checks/defs.inc Fri Jul 30 10:36:31 1999 @@ -51,6 +51,28 @@ cd $1 || fatal "cannot cd to $1" } +echo_n_init=no +echo_n () { + if test "$echo_n_init" = "no"; then + if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + echo_n_n= + echo_n_c=' +' + else + echo_n_n='-n' + echo_n_c= + fi + else + echo_n_n= + echo_n_c='\c' + fi + echo_n_init=yes + fi + echo $echo_n_n "${1}$echo_n_c" +} + + #cleanup () { # rm $cleanup_files 2>/dev/null || true # echo "#empty" >./options diff -urN gnupg-0.9.9/checks/mds.test gnupg-0.9.10/checks/mds.test --- gnupg-0.9.9/checks/mds.test Wed Apr 14 18:39:04 1999 +++ gnupg-0.9.10/checks/mds.test Fri Jul 30 10:37:26 1999 @@ -25,7 +25,7 @@ [ "$failed" != "" ] && error "$failed failed for empty string" -/bin/echo "abcdefghijklmnopqrstuvwxyz\c" | $srcdir/run-gpg --print-mds >y +echo_n "abcdefghijklmnopqrstuvwxyz" | $srcdir/run-gpg --print-mds >y test_one "MD5" "C3FCD3D76192E4007DFB496CCA67E13B" test_one "SHA1" "32D10C7B8CF96570CA04CE37F2A19D84240D3A89" test_one "RMD160" "F71C27109C692C1B56BBDCEB5B9D2865B3708DBC" diff -urN gnupg-0.9.9/cipher/ChangeLog gnupg-0.9.10/cipher/ChangeLog --- gnupg-0.9.9/cipher/ChangeLog Thu Jul 22 19:58:10 1999 +++ gnupg-0.9.10/cipher/ChangeLog Mon Jul 26 09:34:50 1999 @@ -1,3 +1,8 @@ +Mon Jul 26 09:34:46 CEST 1999 Werner Koch + + + * md5.c (md5_final): Fix for a SCO cpp bug. + Thu Jul 15 10:15:35 CEST 1999 Werner Koch diff -urN gnupg-0.9.9/cipher/md5.c gnupg-0.9.10/cipher/md5.c --- gnupg-0.9.9/cipher/md5.c Mon May 17 20:18:19 1999 +++ gnupg-0.9.10/cipher/md5.c Mon Jul 26 09:44:30 1999 @@ -301,7 +301,10 @@ #define X(a) do { *p++ = hd->##a ; *p++ = hd->##a >> 8; \ *p++ = hd->##a >> 16; *p++ = hd->##a >> 24; } while(0) #else /* little endian */ - #define X(a) do { *(u32*)p = hd->##a ; p += 4; } while(0) + /*#define X(a) do { *(u32*)p = hd->##a ; p += 4; } while(0)*/ + /* Unixware's cpp doesn't like the above construct so we do it his way: + * (reported by Allan Clark) */ + #define X(a) do { *(u32*)p = (*hd).a ; p += 4; } while(0) #endif X(A); X(B); @@ -355,7 +358,7 @@ #ifndef IS_MODULE static #endif -const char * const gnupgext_version = "MD5 ($Revision: 1.13 $)"; +const char * const gnupgext_version = "MD5 ($Revision: 1.14 $)"; static struct { int class; diff -urN gnupg-0.9.9/configure gnupg-0.9.10/configure --- gnupg-0.9.9/configure Fri Jul 23 11:57:31 1999 +++ gnupg-0.9.10/configure Wed Aug 4 09:21:33 1999 @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.97 +# From configure.in Revision: 1.98 CDPATH= @@ -2362,9 +2362,8 @@ esac if test "$tmp_do_check" = "yes"; then -ac_cv_sys_symbol_underscore="" echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 -echo "configure:2368: checking for _ prefix in compiled symbols" >&5 +echo "configure:2367: 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 @@ -2373,10 +2372,10 @@ void nm_test_func(){} int main(){nm_test_func;return 0;} EOF -if { (eval echo configure:2377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. ac_nlist=conftest.nm - if { (eval echo configure:2380: \"$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:2379: \"$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 @@ -2400,7 +2399,7 @@ else echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 -echo "configure:2404: checking for _ prefix in compiled symbols" >&5 +echo "configure:2403: checking for _ prefix in compiled symbols" >&5 fi echo "$ac_t""$ac_cv_sys_symbol_underscore" 1>&6 if test x$ac_cv_sys_symbol_underscore = xyes; then @@ -2411,7 +2410,7 @@ fi echo $ac_n "checking for option to create PIC""... $ac_c" 1>&6 -echo "configure:2415: checking for option to create PIC" >&5 +echo "configure:2414: checking for option to create PIC" >&5 CFLAGS_PIC= NO_PIC=no if test "$cross_compiling" = yes; then @@ -2476,7 +2475,7 @@ fi echo $ac_n "checking how to specify -rdynamic""... $ac_c" 1>&6 -echo "configure:2480: checking how to specify -rdynamic" >&5 +echo "configure:2479: checking how to specify -rdynamic" >&5 CFLAGS_RDYNAMIC= if test "$cross_compiling" = yes; then echo "$ac_t""assume none" 1>&6 @@ -2551,12 +2550,12 @@ if test "$try_gettext" = yes; then echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2555: checking for ANSI C header files" >&5 +echo "configure:2554: 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 @@ -2564,7 +2563,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2567: \"$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* @@ -2581,7 +2580,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 @@ -2599,7 +2598,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 @@ -2620,7 +2619,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2631,7 +2630,7 @@ exit (0); } EOF -if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2655,12 +2654,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2659: checking for working const" >&5 +echo "configure:2658: 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:2712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2730,21 +2729,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2734: checking for inline" >&5 +echo "configure:2733: 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:2747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2770,12 +2769,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2774: checking for off_t" >&5 +echo "configure:2773: 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 @@ -2803,12 +2802,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2807: checking for size_t" >&5 +echo "configure:2806: 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 @@ -2838,19 +2837,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:2842: checking for working alloca.h" >&5 +echo "configure:2841: 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:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2853: \"$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 @@ -2871,12 +2870,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2875: checking for alloca" >&5 +echo "configure:2874: 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:2907: \"$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 @@ -2936,12 +2935,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2940: checking whether alloca needs Cray hooks" >&5 +echo "configure:2939: 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:2970: checking for $ac_func" >&5 +echo "configure:2969: 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:2997: \"$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 @@ -3021,7 +3020,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3025: checking stack direction for C alloca" >&5 +echo "configure:3024: 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 @@ -3029,7 +3028,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:3051: \"$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 @@ -3073,17 +3072,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3077: checking for $ac_hdr" >&5 +echo "configure:3076: 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:3087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3086: \"$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* @@ -3112,12 +3111,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3116: checking for $ac_func" >&5 +echo "configure:3115: 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:3143: \"$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 @@ -3165,7 +3164,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3169: checking for working mmap" >&5 +echo "configure:3168: 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 @@ -3173,7 +3172,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:3316: \"$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 @@ -3341,17 +3340,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3345: checking for $ac_hdr" >&5 +echo "configure:3344: 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:3355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3354: \"$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* @@ -3381,12 +3380,12 @@ strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3385: checking for $ac_func" >&5 +echo "configure:3384: 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:3412: \"$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 @@ -3438,12 +3437,12 @@ for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3442: checking for $ac_func" >&5 +echo "configure:3441: 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:3469: \"$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 @@ -3500,19 +3499,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3504: checking for LC_MESSAGES" >&5 +echo "configure:3503: 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:3516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3515: \"$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 @@ -3533,7 +3532,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3537: checking whether NLS is requested" >&5 +echo "configure:3536: 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" @@ -3553,7 +3552,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3557: checking whether included gettext is requested" >&5 +echo "configure:3556: 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" @@ -3572,17 +3571,17 @@ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3576: checking for libintl.h" >&5 +echo "configure:3575: 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:3586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3585: \"$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* @@ -3599,19 +3598,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:3603: checking for gettext in libc" >&5 +echo "configure:3602: 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:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3614: \"$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 @@ -3627,7 +3626,7 @@ if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3631: checking for bindtextdomain in -lintl" >&5 +echo "configure:3630: 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 @@ -3635,7 +3634,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:3649: \"$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 @@ -3662,12 +3661,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:3666: checking for gettext in libintl" >&5 +echo "configure:3665: 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:3671: checking for gettext in -lintl" >&5 +echo "configure:3670: 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 @@ -3675,7 +3674,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:3689: \"$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 @@ -3725,7 +3724,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:3729: checking for $ac_word" >&5 +echo "configure:3728: 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 @@ -3759,12 +3758,12 @@ for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3763: checking for $ac_func" >&5 +echo "configure:3762: 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:3790: \"$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 @@ -3814,7 +3813,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:3818: checking for $ac_word" >&5 +echo "configure:3817: 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 @@ -3850,7 +3849,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:3854: checking for $ac_word" >&5 +echo "configure:3853: 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 @@ -3882,7 +3881,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3913,7 +3912,7 @@ if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:3917: checking whether catgets can be used" >&5 +echo "configure:3916: 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" @@ -3926,7 +3925,7 @@ if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:3930: checking for main in -li" >&5 +echo "configure:3929: 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 @@ -3934,14 +3933,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:3944: \"$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 @@ -3969,12 +3968,12 @@ fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:3973: checking for catgets" >&5 +echo "configure:3972: 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:4000: \"$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 @@ -4019,7 +4018,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:4023: checking for $ac_word" >&5 +echo "configure:4022: 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 @@ -4055,7 +4054,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:4059: checking for $ac_word" >&5 +echo "configure:4058: 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 @@ -4092,7 +4091,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:4096: checking for $ac_word" >&5 +echo "configure:4095: 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 @@ -4127,7 +4126,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:4131: checking for $ac_word" >&5 +echo "configure:4130: 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 @@ -4185,7 +4184,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:4189: checking for $ac_word" >&5 +echo "configure:4188: 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 @@ -4219,7 +4218,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:4223: checking for $ac_word" >&5 +echo "configure:4222: 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 @@ -4255,7 +4254,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:4259: checking for $ac_word" >&5 +echo "configure:4258: 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 @@ -4348,7 +4347,7 @@ LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4352: checking for catalogs to be installed" >&5 +echo "configure:4351: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -4376,17 +4375,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:4380: checking for linux/version.h" >&5 +echo "configure:4379: 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:4390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4389: \"$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* @@ -4462,17 +4461,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4466: checking for $ac_hdr" >&5 +echo "configure:4465: 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:4476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4475: \"$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* @@ -4500,7 +4499,7 @@ if test "$ac_cv_header_gdbm_h" = yes ; then echo $ac_n "checking for gdbm_firstkey in -lgdbm""... $ac_c" 1>&6 -echo "configure:4504: checking for gdbm_firstkey in -lgdbm" >&5 +echo "configure:4503: 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 @@ -4508,7 +4507,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:4522: \"$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 @@ -4551,7 +4550,7 @@ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4555: checking for gethostbyname in -lnsl" >&5 +echo "configure:4554: 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 @@ -4559,7 +4558,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:4573: \"$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 @@ -4598,7 +4597,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:4602: checking for socket in -lsocket" >&5 +echo "configure:4601: 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 @@ -4606,7 +4605,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:4620: \"$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 @@ -4643,7 +4642,7 @@ fi if test x$ac_try_nsl = x1; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4647: checking for gethostbyname in -lnsl" >&5 +echo "configure:4646: 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 @@ -4651,7 +4650,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:4665: \"$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 @@ -4691,7 +4690,7 @@ if test "$try_dynload" = yes ; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4695: checking for dlopen in -ldl" >&5 +echo "configure:4694: 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 @@ -4699,7 +4698,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:4713: \"$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 @@ -4750,7 +4749,7 @@ use_gnupg_extensions=yes else echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:4754: checking for dlopen in -lc" >&5 +echo "configure:4753: 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 @@ -4758,7 +4757,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:4772: \"$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 @@ -4809,7 +4808,7 @@ use_gnupg_extensions=yes else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:4813: checking for shl_load in -ldld" >&5 +echo "configure:4812: 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 @@ -4817,7 +4816,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4831: \"$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 @@ -4871,7 +4870,7 @@ fi else echo $ac_n "checking for dynamic loading""... $ac_c" 1>&6 -echo "configure:4875: checking for dynamic loading" >&5 +echo "configure:4874: checking for dynamic loading" >&5 DYNLINK_LDFLAGS= DYNLINK_MOD_CFLAGS= use_gnupg_extensions=no @@ -4892,12 +4891,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4896: checking for ANSI C header files" >&5 +echo "configure:4895: 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 @@ -4905,7 +4904,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4908: \"$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* @@ -4922,7 +4921,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 @@ -4940,7 +4939,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 @@ -4961,7 +4960,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4972,7 +4971,7 @@ exit (0); } EOF -if { (eval echo configure:4976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4999,17 +4998,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5003: checking for $ac_hdr" >&5 +echo "configure:5002: 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:5013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5012: \"$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* @@ -5038,12 +5037,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5042: checking for working const" >&5 +echo "configure:5041: 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:5095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5113,21 +5112,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5117: checking for inline" >&5 +echo "configure:5116: 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:5130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5153,12 +5152,12 @@ esac echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5157: checking for size_t" >&5 +echo "configure:5156: 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 @@ -5186,12 +5185,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:5190: checking return type of signal handlers" >&5 +echo "configure:5189: 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 @@ -5208,7 +5207,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:5212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -5227,12 +5226,12 @@ echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:5231: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:5230: 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 @@ -5244,7 +5243,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:5248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -5269,14 +5268,14 @@ echo "configure: warning: cross compiling; assuming little endianess" 1>&2 fi echo $ac_n "checking endianess""... $ac_c" 1>&6 -echo "configure:5273: checking endianess" >&5 +echo "configure:5272: 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 @@ -5287,11 +5286,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:5291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5290: \"$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 @@ -5302,7 +5301,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:5306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_c_endian=big else @@ -5323,7 +5322,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:5339: \"$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 @@ -5368,12 +5367,12 @@ echo $ac_n "checking for byte typedef""... $ac_c" 1>&6 -echo "configure:5372: checking for byte typedef" >&5 +echo "configure:5371: 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 @@ -5384,7 +5383,7 @@ ; return 0; } EOF -if { (eval echo configure:5388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_byte=yes else @@ -5405,12 +5404,12 @@ fi echo $ac_n "checking for ushort typedef""... $ac_c" 1>&6 -echo "configure:5409: checking for ushort typedef" >&5 +echo "configure:5408: 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 @@ -5421,7 +5420,7 @@ ; return 0; } EOF -if { (eval echo configure:5425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_ushort=yes else @@ -5442,12 +5441,12 @@ fi echo $ac_n "checking for ulong typedef""... $ac_c" 1>&6 -echo "configure:5446: checking for ulong typedef" >&5 +echo "configure:5445: 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 @@ -5458,7 +5457,7 @@ ; return 0; } EOF -if { (eval echo configure:5462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_ulong=yes else @@ -5479,12 +5478,12 @@ fi echo $ac_n "checking for u16 typedef""... $ac_c" 1>&6 -echo "configure:5483: checking for u16 typedef" >&5 +echo "configure:5482: 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 @@ -5495,7 +5494,7 @@ ; return 0; } EOF -if { (eval echo configure:5499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_u16=yes else @@ -5516,12 +5515,12 @@ fi echo $ac_n "checking for u32 typedef""... $ac_c" 1>&6 -echo "configure:5520: checking for u32 typedef" >&5 +echo "configure:5519: 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 @@ -5532,7 +5531,7 @@ ; return 0; } EOF -if { (eval echo configure:5536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_u32=yes else @@ -5554,7 +5553,7 @@ echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6 -echo "configure:5558: checking size of unsigned short" >&5 +echo "configure:5557: 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 @@ -5562,7 +5561,7 @@ ac_cv_sizeof_unsigned_short=2 else cat > conftest.$ac_ext < main() @@ -5573,7 +5572,7 @@ exit(0); } EOF -if { (eval echo configure:5577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5576: \"$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 @@ -5593,7 +5592,7 @@ echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 -echo "configure:5597: checking size of unsigned int" >&5 +echo "configure:5596: 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 @@ -5601,7 +5600,7 @@ ac_cv_sizeof_unsigned_int=4 else cat > conftest.$ac_ext < main() @@ -5612,7 +5611,7 @@ exit(0); } EOF -if { (eval echo configure:5616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5615: \"$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 @@ -5632,7 +5631,7 @@ echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:5636: checking size of unsigned long" >&5 +echo "configure:5635: 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 @@ -5640,7 +5639,7 @@ ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < main() @@ -5651,7 +5650,7 @@ exit(0); } EOF -if { (eval echo configure:5655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5654: \"$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 @@ -5680,12 +5679,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:5684: checking for vprintf" >&5 +echo "configure:5683: 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:5711: \"$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 @@ -5732,12 +5731,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:5736: checking for _doprnt" >&5 +echo "configure:5735: 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:5763: \"$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 @@ -5787,12 +5786,12 @@ for ac_func in strerror stpcpy strlwr stricmp tcgetattr rand strtoul mmap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5791: checking for $ac_func" >&5 +echo "configure:5790: 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:5818: \"$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 @@ -5842,12 +5841,12 @@ for ac_func in memmove gettimeofday getrusage gethrtime setrlimit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5846: checking for $ac_func" >&5 +echo "configure:5845: 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:5873: \"$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 @@ -5897,12 +5896,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:5901: checking for $ac_func" >&5 +echo "configure:5900: 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:5928: \"$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 @@ -5953,12 +5952,12 @@ for ac_func in mlock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5957: checking for $ac_func" >&5 +echo "configure:5956: 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:5984: \"$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 @@ -6007,7 +6006,7 @@ if test "$ac_cv_func_mlock" = "yes"; then echo $ac_n "checking whether mlock is broken""... $ac_c" 1>&6 -echo "configure:6011: checking whether mlock is broken" >&5 +echo "configure:6010: 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 @@ -6016,7 +6015,7 @@ else cat > conftest.$ac_ext < @@ -6046,7 +6045,7 @@ EOF -if { (eval echo configure:6050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6049: \"$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 @@ -6083,17 +6082,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6087: checking for $ac_hdr" >&5 +echo "configure:6086: 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:6097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6096: \"$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* @@ -6121,7 +6120,7 @@ if test "$ac_cv_header_sys_capability_h" = "yes" ; then echo $ac_n "checking for cap_init in -lcap""... $ac_c" 1>&6 -echo "configure:6125: checking for cap_init in -lcap" >&5 +echo "configure:6124: checking for cap_init in -lcap" >&5 ac_lib_var=`echo cap'_'cap_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6129,7 +6128,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6143: \"$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 @@ -6187,17 +6186,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6191: checking for $ac_hdr" >&5 +echo "configure:6190: 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:6201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6200: \"$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* @@ -6225,7 +6224,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:6229: checking whether IPC_RMID allowes subsequent attaches" >&5 +echo "configure:6228: 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 @@ -6233,7 +6232,7 @@ gnupg_cv_ipc_rmid_deferred_release="assume-no" else cat > conftest.$ac_ext < @@ -6259,7 +6258,7 @@ } EOF -if { (eval echo configure:6263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6262: \"$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 @@ -6289,12 +6288,12 @@ fi echo $ac_n "checking whether SHM_LOCK is available""... $ac_c" 1>&6 -echo "configure:6293: checking whether SHM_LOCK is available" >&5 +echo "configure:6292: 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 @@ -6305,7 +6304,7 @@ ; return 0; } EOF -if { (eval echo configure:6309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_ipc_have_shm_lock="yes" else @@ -6339,7 +6338,7 @@ if test "$try_dev_random" = yes ; then echo $ac_n "checking for random device""... $ac_c" 1>&6 -echo "configure:6343: checking for random device" >&5 +echo "configure:6342: 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 @@ -6356,7 +6355,7 @@ fi else echo $ac_n "checking for random device""... $ac_c" 1>&6 -echo "configure:6360: checking for random device" >&5 +echo "configure:6359: checking for random device" >&5 ac_cv_have_dev_random=no echo "$ac_t""has been disabled" 1>&6 fi @@ -6366,17 +6365,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6370: checking for $ac_hdr" >&5 +echo "configure:6369: 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:6380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6379: \"$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* @@ -6403,7 +6402,7 @@ done echo $ac_n "checking for random device ioctl""... $ac_c" 1>&6 -echo "configure:6407: checking for random device ioctl" >&5 +echo "configure:6406: 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 @@ -6544,7 +6543,7 @@ echo $ac_n "checking for mpi assembler functions""... $ac_c" 1>&6 -echo "configure:6548: checking for mpi assembler functions" >&5 +echo "configure:6547: 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 @@ -6586,17 +6585,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6590: checking for $ac_hdr" >&5 +echo "configure:6589: 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:6600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6599: \"$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* @@ -6624,7 +6623,7 @@ if test "$ac_cv_header_zlib_h" = yes ; then echo $ac_n "checking for deflateInit2_ in -lz""... $ac_c" 1>&6 -echo "configure:6628: checking for deflateInit2_ in -lz" >&5 +echo "configure:6627: 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 @@ -6632,7 +6631,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6646: \"$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 diff -urN gnupg-0.9.9/doc/DETAILS gnupg-0.9.10/doc/DETAILS --- gnupg-0.9.9/doc/DETAILS Wed Jul 14 10:12:29 1999 +++ gnupg-0.9.10/doc/DETAILS Thu Jul 29 11:38:28 1999 @@ -32,7 +32,7 @@ 16 = ElGamal (encrypt only) 17 = DSA (sometimes called DH, sign only) 20 = ElGamal (sign and encrypt) - (for other id's see include/cipher.h) + (for other id's see include/cipher.h) 5. Field: KeyID 6. Field: Creation Date (in UTC) 7. Field: Key expiration date or empty if none. @@ -144,13 +144,20 @@ Issued whenever a passphrase for symmetric encryption is needed. MISSING_PASSPHRASE + No passphrase was supplied. An application which encounters this + message may want to stop parsing immediately because the next message + will probably be a BAD_PASSPHRASE. However, if the application + is a wrapper around the key edit menu functionalty it might not + make sense to stop parsing but simply ignoring the following + PAD_PASSPHRASE. BAD_PASSPHRASE - The supplied passphrase was wrong + The supplied passphrase was wrong or not given. In the latter case + you may have seen a MISSING_PASSPHRASE. GOOD_PASSPHRASE The supplied passphrase was good and the secret key material - is therefore usuable. + is therefore usable. DECRYPTION_FAILED The symmetric decryption failed - one reason could be a wrong @@ -577,9 +584,15 @@ - fingerprint=on. Also reports the fingerprints when used with 'index' or 'vindex' -New (already used by GnuPG): +The keyserver also recognizes http-POSTs to /pks/add. Use this to upload +keys. + + +A better way to to this would be a request like: /pks/lookup/?op= -The keyserver also recognizes http-POSTs to /pks/add. Use this to upload -keys. +this can be implemented using Hurd's translater mechanism. +However, I think the whole key server stuff has to be re-thougth; +I have some ideas and probably create a white paper. + diff -urN gnupg-0.9.9/doc/gpg.1 gnupg-0.9.10/doc/gpg.1 --- gnupg-0.9.9/doc/gpg.1 Thu Jul 22 21:53:14 1999 +++ gnupg-0.9.10/doc/gpg.1 Wed Aug 4 09:52:42 1999 @@ -1,4 +1,4 @@ -...\" $Header: /usr/src/docbook-to-man/cmd/RCS/docbook-to-man.sh,v 1.3 1996/06/17 03:36:49 fld Exp $ +...\" $Header: /cvs/gnome/gtk-doc/db2man/docbook-to-man,v 1.1.1.1 1998/11/24 06:00:34 owen Exp $ ...\" ...\" transcript compatibility for postscript use. ...\" @@ -50,9 +50,9 @@ .ds f3\" .ds f4\" .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n -.TH "gpg" "1" +.TH "gpg" "1" "" "" "GNU Tools" .SH "NAME" -gpg \(em encryption and signing tool +gpg \- encryption and signing tool .SH "SYNOPSIS" .PP .nf @@ -214,14 +214,10 @@ .RE .IP "--sign-key \fBname\fR" 10 Sign a public key with you secret key\&. This is a shortcut version -of the subcommand -.IP "sign" 10 - from --edit\&. +of the subcommand "sign" from --edit\&. .IP "--lsign-key \fBname\fR" 10 Sign a public key with you secret key but mark it as non-exportable\&. -This is a shortcut version of the subcommand -.IP "lsign" 10 - from --edit\&. +This is a shortcut version of the subcommand "lsign" from --edit\&. .IP "--delete-key \fBname\fR" 10 Remove key from the public keyring .IP "--delete-secret-key \fBname\fR" 10 @@ -250,7 +246,9 @@ 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 +Import/merge keys\&. This adds the given keys to the +keyring\&. +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 @@ -517,8 +515,6 @@ Never allow the use of \fBname\fR as public key algorithm\&. The given name will not be checked so that a later loaded algorithm will still get disabled\&. - -.RS .IP "--throw-keyid" 10 Do not put the keyid into encrypted packets\&. This option hides the receiver of the message and is a countermeasure @@ -560,7 +556,8 @@ 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)\&. -.IP "--allow-non-self-signed-uid" 10 +This option might not be implemented yet\&. +.IP "--allow-non-selfsigned-uid" 10 Allow the import of keys with user IDs which are not self-signed\&. This is only allows the import - key validation will fail und you have to check the validity of the key my other means\&. This hack is @@ -580,6 +577,8 @@ .IP "--no-greeting" 10 Suppress the initial copyright message but do not enter batch mode\&. +.IP "--no-secmem-warning" 10 +Suppress the warning about "using insecure memory"\&. .IP "--no-armor" 10 Assume the input data is not in ASCII armored format\&. .IP "--no-default-keyring" 10 @@ -587,7 +586,7 @@ keyrings\&. .IP "--skip-verify" 10 Skip the signature verification step\&. This may be -used to make the encryption faster if the signature +used to make the decryption faster if the signature verification is not needed\&. .IP "--with-colons" 10 Print key listings delimited by colons\&. @@ -596,7 +595,10 @@ .IP "--with-fingerprint" 10 Same as the command --fingerprint but changes only the format of the output and may be used together with another command\&. -.RE +.IP "--no-literal" 10 +This is not for normal use\&. Use the source to see for what it might be useful\&. +.IP "--set-filesize" 10 +This is not for normal use\&. Use the source to see for what it might be useful\&. .SH "RETURN VALUE" .PP The program returns 0 if everything was fine, 1 if at least @@ -613,6 +615,14 @@ show keys .IP "gpg --fingerprint \fBuser_ID\fR" 10 show fingerprint +.IP "gpg --verify \fBpgpfile\fR" 10 +.IP "gpg --verify \fBsigfile\fR [\fBfiles\fR]" 10 +Verify the signature of the file but do not output the data\&. The second form +is used for detached signatures, where \fBsigfile\fR is the detached +signature (either ASCII armored of binary) and [\fBfiles\fR] are the signed +data; if this is not given the name of the file holding the signed data is +constructed by cutting off the extension ("\&.asc" or "\&.sig") of +\fBsigfile\fR or by asking the user for the filename\&. .SH "ENVIRONMENT" .IP "HOME" 10 Used to locate the default home directory\&. @@ -655,4 +665,4 @@ 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\&. -...\" created by instant / docbook-to-man, Thu 22 Jul 1999, 21:53 +...\" created by instant / docbook-to-man, Wed 04 Aug 1999, 09:52 diff -urN gnupg-0.9.9/doc/gpg.sgml gnupg-0.9.10/doc/gpg.sgml --- gnupg-0.9.9/doc/gpg.sgml Thu Jul 22 19:25:39 1999 +++ gnupg-0.9.10/doc/gpg.sgml Wed Aug 4 09:51:20 1999 @@ -27,7 +27,7 @@ --> -directory"> file"> &ParmFile;"> @@ -359,14 +359,14 @@ --sign-key &ParmName; Sign a public key with you secret key. This is a shortcut version -of the subcommand sign from --edit. +of the subcommand "sign" from --edit. --lsign-key &ParmName; Sign a public key with you secret key but mark it as non-exportable. -This is a shortcut version of the subcommand lsign from --edit. +This is a shortcut version of the subcommand "lsign" from --edit. @@ -432,7 +432,9 @@ --import &OptParmFiles; --fast-import &OptParmFiles; -Import/merge keys. The fast version does not build +Import/merge keys. This adds the given keys to the +keyring. +The fast version does not build the trustdb; this can be done at any time with the command --update-trustdb. @@ -1019,6 +1021,7 @@ Never allow the use of &ParmName; as public key algorithm. The given name will not be checked so that a later loaded algorithm will still get disabled. + --throw-keyid @@ -1099,10 +1102,11 @@ 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). +This option might not be implemented yet. ---allow-non-self-signed-uid +--allow-non-selfsigned-uid Allow the import of keys with user IDs which are not self-signed. This is only allows the import - key validation will fail und you @@ -1145,6 +1149,12 @@ enter batch mode. + +--no-secmem-warning + +Suppress the warning about "using insecure memory". + + --no-armor @@ -1165,7 +1175,7 @@ --skip-verify Skip the signature verification step. This may be -used to make the encryption faster if the signature +used to make the decryption faster if the signature verification is not needed. @@ -1190,6 +1200,18 @@ and may be used together with another command. + +--no-literal + +This is not for normal use. Use the source to see for what it might be useful. + + + +--set-filesize + +This is not for normal use. Use the source to see for what it might be useful. + + @@ -1230,6 +1252,18 @@ gpg --fingerprint show fingerprint + + +gpg --verify +gpg --verify + +Verify the signature of the file but do not output the data. The second form +is used for detached signatures, where diff -urN gnupg-0.9.9/g10/ChangeLog gnupg-0.9.10/g10/ChangeLog --- gnupg-0.9.9/g10/ChangeLog Fri Jul 23 13:53:07 1999 +++ gnupg-0.9.10/g10/ChangeLog Wed Aug 4 10:34:19 1999 @@ -1,3 +1,36 @@ +Wed Aug 4 10:34:18 CEST 1999 Werner Koch + + + * pubring.asc: Updated. + + * pkclist.c (do_we_trust_pre,check_signatures_trust): Do not print + the warning about --always_trust when --quiet is used. + + * pkclist.c (fpr_info): New and called at several places. + + * parse-packet.c (dump_sig_subpkt): List revocation key contents. + +Mon Jul 26 09:34:46 CEST 1999 Werner Koch + + * pkclist.c (build_pk_list): Fixed typo in format string. + + * trustdb.c (create_shadow_dir): Don't translate the error string. + + * g10.c (main): Fixed spelling of user-id. + * getkey.c (find_by_name_pk,find_by_name_sk, + find_by_keyid,find_by_keyid_sk): Ditto and translate it. + * import.c (mark_non_selfsigned_uids_valid,delete_inv_parts): Ditto. + + +Mon Jul 26 01:01:39 CEST 1999 Michael Roth + + * g10.c, options.h: New options --no-literal and --set-filesize + + * encode.c (encode_simple, encode_crypt): Support for the options + --no-literal and --set-filesize. + + * sign.c (sign_file): ditto. + Fri Jul 23 13:53:03 CEST 1999 Werner Koch @@ -72,7 +105,7 @@ * openfile.c (make_outfile_name): s/error/info/ * passphrase.c (passphrase_to_dek): Return an empty passphrase when - in batch mode and don't make the warbing message fatal + in batch mode and don't make the warning message fatal * seckey-cert.c (check_secret_key): Try only once when in batch mode. * g10.c (make_username): New. @@ -126,7 +159,7 @@ (trust_letter): Mask the value. (do_check): Take disabled flag into account. - * passphrase.c (passphrase_to_dek): Add a pubkey_alfo arg and changed + * passphrase.c (passphrase_to_dek): Add a pubkey_algo arg and changed all callers. * g10.c (utf8_strings): 2 new options. diff -urN gnupg-0.9.9/g10/encode.c gnupg-0.9.10/g10/encode.c --- gnupg-0.9.9/g10/encode.c Wed Jun 30 09:42:14 1999 +++ gnupg-0.9.10/g10/encode.c Wed Aug 4 09:34:04 1999 @@ -70,7 +70,7 @@ { IOBUF inp, out; PACKET pkt; - PKT_plaintext *pt; + PKT_plaintext *pt = NULL; STRING2KEY *s2k = NULL; int rc = 0; u32 filesize; @@ -144,18 +144,22 @@ m_free(enc); } - /* setup the inner packet */ - if( filename || opt.set_filename ) { - char *s = make_basename( opt.set_filename ? opt.set_filename : filename ); - pt = m_alloc( sizeof *pt + strlen(s) - 1 ); - pt->namelen = strlen(s); - memcpy(pt->name, s, pt->namelen ); - m_free(s); - } - else { /* no filename */ - pt = m_alloc( sizeof *pt - 1 ); - pt->namelen = 0; + if (!opt.no_literal) { + /* setup the inner packet */ + if( filename || opt.set_filename ) { + char *s = make_basename( opt.set_filename ? opt.set_filename + : filename ); + pt = m_alloc( sizeof *pt + strlen(s) - 1 ); + pt->namelen = strlen(s); + memcpy(pt->name, s, pt->namelen ); + m_free(s); + } + else { /* no filename */ + pt = m_alloc( sizeof *pt - 1 ); + pt->namelen = 0; + } } + /* pgp5 has problems to decrypt symmetrically encrypted data from * GnuPG if the filelength is in the inner packet. It works * when only partial length headers are use. Until we have @@ -167,14 +171,19 @@ log_info(_("%s: WARNING: empty file\n"), filename ); } else - filesize = 0; /* stdin */ - pt->timestamp = make_timestamp(); - pt->mode = opt.textmode? 't' : 'b'; - pt->len = filesize; - pt->buf = inp; - pkt.pkttype = PKT_PLAINTEXT; - pkt.pkt.plaintext = pt; - cfx.datalen = filesize && !do_compress ? calc_packet_length( &pkt ) : 0; + filesize = opt.set_filesize ? opt.set_filesize : 0; /* stdin */ + + if (!opt.no_literal) { + pt->timestamp = make_timestamp(); + pt->mode = opt.textmode? 't' : 'b'; + pt->len = filesize; + pt->buf = inp; + pkt.pkttype = PKT_PLAINTEXT; + pkt.pkt.plaintext = pt; + cfx.datalen = filesize && !do_compress ? calc_packet_length( &pkt ) : 0; + } + else + cfx.datalen = filesize && !do_compress ? filesize : 0; /* register the cipher filter */ if( mode ) @@ -184,13 +193,32 @@ iobuf_push_filter( out, compress_filter, &zfx ); /* do the work */ - if( (rc = build_packet( out, &pkt )) ) - log_error("build_packet failed: %s\n", g10_errstr(rc) ); + if (!opt.no_literal) { + if( (rc = build_packet( out, &pkt )) ) + log_error("build_packet failed: %s\n", g10_errstr(rc) ); + } + else { + /* user requested not to create a literal packet, + * so we copy the plain data */ + byte copy_buffer[4096]; + int bytes_copied; + while ((bytes_copied = iobuf_read(inp, copy_buffer, 4096)) != -1) + if (iobuf_write(out, copy_buffer, bytes_copied) == -1) { + rc = G10ERR_WRITE_FILE; + log_error("copying input to output failed: %s\n", g10_errstr(rc) ); + break; + } + memset(copy_buffer, 0, 4096); /* burn buffer */ + } /* finish the stuff */ iobuf_close(inp); - iobuf_close(out); /* fixme: check returncode */ - pt->buf = NULL; + if (rc) + iobuf_cancel(out); + else + iobuf_close(out); /* fixme: check returncode */ + if (pt) + pt->buf = NULL; free_packet(&pkt); m_free(cfx.dek); m_free(s2k); @@ -270,35 +298,44 @@ if( rc ) goto leave; - /* setup the inner packet */ - if( filename || opt.set_filename ) { - char *s = make_basename( opt.set_filename ? opt.set_filename : filename ); - pt = m_alloc( sizeof *pt + strlen(s) - 1 ); - pt->namelen = strlen(s); - memcpy(pt->name, s, pt->namelen ); - m_free(s); - } - else { /* no filename */ - pt = m_alloc( sizeof *pt - 1 ); - pt->namelen = 0; + if (!opt.no_literal) { + /* setup the inner packet */ + if( filename || opt.set_filename ) { + char *s = make_basename( opt.set_filename ? opt.set_filename : filename ); + pt = m_alloc( sizeof *pt + strlen(s) - 1 ); + pt->namelen = strlen(s); + memcpy(pt->name, s, pt->namelen ); + m_free(s); + } + else { /* no filename */ + pt = m_alloc( sizeof *pt - 1 ); + pt->namelen = 0; + } } + if( filename && !opt.textmode ) { if( !(filesize = iobuf_get_filelength(inp)) ) log_info(_("%s: WARNING: empty file\n"), filename ); } else - filesize = 0; /* stdin */ - pt->timestamp = make_timestamp(); - pt->mode = opt.textmode ? 't' : 'b'; - pt->len = filesize; - pt->new_ctb = !pt->len && !opt.rfc1991; - pt->buf = inp; - pkt.pkttype = PKT_PLAINTEXT; - pkt.pkt.plaintext = pt; - cfx.datalen = filesize && !do_compress? calc_packet_length( &pkt ) : 0; + filesize = opt.set_filesize ? opt.set_filesize : 0; /* stdin */ + + if (!opt.no_literal) { + pt->timestamp = make_timestamp(); + pt->mode = opt.textmode ? 't' : 'b'; + pt->len = filesize; + pt->new_ctb = !pt->len && !opt.rfc1991; + pt->buf = inp; + pkt.pkttype = PKT_PLAINTEXT; + pkt.pkt.plaintext = pt; + cfx.datalen = filesize && !do_compress? calc_packet_length( &pkt ) : 0; + } + else + cfx.datalen = filesize && !do_compress ? filesize : 0; /* register the cipher filter */ iobuf_push_filter( out, cipher_filter, &cfx ); + /* register the compress filter */ if( do_compress ) { int compr_algo = select_algo_from_prefs( pk_list, PREFTYPE_COMPR ); @@ -312,8 +349,22 @@ } /* do the work */ - if( (rc = build_packet( out, &pkt )) ) - log_error("build_packet failed: %s\n", g10_errstr(rc) ); + if (!opt.no_literal) { + if( (rc = build_packet( out, &pkt )) ) + log_error("build_packet failed: %s\n", g10_errstr(rc) ); + } + else { + /* user requested not to create a literal packet, so we copy the plain data */ + byte copy_buffer[4096]; + int bytes_copied; + while ((bytes_copied = iobuf_read(inp, copy_buffer, 4096)) != -1) + if (iobuf_write(out, copy_buffer, bytes_copied) == -1) { + rc = G10ERR_WRITE_FILE; + log_error("copying input to output failed: %s\n", g10_errstr(rc) ); + break; + } + memset(copy_buffer, 0, 4096); /* burn buffer */ + } /* finish the stuff */ leave: diff -urN gnupg-0.9.9/g10/g10.c gnupg-0.9.10/g10/g10.c --- gnupg-0.9.9/g10/g10.c Thu Jul 22 19:19:34 1999 +++ gnupg-0.9.10/g10/g10.c Mon Jul 26 09:11:17 1999 @@ -175,6 +175,8 @@ oDisableCipherAlgo, oDisablePubkeyAlgo, oAllowNonSelfsignedUID, + oNoLiteral, + oSetFilesize, aTest }; @@ -334,6 +336,8 @@ { oDisableCipherAlgo, "disable-cipher-algo", 2, "@" }, { oDisablePubkeyAlgo, "disable-pubkey-algo", 2, "@" }, { oAllowNonSelfsignedUID, "allow-non-selfsigned-uid", 0, "@" }, + { oNoLiteral, "no-literal", 0, "@" }, + { oSetFilesize, "set-filesize", 20, "@" }, {0} }; @@ -848,6 +852,12 @@ case oAllowNonSelfsignedUID: opt.allow_non_selfsigned_uid = 1; break; + case oNoLiteral: + opt.no_literal = 1; + break; + case oSetFilesize: + opt.set_filesize = pargs.r.ret_ulong; + break; default : pargs.err = configfp? 1:2; break; } @@ -878,6 +888,17 @@ " the OpenPGP WG has not yet aggreed on MDCs\n"); opt.force_mdc = 0; } + if (opt.no_literal) { + log_info(_("NOTE: %s is not for normal use!\n"), "--no-literal"); + if (opt.textmode) + log_error(_("%s not allowed with %s!\n"), + "--textmode", "--no-literal" ); + if (opt.set_filename) + log_error(_("%s makes no sense with %s!\n"), + "--set-filename", "--no-literal" ); + } + if (opt.set_filesize) + log_info(_("NOTE: %s is not for normal use!\n"), "--set-filesize"); if( opt.batch ) tty_batchmode( 1 ); @@ -1158,7 +1179,7 @@ } } else - wrong_args(_("-k[v][v][v][c] [userid] [keyring]") ); + wrong_args(_("-k[v][v][v][c] [user-id] [keyring]") ); break; case aKeygen: /* generate a key (interactive) */ diff -urN gnupg-0.9.9/g10/getkey.c gnupg-0.9.10/g10/getkey.c --- gnupg-0.9.9/g10/getkey.c Thu Jul 22 18:32:41 1999 +++ gnupg-0.9.10/g10/getkey.c Sun Jul 25 16:40:55 1999 @@ -1286,9 +1286,9 @@ return kk; } else if( is_RSA(pk->pubkey_algo) ) - log_error("RSA key cannot be used in this version\n"); + log_error(_("RSA key cannot be used in this version\n")); else - log_error("No key for userid\n"); + log_error(_("No key for user-id\n")); } } return NULL; @@ -1325,9 +1325,9 @@ return kk; } else if( is_RSA(sk->pubkey_algo) ) - log_error("RSA key cannot be used in this version\n"); + log_error(_("RSA key cannot be used in this version\n")); else - log_error("No key for userid\n"); + log_error(_("No key for user-id\n")); } } return NULL; @@ -1366,7 +1366,7 @@ if( kk ) cache_user_id( kk->pkt->pkt.user_id, aki ); else - log_error("No userid for key\n"); + log_error(_("No user-id for key\n")); return k; /* found */ } } @@ -1406,7 +1406,7 @@ if( kk ) cache_user_id( kk->pkt->pkt.user_id, aki ); else - log_error("No userid for key\n"); + log_error(_("No user-id for key\n")); return k; /* found */ } } diff -urN gnupg-0.9.9/g10/import.c gnupg-0.9.10/g10/import.c --- gnupg-0.9.9/g10/import.c Thu Jul 22 19:19:45 1999 +++ gnupg-0.9.10/g10/import.c Sun Jul 25 15:06:38 1999 @@ -766,7 +766,7 @@ if( node->pkt->pkttype == PKT_USER_ID && !(node->flag & 1) ) { if( node->next && node->next->pkt->pkttype == PKT_SIGNATURE ) { node->flag |= 1; - log_info( _("key %08lX: accepted non self-signed userid '"), + log_info( _("key %08lX: accepted non self-signed user-id '"), (ulong)kid[1]); print_string( log_stream(), node->pkt->pkt.user_id->name, node->pkt->pkt.user_id->len, 0 ); @@ -795,7 +795,7 @@ uid_seen = 1; if( (node->flag & 2) || !(node->flag & 1) ) { if( opt.verbose ) { - log_info( _("key %08lX: skipped userid '"), + log_info( _("key %08lX: skipped user-id '"), (ulong)keyid[1]); print_string( stderr, node->pkt->pkt.user_id->name, node->pkt->pkt.user_id->len, 0 ); diff -urN gnupg-0.9.9/g10/keyedit.c gnupg-0.9.10/g10/keyedit.c --- gnupg-0.9.9/g10/keyedit.c Fri Jul 23 13:32:08 1999 +++ gnupg-0.9.10/g10/keyedit.c Wed Aug 4 09:55:35 1999 @@ -684,7 +684,7 @@ trim_spaces(answer); } while( *answer == '#' ); - arg_number = 0; + arg_number = 0; /* Yes, here is the init which egcc complains about*/ if( !*answer ) cmd = cmdLIST; else if( *answer == CONTROL_D ) diff -urN gnupg-0.9.9/g10/options.h gnupg-0.9.10/g10/options.h --- gnupg-0.9.9/g10/options.h Thu Jul 22 19:20:37 1999 +++ gnupg-0.9.10/g10/options.h Mon Jul 26 09:06:15 1999 @@ -81,6 +81,8 @@ const char *set_policy_url; int use_embedded_filename; int allow_non_selfsigned_uid; + int no_literal; + ulong set_filesize; } opt; diff -urN gnupg-0.9.9/g10/parse-packet.c gnupg-0.9.10/g10/parse-packet.c --- gnupg-0.9.9/g10/parse-packet.c Thu Jul 8 15:28:49 1999 +++ gnupg-0.9.10/g10/parse-packet.c Thu Jul 29 11:19:59 1999 @@ -737,7 +737,14 @@ printf(" %d", buffer[i] ); break; case SIGSUBPKT_REV_KEY: - p = "revocation key"; + fputs("revocation key: ", stdout ); + if( length < 22 ) + p = "[too short]"; + else { + printf("c=%02x a=%d f=", buffer[0], buffer[1] ); + for( i=2; i < length; i++ ) + printf("%02X", buffer[i] ); + } break; case SIGSUBPKT_ISSUER: if( length >= 8 ) diff -urN gnupg-0.9.9/g10/pkclist.c gnupg-0.9.10/g10/pkclist.c --- gnupg-0.9.9/g10/pkclist.c Fri Jul 23 11:07:37 1999 +++ gnupg-0.9.10/g10/pkclist.c Fri Jul 30 10:43:39 1999 @@ -68,6 +68,33 @@ tty_printf("\n"); } +static void +fpr_info( PKT_public_key *pk ) +{ + byte array[MAX_FINGERPRINT_LEN], *p; + size_t i, n; + FILE *fp = log_stream(); + + fingerprint_from_pk( pk, array, &n ); + p = array; + log_info(_("Fingerprint:")); + if( n == 20 ) { + for(i=0; i < n ; i++, i++, p += 2 ) { + if( i == 10 ) + putc(' ', fp); + fprintf(fp, " %02X%02X", *p, p[1] ); + } + } + else { + for(i=0; i < n ; i++, p++ ) { + if( i && !(i%8) ) + putc(' ', fp); + fprintf(fp, " %02X", *p ); + } + } + putc('\n', fp ); +} + static void @@ -453,7 +480,8 @@ */ } else if( opt.always_trust && !rc ) { - log_info(_("WARNING: Using untrusted key!\n")); + if( !opt.quiet ) + log_info(_("WARNING: Using untrusted key!\n")); rc = 1; } return rc; @@ -475,7 +503,8 @@ if( opt.always_trust ) { - log_info(_("WARNING: Using untrusted key!\n")); + if( !opt.quiet ) + log_info(_("WARNING: Using untrusted key!\n")); return 0; } @@ -523,6 +552,7 @@ case TRUST_EXPIRED: log_info(_("Note: This key has expired!\n")); + fpr_info( pk ); break; case TRUST_UNDEFINED: @@ -533,6 +563,7 @@ log_info(_( " There is no indication that the " "signature belongs to the owner.\n" )); + fpr_info( pk ); } else { int quit; @@ -560,6 +591,7 @@ log_info(_( " It is not certain that the signature belongs to the owner.\n" )); + fpr_info( pk ); break; case TRUST_FULLY: @@ -765,7 +797,7 @@ pk->pubkey_usage = use; rc = get_pubkey_byname( NULL, pk, def_rec, NULL ); if( rc ) - log_error(_("unknown default recipient `s'\n"), def_rec ); + log_error(_("unknown default recipient `%s'\n"), def_rec ); else if( !(rc=check_pubkey_algo2(pk->pubkey_algo, use)) ) { PK_LIST r = m_alloc( sizeof *r ); r->pk = pk; pk = NULL; diff -urN gnupg-0.9.9/g10/pubring.asc gnupg-0.9.10/g10/pubring.asc --- gnupg-0.9.9/g10/pubring.asc Fri Nov 20 18:09:45 1998 +++ gnupg-0.9.10/g10/pubring.asc Wed Aug 4 10:31:05 1999 @@ -1,20 +1,6 @@ - -pub 1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) - Key fingerprint = 6BD9 050F D8FC 941B 4341 2DCC 68B7 AB89 5754 8DCD - -pub 1024D/621CC013 1998-07-07 Werner Koch - Key fingerprint = ECAF 7590 EB34 43B5 C7CF 3ACB 6C7E E1B8 621C C013 - -pub 768R/0C9857A5 1995-09-30 Werner Koch - Key fingerprint = 62 9E 97 C0 D5 55 76 3B 90 5A FA E9 81 1C 64 09 - -pub 768g/E1D81275 1998-02-09 werner - Key fingerprint = 86E2 6681 6C0B 6DD5 4C06 BA6C E113 9763 E1D8 1275 - - -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v0.4.3c (GNU/Linux) -Comment: For info finger gcrypt@ftp.guug.de +Version: GnuPG v0.9.9 (GNU/Linux) +Comment: For info see http://www.gnupg.org mQGiBDWiHh4RBAD+l0rg5p9rW4M3sKvmeyzhs2mDxhRKDTVVUnTwpMIR2kIA9pT4 3No/coPajDvhZTaDM/vSz25IZDZWJ7gEu86RpoEdtr/eK8GuDcgsWvFs5+YpCDwW @@ -36,155 +22,204 @@ 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 -=7eJ9 +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 +AJkBDI7hajSe1D6Krh2j0zf8VMWOIA== +=TbxO -----END PGP PUBLIC KEY BLOCK----- - diff -urN gnupg-0.9.9/g10/sign.c gnupg-0.9.10/g10/sign.c --- gnupg-0.9.9/g10/sign.c Wed May 26 13:29:48 1999 +++ gnupg-0.9.10/g10/sign.c Wed Aug 4 09:33:54 1999 @@ -385,17 +385,20 @@ } } else { - if( fname || opt.set_filename ) { - char *s = make_basename( opt.set_filename ? opt.set_filename : fname ); - pt = m_alloc( sizeof *pt + strlen(s) - 1 ); - pt->namelen = strlen(s); - memcpy(pt->name, s, pt->namelen ); - m_free(s); - } - else { /* no filename */ - pt = m_alloc( sizeof *pt - 1 ); - pt->namelen = 0; + if (!opt.no_literal) { + if( fname || opt.set_filename ) { + char *s = make_basename( opt.set_filename ? opt.set_filename : fname ); + pt = m_alloc( sizeof *pt + strlen(s) - 1 ); + pt->namelen = strlen(s); + memcpy(pt->name, s, pt->namelen ); + m_free(s); + } + else { /* no filename */ + pt = m_alloc( sizeof *pt - 1 ); + pt->namelen = 0; + } } + if( fname ) { if( !(filesize = iobuf_get_filelength(inp)) ) log_info(_("WARNING: `%s' is an empty file\n"), fname ); @@ -409,19 +412,37 @@ filesize = 0; } else - filesize = 0; /* stdin */ - pt->timestamp = make_timestamp(); - pt->mode = opt.textmode && !outfile ? 't':'b'; - pt->len = filesize; - pt->new_ctb = !pt->len && !opt.rfc1991; - pt->buf = inp; - pkt.pkttype = PKT_PLAINTEXT; - pkt.pkt.plaintext = pt; - /*cfx.datalen = filesize? calc_packet_length( &pkt ) : 0;*/ - if( (rc = build_packet( out, &pkt )) ) - log_error("build_packet(PLAINTEXT) failed: %s\n", g10_errstr(rc) ); - pt->buf = NULL; + filesize = opt.set_filesize ? opt.set_filesize : 0; /* stdin */ + + if (!opt.no_literal) { + pt->timestamp = make_timestamp(); + pt->mode = opt.textmode && !outfile ? 't':'b'; + pt->len = filesize; + pt->new_ctb = !pt->len && !opt.rfc1991; + pt->buf = inp; + pkt.pkttype = PKT_PLAINTEXT; + pkt.pkt.plaintext = pt; + /*cfx.datalen = filesize? calc_packet_length( &pkt ) : 0;*/ + if( (rc = build_packet( out, &pkt )) ) + log_error("build_packet(PLAINTEXT) failed: %s\n", g10_errstr(rc) ); + pt->buf = NULL; + } + else { + byte copy_buffer[4096]; + int bytes_copied; + while ((bytes_copied = iobuf_read(inp, copy_buffer, 4096)) != -1) + if (iobuf_write(out, copy_buffer, bytes_copied) == -1) { + rc = G10ERR_WRITE_FILE; + log_error("copying input to output failed: %s\n", g10_errstr(rc)); + break; + } + memset(copy_buffer, 0, 4096); /* burn buffer */ + } } + + /* catch errors from above blocks */ + if (rc) + goto leave; /* loop over the secret certificates */ for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) { diff -urN gnupg-0.9.9/g10/trustdb.c gnupg-0.9.10/g10/trustdb.c --- gnupg-0.9.9/g10/trustdb.c Tue Jul 13 10:24:42 1999 +++ gnupg-0.9.10/g10/trustdb.c Sun Jul 25 16:41:05 1999 @@ -799,7 +799,7 @@ /* first see whether we already have such a record */ rc = tdbio_search_sdir( sig->keyid, sig->pubkey_algo, &sdir ); if( rc && rc != -1 ) { - log_error(_("tdbio_search_sdir failed: %s\n"), g10_errstr(rc)); + log_error("tdbio_search_sdir failed: %s\n", g10_errstr(rc)); tdbio_invalid(); } if( rc == -1 ) { /* not found: create */ diff -urN gnupg-0.9.9/po/ChangeLog gnupg-0.9.10/po/ChangeLog --- gnupg-0.9.9/po/ChangeLog Tue Jul 13 17:39:29 1999 +++ gnupg-0.9.10/po/ChangeLog Wed Aug 4 10:34:19 1999 @@ -1,5 +1,14 @@ -Tue Jul 13 17:39:25 CEST 1999 Werner Koch +Wed Aug 4 10:34:18 CEST 1999 Werner Koch + + + * de.po: Updated (Walter). + +Mon Jul 26 09:34:46 CEST 1999 Werner Koch + + * it.po: Updated (Marco). + +Tue Jul 13 17:39:25 CEST 1999 Werner Koch * de.po: Updated (Walter) diff -urN gnupg-0.9.9/po/cat-id-tbl.c gnupg-0.9.10/po/cat-id-tbl.c --- gnupg-0.9.9/po/cat-id-tbl.c Fri Jul 23 12:13:51 1999 +++ gnupg-0.9.10/po/cat-id-tbl.c Wed Aug 4 09:31:50 1999 @@ -179,66 +179,70 @@ {"option file `%s': %s\n", 144}, {"reading options from `%s'\n", 145}, {"%s is not a valid character set\n", 146}, - {"selected cipher algorithm is invalid\n", 147}, - {"selected digest algorithm is invalid\n", 148}, - {"the given policy URL is invalid\n", 149}, - {"compress algorithm must be in range %d..%d\n", 150}, - {"completes-needed must be greater than 0\n", 151}, - {"marginals-needed must be greater than 1\n", 152}, - {"max-cert-depth must be in range 1 to 255\n", 153}, - {"NOTE: simple S2K mode (0) is strongly discouraged\n", 154}, - {"invalid S2K mode; must be 0, 1 or 3\n", 155}, - {"failed to initialize the TrustDB: %s\n", 156}, - {"--store [filename]", 157}, - {"--symmetric [filename]", 158}, - {"--encrypt [filename]", 159}, - {"--sign [filename]", 160}, - {"--sign --encrypt [filename]", 161}, - {"--clearsign [filename]", 162}, - {"--decrypt [filename]", 163}, - {"--sign-key user-id", 164}, - {"--lsign-key user-id", 165}, - {"--edit-key user-id [commands]", 166}, - {"--delete-secret-key user-id", 167}, - {"--delete-key user-id", 168}, - {"can't open %s: %s\n", 169}, - {"-k[v][v][v][c] [userid] [keyring]", 170}, - {"dearmoring failed: %s\n", 171}, - {"enarmoring failed: %s\n", 172}, - {"invalid hash algorithm `%s'\n", 173}, - {"[filename]", 174}, - {"Go ahead and type your message ...\n", 175}, - {"can't open `%s'\n", 176}, + {"NOTE: %s is not for normal use!\n", 147}, + {"%s not allowed with %s!\n", 148}, + {"%s makes no sense with %s!\n", 149}, + {"selected cipher algorithm is invalid\n", 150}, + {"selected digest algorithm is invalid\n", 151}, + {"the given policy URL is invalid\n", 152}, + {"compress algorithm must be in range %d..%d\n", 153}, + {"completes-needed must be greater than 0\n", 154}, + {"marginals-needed must be greater than 1\n", 155}, + {"max-cert-depth must be in range 1 to 255\n", 156}, + {"NOTE: simple S2K mode (0) is strongly discouraged\n", 157}, + {"invalid S2K mode; must be 0, 1 or 3\n", 158}, + {"failed to initialize the TrustDB: %s\n", 159}, + {"--store [filename]", 160}, + {"--symmetric [filename]", 161}, + {"--encrypt [filename]", 162}, + {"--sign [filename]", 163}, + {"--sign --encrypt [filename]", 164}, + {"--clearsign [filename]", 165}, + {"--decrypt [filename]", 166}, + {"--sign-key user-id", 167}, + {"--lsign-key user-id", 168}, + {"--edit-key user-id [commands]", 169}, + {"--delete-secret-key user-id", 170}, + {"--delete-key user-id", 171}, + {"can't open %s: %s\n", 172}, + {"-k[v][v][v][c] [user-id] [keyring]", 173}, + {"dearmoring failed: %s\n", 174}, + {"enarmoring failed: %s\n", 175}, + {"invalid hash algorithm `%s'\n", 176}, + {"[filename]", 177}, + {"Go ahead and type your message ...\n", 178}, + {"can't open `%s'\n", 179}, {"\ -the first character of a notation name must be a letter or an underscore\n", 177}, +the first character of a notation name must be a letter or an underscore\n", 180}, {"\ a notation name must have only letters, digits, dots or underscores and end \ -with an '='\n", 178}, - {"dots in a notation name must be surrounded by other characters\n", 179}, - {"a notation value must not use any control characters\n", 180}, - {"armor: %s\n", 181}, - {"invalid armor header: ", 182}, - {"armor header: ", 183}, - {"invalid clearsig header\n", 184}, - {"nested clear text signatures\n", 185}, - {"invalid dash escaped line: ", 186}, - {"unexpected armor:", 187}, - {"invalid radix64 character %02x skipped\n", 188}, - {"premature eof (no CRC)\n", 189}, - {"premature eof (in CRC)\n", 190}, - {"malformed CRC\n", 191}, - {"CRC error; %06lx - %06lx\n", 192}, - {"premature eof (in Trailer)\n", 193}, - {"error in trailer line\n", 194}, - {"no valid OpenPGP data found.\n", 195}, - {"invalid armor: line longer than %d characters\n", 196}, - {"\ -quoted printable character in armor - probably a buggy MTA has been used\n", 197}, - {" Fingerprint:", 198}, - {"sSmMqQ", 199}, +with an '='\n", 181}, + {"dots in a notation name must be surrounded by other characters\n", 182}, + {"a notation value must not use any control characters\n", 183}, + {"armor: %s\n", 184}, + {"invalid armor header: ", 185}, + {"armor header: ", 186}, + {"invalid clearsig header\n", 187}, + {"nested clear text signatures\n", 188}, + {"invalid dash escaped line: ", 189}, + {"unexpected armor:", 190}, + {"invalid radix64 character %02x skipped\n", 191}, + {"premature eof (no CRC)\n", 192}, + {"premature eof (in CRC)\n", 193}, + {"malformed CRC\n", 194}, + {"CRC error; %06lx - %06lx\n", 195}, + {"premature eof (in Trailer)\n", 196}, + {"error in trailer line\n", 197}, + {"no valid OpenPGP data found.\n", 198}, + {"invalid armor: line longer than %d characters\n", 199}, + {"\ +quoted printable character in armor - probably a buggy MTA has been used\n", 200}, + {" Fingerprint:", 201}, + {"Fingerprint:", 202}, + {"sSmMqQ", 203}, {"\ No trust value assigned to %lu:\n\ -%4u%c/%08lX %s \"", 200}, +%4u%c/%08lX %s \"", 204}, {"\ Please decide how far you trust this user to correctly\n\ verify other users' keys (by looking at passports,\n\ @@ -248,562 +252,564 @@ 2 = I do NOT trust\n\ 3 = I trust marginally\n\ 4 = I trust fully\n\ - s = please show me more information\n", 201}, - {" m = back to the main menu\n", 202}, - {" q = quit\n", 203}, - {"Your decision? ", 204}, - {"Certificates leading to an ultimately trusted key:\n", 205}, + s = please show me more information\n", 205}, + {" m = back to the main menu\n", 206}, + {" q = quit\n", 207}, + {"Your decision? ", 208}, + {"Certificates leading to an ultimately trusted key:\n", 209}, {"\ 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", 206}, +\n", 210}, {"\ No path leading to one of our keys found.\n\ -\n", 207}, +\n", 211}, {"\ No certificates with undefined trust found.\n\ -\n", 208}, +\n", 212}, {"\ No trust values changed.\n\ -\n", 209}, - {"key %08lX: key has been revoked!\n", 210}, - {"Use this key anyway? ", 211}, - {"key %08lX: subkey has been revoked!\n", 212}, - {"%08lX: key has expired\n", 213}, - {"%08lX: no info to calculate a trust probability\n", 214}, - {"%08lX: We do NOT trust this key\n", 215}, +\n", 213}, + {"key %08lX: key has been revoked!\n", 214}, + {"Use this key anyway? ", 215}, + {"key %08lX: subkey has been revoked!\n", 216}, + {"%08lX: key has expired\n", 217}, + {"%08lX: no info to calculate a trust probability\n", 218}, + {"%08lX: We do NOT trust this key\n", 219}, {"\ %08lX: It is not sure that this key really belongs to the owner\n\ -but it is accepted anyway\n", 216}, - {"This key probably belongs to the owner\n", 217}, - {"This key belongs to us\n", 218}, +but it is accepted anyway\n", 220}, + {"This key probably belongs to the owner\n", 221}, + {"This key belongs to us\n", 222}, {"\ 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", 219}, - {"WARNING: Using untrusted key!\n", 220}, - {"WARNING: This key has been revoked by its owner!\n", 221}, - {" This could mean that the signature is forgery.\n", 222}, - {"WARNING: This subkey has been revoked by its owner!\n", 223}, - {"Note: This key has expired!\n", 224}, - {"WARNING: This key is not certified with a trusted signature!\n", 225}, - {"\ - There is no indication that the signature belongs to the owner.\n", 226}, - {"WARNING: We do NOT trust this key!\n", 227}, - {" The signature is probably a FORGERY.\n", 228}, - {"\ -WARNING: This key is not certified with sufficiently trusted signatures!\n", 229}, - {" It is not certain that the signature belongs to the owner.\n", 230}, - {"%s: skipped: %s\n", 231}, - {"%s: skipped: public key already present\n", 232}, +\n", 223}, + {"WARNING: Using untrusted key!\n", 224}, + {"WARNING: This key has been revoked by its owner!\n", 225}, + {" This could mean that the signature is forgery.\n", 226}, + {"WARNING: This subkey has been revoked by its owner!\n", 227}, + {"Note: This key has expired!\n", 228}, + {"WARNING: This key is not certified with a trusted signature!\n", 229}, + {"\ + There is no indication that the signature belongs to the owner.\n", 230}, + {"WARNING: We do NOT trust this key!\n", 231}, + {" The signature is probably a FORGERY.\n", 232}, + {"\ +WARNING: This key is not certified with sufficiently trusted signatures!\n", 233}, + {" It is not certain that the signature belongs to the owner.\n", 234}, + {"%s: skipped: %s\n", 235}, + {"%s: skipped: public key already present\n", 236}, {"\ You did not specify a user ID. (you may use \"-r\")\n\ -\n", 233}, - {"Enter the user ID: ", 234}, - {"No such user ID.\n", 235}, - {"Public key is disabled.\n", 236}, - {"unknown default recipient `s'\n", 237}, - {"%s: error checking key: %s\n", 238}, - {"%s: skipped: public key is disabled\n", 239}, - {"no valid addressees\n", 240}, - {"writing self signature\n", 241}, - {"writing key binding signature\n", 242}, - {"Please select what kind of key you want:\n", 243}, - {" (%d) DSA and ElGamal (default)\n", 244}, - {" (%d) DSA (sign only)\n", 245}, - {" (%d) ElGamal (encrypt only)\n", 246}, - {" (%d) ElGamal (sign and encrypt)\n", 247}, - {" (%d) ElGamal in a v3 packet\n", 248}, - {"Your selection? ", 249}, - {"Do you really want to create a sign and encrypt key? ", 250}, - {"Invalid selection.\n", 251}, +\n", 237}, + {"Enter the user ID: ", 238}, + {"No such user ID.\n", 239}, + {"Public key is disabled.\n", 240}, + {"unknown default recipient `%s'\n", 241}, + {"%s: error checking key: %s\n", 242}, + {"%s: skipped: public key is disabled\n", 243}, + {"no valid addressees\n", 244}, + {"writing self signature\n", 245}, + {"writing key binding signature\n", 246}, + {"Please select what kind of key you want:\n", 247}, + {" (%d) DSA and ElGamal (default)\n", 248}, + {" (%d) DSA (sign only)\n", 249}, + {" (%d) ElGamal (encrypt only)\n", 250}, + {" (%d) ElGamal (sign and encrypt)\n", 251}, + {" (%d) ElGamal in a v3 packet\n", 252}, + {"Your selection? ", 253}, + {"Do you really want to create a sign and encrypt key? ", 254}, + {"Invalid selection.\n", 255}, {"\ 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", 252}, - {"What keysize do you want? (1024) ", 253}, - {"DSA only allows keysizes from 512 to 1024\n", 254}, - {"keysize too small; 768 is smallest value allowed.\n", 255}, - {"keysize too large; %d is largest value allowed.\n", 256}, + highest suggested keysize is 2048 bits\n", 256}, + {"What keysize do you want? (1024) ", 257}, + {"DSA only allows keysizes from 512 to 1024\n", 258}, + {"keysize too small; 768 is smallest value allowed.\n", 259}, + {"keysize too large; %d is largest value allowed.\n", 260}, {"\ Keysizes larger than 2048 are not suggested because\n\ -computations take REALLY long!\n", 257}, - {"Are you sure that you want this keysize? ", 258}, +computations take REALLY long!\n", 261}, + {"Are you sure that you want this keysize? ", 262}, {"\ Okay, but keep in mind that your monitor and keyboard radiation is also very \ -vulnerable to attacks!\n", 259}, - {"Do you really need such a large keysize? ", 260}, - {"Requested keysize is %u bits\n", 261}, - {"rounded up to %u bits\n", 262}, +vulnerable to attacks!\n", 263}, + {"Do you really need such a large keysize? ", 264}, + {"Requested keysize is %u bits\n", 265}, + {"rounded up to %u bits\n", 266}, {"\ 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", 263}, - {"Key is valid for? (0) ", 264}, - {"invalid value\n", 265}, - {"Key does not expire at all\n", 266}, - {"Key expires at %s\n", 267}, - {"Is this correct (y/n)? ", 268}, + y = key expires in n years\n", 267}, + {"Key is valid for? (0) ", 268}, + {"invalid value\n", 269}, + {"Key does not expire at all\n", 270}, + {"Key expires at %s\n", 271}, + {"Is this correct (y/n)? ", 272}, {"\ \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", 269}, - {"Real name: ", 270}, - {"Invalid character in name\n", 271}, - {"Name may not start with a digit\n", 272}, - {"Name must be at least 5 characters long\n", 273}, - {"Email address: ", 274}, - {"Not a valid email address\n", 275}, - {"Comment: ", 276}, - {"Invalid character in comment\n", 277}, - {"You are using the `%s' character set.\n", 278}, +\n", 273}, + {"Real name: ", 274}, + {"Invalid character in name\n", 275}, + {"Name may not start with a digit\n", 276}, + {"Name must be at least 5 characters long\n", 277}, + {"Email address: ", 278}, + {"Not a valid email address\n", 279}, + {"Comment: ", 280}, + {"Invalid character in comment\n", 281}, + {"You are using the `%s' character set.\n", 282}, {"\ You selected this USER-ID:\n\ \"%s\"\n\ -\n", 279}, - {"NnCcEeOoQq", 280}, - {"Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? ", 281}, +\n", 283}, + {"NnCcEeOoQq", 284}, + {"Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? ", 285}, {"\ You need a Passphrase to protect your secret key.\n\ -\n", 282}, - {"passphrase not correctly repeated; try again.\n", 283}, +\n", 286}, + {"passphrase not correctly repeated; try again.\n", 287}, {"\ 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", 284}, +\n", 288}, {"\ 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", 285}, - {"Key generation can only be used in interactive mode\n", 286}, - {"DSA keypair will have 1024 bits.\n", 287}, - {"Key generation canceled.\n", 288}, - {"writing public certificate to `%s'\n", 289}, - {"writing secret certificate to `%s'\n", 290}, - {"public and secret key created and signed.\n", 291}, +generator a better chance to gain enough entropy.\n", 289}, + {"Key generation can only be used in interactive mode\n", 290}, + {"DSA keypair will have 1024 bits.\n", 291}, + {"Key generation canceled.\n", 292}, + {"writing public certificate to `%s'\n", 293}, + {"writing secret certificate to `%s'\n", 294}, + {"public and secret key created and signed.\n", 295}, {"\ 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", 292}, - {"Key generation failed: %s\n", 293}, +the command \"--edit-key\" to generate a secondary key for this purpose.\n", 296}, + {"Key generation failed: %s\n", 297}, {"\ -key has been created %lu second in future (time warp or clock problem)\n", 294}, +key has been created %lu second in future (time warp or clock problem)\n", 298}, {"\ -key has been created %lu seconds in future (time warp or clock problem)\n", 295}, - {"Really create? ", 296}, - {"%s: can't open: %s\n", 297}, - {"error creating passphrase: %s\n", 298}, - {"%s: WARNING: empty file\n", 299}, - {"reading from `%s'\n", 300}, - {"%s/%s encrypted for: %s\n", 301}, - {"%s: user not found: %s\n", 302}, - {"certificate read problem: %s\n", 303}, - {"key %08lX: not a rfc2440 key - skipped\n", 304}, - {"WARNING: nothing exported\n", 305}, - {"too many entries in pk cache - disabled\n", 306}, - {"too many entries in unk cache - disabled\n", 307}, - {"using secondary key %08lX instead of primary key %08lX\n", 308}, - {"can't open `%s': %s\n", 309}, - {"skipping block of type %d\n", 310}, - {"%lu keys so far processed\n", 311}, - {"error reading `%s': %s\n", 312}, - {"Total number processed: %lu\n", 313}, - {" w/o user IDs: %lu\n", 314}, - {" imported: %lu", 315}, - {" unchanged: %lu\n", 316}, - {" new user IDs: %lu\n", 317}, - {" new subkeys: %lu\n", 318}, - {" new signatures: %lu\n", 319}, - {" new key revocations: %lu\n", 320}, - {" secret keys read: %lu\n", 321}, - {" secret keys imported: %lu\n", 322}, - {" secret keys unchanged: %lu\n", 323}, - {"key %08lX: no user id\n", 324}, - {"key %08lX: no valid user ids\n", 325}, - {"this may be caused by a missing self-signature\n", 326}, - {"key %08lX: public key not found: %s\n", 327}, - {"no default public keyring\n", 328}, - {"writing to `%s'\n", 329}, - {"can't lock keyring `%s': %s\n", 330}, - {"error writing keyring `%s': %s\n", 331}, - {"key %08lX: public key imported\n", 332}, - {"key %08lX: doesn't match our copy\n", 333}, - {"key %08lX: can't locate original keyblock: %s\n", 334}, - {"key %08lX: can't read original keyblock: %s\n", 335}, - {"key %08lX: 1 new user-id\n", 336}, - {"key %08lX: %d new user-ids\n", 337}, - {"key %08lX: 1 new signature\n", 338}, - {"key %08lX: %d new signatures\n", 339}, - {"key %08lX: 1 new subkey\n", 340}, - {"key %08lX: %d new subkeys\n", 341}, - {"key %08lX: not changed\n", 342}, - {"key %08lX: secret key imported\n", 343}, - {"key %08lX: already in secret keyring\n", 344}, - {"key %08lX: secret key not found: %s\n", 345}, - {"key %08lX: no public key - can't apply revocation certificate\n", 346}, - {"key %08lX: invalid revocation certificate: %s - rejected\n", 347}, - {"key %08lX: revocation certificate imported\n", 348}, - {"key %08lX: no user-id for signature\n", 349}, - {"key %08lX: unsupported public key algorithm\n", 350}, - {"key %08lX: invalid self-signature\n", 351}, - {"key %08lX: no subkey for key binding\n", 352}, - {"key %08lX: invalid subkey binding\n", 353}, - {"key %08lX: accepted non self-signed userid '", 354}, - {"key %08lX: skipped userid '", 355}, - {"key %08lX: skipped subkey\n", 356}, - {"key %08lX: non exportable signature (class %02x) - skipped\n", 357}, - {"key %08lX: revocation certificate at wrong place - skipped\n", 358}, - {"key %08lX: invalid revocation certificate: %s - skipped\n", 359}, - {"key %08lX: duplicated user ID detected - merged\n", 360}, - {"key %08lX: revocation certificate added\n", 361}, - {"key %08lX: our copy has no self-signature\n", 362}, - {"%s: user not found\n", 363}, - {"[revocation]", 364}, - {"[self-signature]", 365}, - {"1 bad signature\n", 366}, - {"%d bad signatures\n", 367}, - {"1 signature not checked due to a missing key\n", 368}, - {"%d signatures not checked due to missing keys\n", 369}, - {"1 signature not checked due to an error\n", 370}, - {"%d signatures not checked due to errors\n", 371}, - {"1 user id without valid self-signature detected\n", 372}, - {"%d user ids without valid self-signatures detected\n", 373}, - {"Already signed by key %08lX\n", 374}, - {"Nothing to sign with key %08lX\n", 375}, +key has been created %lu seconds in future (time warp or clock problem)\n", 299}, + {"Really create? ", 300}, + {"%s: can't open: %s\n", 301}, + {"error creating passphrase: %s\n", 302}, + {"%s: WARNING: empty file\n", 303}, + {"reading from `%s'\n", 304}, + {"%s/%s encrypted for: %s\n", 305}, + {"%s: user not found: %s\n", 306}, + {"certificate read problem: %s\n", 307}, + {"key %08lX: not a rfc2440 key - skipped\n", 308}, + {"WARNING: nothing exported\n", 309}, + {"too many entries in pk cache - disabled\n", 310}, + {"too many entries in unk cache - disabled\n", 311}, + {"RSA key cannot be used in this version\n", 312}, + {"No key for user-id\n", 313}, + {"No user-id for key\n", 314}, + {"using secondary key %08lX instead of primary key %08lX\n", 315}, + {"can't open `%s': %s\n", 316}, + {"skipping block of type %d\n", 317}, + {"%lu keys so far processed\n", 318}, + {"error reading `%s': %s\n", 319}, + {"Total number processed: %lu\n", 320}, + {" w/o user IDs: %lu\n", 321}, + {" imported: %lu", 322}, + {" unchanged: %lu\n", 323}, + {" new user IDs: %lu\n", 324}, + {" new subkeys: %lu\n", 325}, + {" new signatures: %lu\n", 326}, + {" new key revocations: %lu\n", 327}, + {" secret keys read: %lu\n", 328}, + {" secret keys imported: %lu\n", 329}, + {" secret keys unchanged: %lu\n", 330}, + {"key %08lX: no user id\n", 331}, + {"key %08lX: no valid user ids\n", 332}, + {"this may be caused by a missing self-signature\n", 333}, + {"key %08lX: public key not found: %s\n", 334}, + {"no default public keyring\n", 335}, + {"writing to `%s'\n", 336}, + {"can't lock keyring `%s': %s\n", 337}, + {"error writing keyring `%s': %s\n", 338}, + {"key %08lX: public key imported\n", 339}, + {"key %08lX: doesn't match our copy\n", 340}, + {"key %08lX: can't locate original keyblock: %s\n", 341}, + {"key %08lX: can't read original keyblock: %s\n", 342}, + {"key %08lX: 1 new user-id\n", 343}, + {"key %08lX: %d new user-ids\n", 344}, + {"key %08lX: 1 new signature\n", 345}, + {"key %08lX: %d new signatures\n", 346}, + {"key %08lX: 1 new subkey\n", 347}, + {"key %08lX: %d new subkeys\n", 348}, + {"key %08lX: not changed\n", 349}, + {"key %08lX: secret key imported\n", 350}, + {"key %08lX: already in secret keyring\n", 351}, + {"key %08lX: secret key not found: %s\n", 352}, + {"key %08lX: no public key - can't apply revocation certificate\n", 353}, + {"key %08lX: invalid revocation certificate: %s - rejected\n", 354}, + {"key %08lX: revocation certificate imported\n", 355}, + {"key %08lX: no user-id for signature\n", 356}, + {"key %08lX: unsupported public key algorithm\n", 357}, + {"key %08lX: invalid self-signature\n", 358}, + {"key %08lX: no subkey for key binding\n", 359}, + {"key %08lX: invalid subkey binding\n", 360}, + {"key %08lX: accepted non self-signed user-id '", 361}, + {"key %08lX: skipped user-id '", 362}, + {"key %08lX: skipped subkey\n", 363}, + {"key %08lX: non exportable signature (class %02x) - skipped\n", 364}, + {"key %08lX: revocation certificate at wrong place - skipped\n", 365}, + {"key %08lX: invalid revocation certificate: %s - skipped\n", 366}, + {"key %08lX: duplicated user ID detected - merged\n", 367}, + {"key %08lX: revocation certificate added\n", 368}, + {"key %08lX: our copy has no self-signature\n", 369}, + {"%s: user not found\n", 370}, + {"[revocation]", 371}, + {"[self-signature]", 372}, + {"1 bad signature\n", 373}, + {"%d bad signatures\n", 374}, + {"1 signature not checked due to a missing key\n", 375}, + {"%d signatures not checked due to missing keys\n", 376}, + {"1 signature not checked due to an error\n", 377}, + {"%d signatures not checked due to errors\n", 378}, + {"1 user id without valid self-signature detected\n", 379}, + {"%d user ids without valid self-signatures detected\n", 380}, + {"Already signed by key %08lX\n", 381}, + {"Nothing to sign with key %08lX\n", 382}, {"\ Are you really sure that you want to sign this key\n\ -with your key: \"", 376}, +with your key: \"", 383}, {"\ The signature will be marked as non-exportable.\n\ -\n", 377}, - {"Really sign? ", 378}, - {"signing failed: %s\n", 379}, - {"This key is not protected.\n", 380}, - {"Key is protected.\n", 381}, - {"Can't edit this key: %s\n", 382}, +\n", 384}, + {"Really sign? ", 385}, + {"signing failed: %s\n", 386}, + {"This key is not protected.\n", 387}, + {"Key is protected.\n", 388}, + {"Can't edit this key: %s\n", 389}, {"\ Enter the new passphrase for this secret key.\n\ -\n", 383}, +\n", 390}, {"\ You don't want a passphrase - this is probably a *bad* idea!\n\ -\n", 384}, - {"Do you really want to do this? ", 385}, - {"moving a key signature to the correct place\n", 386}, - {"quit this menu", 387}, - {"q", 388}, - {"save", 389}, - {"save and quit", 390}, - {"help", 391}, - {"show this help", 392}, - {"fpr", 393}, - {"show fingerprint", 394}, - {"list", 395}, - {"list key and user ids", 396}, - {"l", 397}, - {"uid", 398}, - {"select user id N", 399}, - {"key", 400}, - {"select secondary key N", 401}, - {"check", 402}, - {"list signatures", 403}, - {"c", 404}, - {"sign", 405}, - {"sign the key", 406}, - {"s", 407}, - {"lsign", 408}, - {"sign the key locally", 409}, - {"debug", 410}, - {"adduid", 411}, - {"add a user id", 412}, - {"deluid", 413}, - {"delete user id", 414}, - {"addkey", 415}, - {"add a secondary key", 416}, - {"delkey", 417}, - {"delete a secondary key", 418}, - {"delsig", 419}, - {"delete signatures", 420}, - {"expire", 421}, - {"change the expire date", 422}, - {"toggle", 423}, - {"toggle between secret and public key listing", 424}, - {"t", 425}, - {"pref", 426}, - {"list preferences", 427}, - {"passwd", 428}, - {"change the passphrase", 429}, - {"trust", 430}, - {"change the ownertrust", 431}, - {"revsig", 432}, - {"revoke signatures", 433}, - {"revkey", 434}, - {"revoke a secondary key", 435}, - {"disable", 436}, - {"disable a key", 437}, - {"enable", 438}, - {"enable a key", 439}, - {"can't do that in batchmode\n", 440}, - {"Secret key is available.\n", 441}, - {"Command> ", 442}, - {"Need the secret key to do this.\n", 443}, - {"Really sign all user ids? ", 444}, - {"Hint: Select the user ids to sign\n", 445}, - {"update of trustdb failed: %s\n", 446}, - {"You must select at least one user id.\n", 447}, - {"You can't delete the last user id!\n", 448}, - {"Really remove all selected user ids? ", 449}, - {"Really remove this user id? ", 450}, - {"You must select at least one key.\n", 451}, - {"Do you really want to delete the selected keys? ", 452}, - {"Do you really want to delete this key? ", 453}, - {"Do you really want to revoke the selected keys? ", 454}, - {"Do you really want to revoke this key? ", 455}, - {"Save changes? ", 456}, - {"Quit without saving? ", 457}, - {"update failed: %s\n", 458}, - {"update secret failed: %s\n", 459}, - {"Key not changed so no update needed.\n", 460}, - {"Invalid command (try \"help\")\n", 461}, - {"This key has been disabled", 462}, - {"Delete this good signature? (y/N/q)", 463}, - {"Delete this invalid signature? (y/N/q)", 464}, - {"Delete this unknown signature? (y/N/q)", 465}, - {"Really delete this self-signature? (y/N)", 466}, - {"Deleted %d signature.\n", 467}, - {"Deleted %d signatures.\n", 468}, - {"Nothing deleted.\n", 469}, - {"Please remove selections from the secret keys.\n", 470}, - {"Please select at most one secondary key.\n", 471}, - {"Changing expiration time for a secondary key.\n", 472}, - {"Changing expiration time for the primary key.\n", 473}, - {"You can't change the expiration date of a v3 key\n", 474}, - {"No corresponding signature in secret ring\n", 475}, - {"No user id with index %d\n", 476}, - {"No secondary key with index %d\n", 477}, - {"user ID: \"", 478}, +\n", 391}, + {"Do you really want to do this? ", 392}, + {"moving a key signature to the correct place\n", 393}, + {"quit this menu", 394}, + {"q", 395}, + {"save", 396}, + {"save and quit", 397}, + {"help", 398}, + {"show this help", 399}, + {"fpr", 400}, + {"show fingerprint", 401}, + {"list", 402}, + {"list key and user ids", 403}, + {"l", 404}, + {"uid", 405}, + {"select user id N", 406}, + {"key", 407}, + {"select secondary key N", 408}, + {"check", 409}, + {"list signatures", 410}, + {"c", 411}, + {"sign", 412}, + {"sign the key", 413}, + {"s", 414}, + {"lsign", 415}, + {"sign the key locally", 416}, + {"debug", 417}, + {"adduid", 418}, + {"add a user id", 419}, + {"deluid", 420}, + {"delete user id", 421}, + {"addkey", 422}, + {"add a secondary key", 423}, + {"delkey", 424}, + {"delete a secondary key", 425}, + {"delsig", 426}, + {"delete signatures", 427}, + {"expire", 428}, + {"change the expire date", 429}, + {"toggle", 430}, + {"toggle between secret and public key listing", 431}, + {"t", 432}, + {"pref", 433}, + {"list preferences", 434}, + {"passwd", 435}, + {"change the passphrase", 436}, + {"trust", 437}, + {"change the ownertrust", 438}, + {"revsig", 439}, + {"revoke signatures", 440}, + {"revkey", 441}, + {"revoke a secondary key", 442}, + {"disable", 443}, + {"disable a key", 444}, + {"enable", 445}, + {"enable a key", 446}, + {"can't do that in batchmode\n", 447}, + {"Secret key is available.\n", 448}, + {"Command> ", 449}, + {"Need the secret key to do this.\n", 450}, + {"Really sign all user ids? ", 451}, + {"Hint: Select the user ids to sign\n", 452}, + {"update of trustdb failed: %s\n", 453}, + {"You must select at least one user id.\n", 454}, + {"You can't delete the last user id!\n", 455}, + {"Really remove all selected user ids? ", 456}, + {"Really remove this user id? ", 457}, + {"You must select at least one key.\n", 458}, + {"Do you really want to delete the selected keys? ", 459}, + {"Do you really want to delete this key? ", 460}, + {"Do you really want to revoke the selected keys? ", 461}, + {"Do you really want to revoke this key? ", 462}, + {"Save changes? ", 463}, + {"Quit without saving? ", 464}, + {"update failed: %s\n", 465}, + {"update secret failed: %s\n", 466}, + {"Key not changed so no update needed.\n", 467}, + {"Invalid command (try \"help\")\n", 468}, + {"This key has been disabled", 469}, + {"Delete this good signature? (y/N/q)", 470}, + {"Delete this invalid signature? (y/N/q)", 471}, + {"Delete this unknown signature? (y/N/q)", 472}, + {"Really delete this self-signature? (y/N)", 473}, + {"Deleted %d signature.\n", 474}, + {"Deleted %d signatures.\n", 475}, + {"Nothing deleted.\n", 476}, + {"Please remove selections from the secret keys.\n", 477}, + {"Please select at most one secondary key.\n", 478}, + {"Changing expiration time for a secondary key.\n", 479}, + {"Changing expiration time for the primary key.\n", 480}, + {"You can't change the expiration date of a v3 key\n", 481}, + {"No corresponding signature in secret ring\n", 482}, + {"No user id with index %d\n", 483}, + {"No secondary key with index %d\n", 484}, + {"user ID: \"", 485}, {"\ \"\n\ -signed with your key %08lX at %s\n", 479}, - {"Create a revocation certificate for this signature? (y/N)", 480}, - {"Really create the revocation certificates? (y/N)", 481}, - {"no secret key\n", 482}, - {"public key is %08lX\n", 483}, - {"public key encrypted data: good DEK\n", 484}, - {"encrypted with %u-bit %s key, ID %08lX, created %s\n", 485}, - {"encrypted with %s key, ID %08lX\n", 486}, - {"no secret key for decryption available\n", 487}, - {"public key decryption failed: %s\n", 488}, - {"decryption okay\n", 489}, - {"WARNING: encrypted message has been manipulated!\n", 490}, - {"decryption failed: %s\n", 491}, - {"NOTE: sender requested \"for-your-eyes-only\"\n", 492}, - {"original file name='%.*s'\n", 493}, - {"WARNING: invalid notation data found\n", 494}, - {"Notation: ", 495}, - {"Policy: ", 496}, - {"signature verification suppressed\n", 497}, - {"Signature made %.*s using %s key ID %08lX\n", 498}, - {"BAD signature from \"", 499}, - {"Good signature from \"", 500}, - {" aka \"", 501}, - {"Can't check signature: %s\n", 502}, - {"old style (PGP 2.x) signature\n", 503}, - {"invalid root packet detected in proc_tree()\n", 504}, - {"can't disable core dumps: %s\n", 505}, - {"WARNING: program may create a core file!\n", 506}, - {"Experimental algorithms should not be used!\n", 507}, +signed with your key %08lX at %s\n", 486}, + {"Create a revocation certificate for this signature? (y/N)", 487}, + {"Really create the revocation certificates? (y/N)", 488}, + {"no secret key\n", 489}, + {"public key is %08lX\n", 490}, + {"public key encrypted data: good DEK\n", 491}, + {"encrypted with %u-bit %s key, ID %08lX, created %s\n", 492}, + {"encrypted with %s key, ID %08lX\n", 493}, + {"no secret key for decryption available\n", 494}, + {"public key decryption failed: %s\n", 495}, + {"decryption okay\n", 496}, + {"WARNING: encrypted message has been manipulated!\n", 497}, + {"decryption failed: %s\n", 498}, + {"NOTE: sender requested \"for-your-eyes-only\"\n", 499}, + {"original file name='%.*s'\n", 500}, + {"WARNING: invalid notation data found\n", 501}, + {"Notation: ", 502}, + {"Policy: ", 503}, + {"signature verification suppressed\n", 504}, + {"Signature made %.*s using %s key ID %08lX\n", 505}, + {"BAD signature from \"", 506}, + {"Good signature from \"", 507}, + {" aka \"", 508}, + {"Can't check signature: %s\n", 509}, + {"old style (PGP 2.x) signature\n", 510}, + {"invalid root packet detected in proc_tree()\n", 511}, + {"can't disable core dumps: %s\n", 512}, + {"WARNING: program may create a core file!\n", 513}, + {"Experimental algorithms should not be used!\n", 514}, {"\ RSA keys are deprecated; please consider creating a new key and use this key \ -in the future\n", 508}, - {"this cipher algorithm is depreciated; please use a more standard one!\n", 509}, - {"can't handle public key algorithm %d\n", 510}, - {"subpacket of type %d has critical bit set\n", 511}, +in the future\n", 515}, + {"this cipher algorithm is depreciated; please use a more standard one!\n", 516}, + {"can't handle public key algorithm %d\n", 517}, + {"subpacket of type %d has critical bit set\n", 518}, {"\ \n\ You need a passphrase to unlock the secret key for\n\ -user: \"", 512}, - {"%u-bit %s key, ID %08lX, created %s", 513}, - {" (main key ID %08lX)", 514}, - {"can't query password in batchmode\n", 515}, - {"Enter passphrase: ", 516}, - {"Repeat passphrase: ", 517}, - {"data not saved; use option \"--output\" to save it\n", 518}, - {"Please enter name of data file: ", 519}, - {"reading stdin ...\n", 520}, - {"can't open signed data `%s'\n", 521}, - {"anonymous receiver; trying secret key %08lX ...\n", 522}, - {"okay, we are the anonymous recipient.\n", 523}, - {"old encoding of the DEK is not supported\n", 524}, - {"NOTE: cipher algorithm %d not found in preferences\n", 525}, - {"protection algorithm %d is not supported\n", 526}, - {"Invalid passphrase; please try again ...\n", 527}, - {"WARNING: Weak key detected - please change passphrase again.\n", 528}, - {"assuming bad MDC due to an unknown critical bit\n", 529}, - {"\ -this is a PGP generated ElGamal key which is NOT secure for signatures!\n", 530}, - {"public key is %lu second newer than the signature\n", 531}, - {"public key is %lu seconds newer than the signature\n", 532}, - {"NOTE: signature key expired %s\n", 533}, - {"assuming bad signature due to an unknown critical bit\n", 534}, - {"%s signature from: %s\n", 535}, - {"can't create %s: %s\n", 536}, - {"signing:", 537}, - {"WARNING: `%s' is an empty file\n", 538}, - {"can't handle text lines longer than %d characters\n", 539}, - {"input line longer than %d characters\n", 540}, - {"trustdb rec %lu: lseek failed: %s\n", 541}, - {"trustdb rec %lu: write failed (n=%d): %s\n", 542}, - {"trustdb transaction too large\n", 543}, - {"%s: can't access: %s\n", 544}, - {"%s: can't create directory: %s\n", 545}, - {"%s: directory created\n", 546}, - {"%s: directory does not exist!\n", 547}, - {"%s: can't create: %s\n", 548}, - {"%s: can't create lock\n", 549}, - {"%s: failed to create version record: %s", 550}, - {"%s: invalid trustdb created\n", 551}, - {"%s: trustdb created\n", 552}, - {"%s: invalid trustdb\n", 553}, - {"%s: failed to create hashtable: %s\n", 554}, - {"%s: error updating version record: %s\n", 555}, - {"%s: error reading version record: %s\n", 556}, - {"%s: error writing version record: %s\n", 557}, - {"trustdb: lseek failed: %s\n", 558}, - {"trustdb: read failed (n=%d): %s\n", 559}, - {"%s: not a trustdb file\n", 560}, - {"%s: version record with recnum %lu\n", 561}, - {"%s: invalid file version %d\n", 562}, - {"%s: error reading free record: %s\n", 563}, - {"%s: error writing dir record: %s\n", 564}, - {"%s: failed to zero a record: %s\n", 565}, - {"%s: failed to append a record: %s\n", 566}, - {"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n", 567}, - {"trust record %lu, req type %d: read failed: %s\n", 568}, - {"trust record %lu, type %d: write failed: %s\n", 569}, - {"trust record %lu: delete failed: %s\n", 570}, - {"trustdb: sync failed: %s\n", 571}, - {"error reading dir record for LID %lu: %s\n", 572}, - {"lid %lu: expected dir record, got type %d\n", 573}, - {"no primary key for LID %lu\n", 574}, - {"error reading primary key for LID %lu: %s\n", 575}, - {"get_dir_record: search_record failed: %s\n", 576}, - {"NOTE: secret key %08lX is NOT protected.\n", 577}, - {"key %08lX: secret key without public key - skipped\n", 578}, - {"key %08lX: secret and public key don't match\n", 579}, - {"key %08lX: can't put it into the trustdb\n", 580}, - {"key %08lX: query record failed\n", 581}, - {"key %08lX: already in trusted key table\n", 582}, - {"key %08lX: accepted as trusted key.\n", 583}, - {"enumerate secret keys failed: %s\n", 584}, - {"tdbio_search_sdir failed: %s\n", 585}, - {"key %08lX.%lu: Good subkey binding\n", 586}, - {"key %08lX.%lu: Invalid subkey binding: %s\n", 587}, - {"key %08lX.%lu: Valid key revocation\n", 588}, - {"key %08lX.%lu: Invalid key revocation: %s\n", 589}, - {"key %08lX.%lu: Valid subkey revocation\n", 590}, - {"Good self-signature", 591}, - {"Invalid self-signature", 592}, - {"Valid user ID revocation skipped due to a newer self signature", 593}, - {"Valid user ID revocation", 594}, - {"Invalid user ID revocation", 595}, - {"Valid certificate revocation", 596}, - {"Good certificate", 597}, - {"Invalid certificate revocation", 598}, - {"Invalid certificate", 599}, - {"sig record %lu[%d] points to wrong record.\n", 600}, - {"duplicated certificate - deleted", 601}, - {"tdbio_search_dir failed: %s\n", 602}, - {"lid ?: insert failed: %s\n", 603}, - {"lid %lu: insert failed: %s\n", 604}, - {"lid %lu: inserted\n", 605}, - {"error reading dir record: %s\n", 606}, - {"%lu keys processed\n", 607}, - {"\t%lu keys with errors\n", 608}, - {"\t%lu keys inserted\n", 609}, - {"enumerate keyblocks failed: %s\n", 610}, - {"lid %lu: dir record w/o key - skipped\n", 611}, - {"\t%lu keys skipped\n", 612}, - {"\t%lu keys updated\n", 613}, - {"Ooops, no keys\n", 614}, - {"Ooops, no user ids\n", 615}, - {"check_trust: search dir record failed: %s\n", 616}, - {"key %08lX: insert trust record failed: %s\n", 617}, - {"key %08lX.%lu: inserted into trustdb\n", 618}, - {"key %08lX.%lu: created in future (time warp or clock problem)\n", 619}, - {"key %08lX.%lu: expired at %s\n", 620}, - {"key %08lX.%lu: trust check failed: %s\n", 621}, - {"user '%s' not found: %s\n", 622}, - {"problem finding '%s' in trustdb: %s\n", 623}, - {"user '%s' not in trustdb - inserting\n", 624}, - {"failed to put '%s' into trustdb: %s\n", 625}, - {"WARNING: can't yet handle long pref records\n", 626}, - {"%s: can't create keyring: %s\n", 627}, - {"%s: keyring created\n", 628}, - {"WARNING: 2 files with confidential information exists.\n", 629}, - {"%s is the unchanged one\n", 630}, - {"%s is the new one\n", 631}, - {"Please fix this possible security flaw\n", 632}, - {"key is not flagged as insecure - can't use it with the faked RNG!\n", 633}, - {"skipped `%s': %s\n", 634}, +user: \"", 519}, + {"%u-bit %s key, ID %08lX, created %s", 520}, + {" (main key ID %08lX)", 521}, + {"can't query password in batchmode\n", 522}, + {"Enter passphrase: ", 523}, + {"Repeat passphrase: ", 524}, + {"data not saved; use option \"--output\" to save it\n", 525}, + {"Please enter name of data file: ", 526}, + {"reading stdin ...\n", 527}, + {"can't open signed data `%s'\n", 528}, + {"anonymous receiver; trying secret key %08lX ...\n", 529}, + {"okay, we are the anonymous recipient.\n", 530}, + {"old encoding of the DEK is not supported\n", 531}, + {"NOTE: cipher algorithm %d not found in preferences\n", 532}, + {"protection algorithm %d is not supported\n", 533}, + {"Invalid passphrase; please try again ...\n", 534}, + {"WARNING: Weak key detected - please change passphrase again.\n", 535}, + {"assuming bad MDC due to an unknown critical bit\n", 536}, + {"\ +this is a PGP generated ElGamal key which is NOT secure for signatures!\n", 537}, + {"public key is %lu second newer than the signature\n", 538}, + {"public key is %lu seconds newer than the signature\n", 539}, + {"NOTE: signature key expired %s\n", 540}, + {"assuming bad signature due to an unknown critical bit\n", 541}, + {"%s signature from: %s\n", 542}, + {"can't create %s: %s\n", 543}, + {"signing:", 544}, + {"WARNING: `%s' is an empty file\n", 545}, + {"can't handle text lines longer than %d characters\n", 546}, + {"input line longer than %d characters\n", 547}, + {"trustdb rec %lu: lseek failed: %s\n", 548}, + {"trustdb rec %lu: write failed (n=%d): %s\n", 549}, + {"trustdb transaction too large\n", 550}, + {"%s: can't access: %s\n", 551}, + {"%s: can't create directory: %s\n", 552}, + {"%s: directory created\n", 553}, + {"%s: directory does not exist!\n", 554}, + {"%s: can't create: %s\n", 555}, + {"%s: can't create lock\n", 556}, + {"%s: failed to create version record: %s", 557}, + {"%s: invalid trustdb created\n", 558}, + {"%s: trustdb created\n", 559}, + {"%s: invalid trustdb\n", 560}, + {"%s: failed to create hashtable: %s\n", 561}, + {"%s: error updating version record: %s\n", 562}, + {"%s: error reading version record: %s\n", 563}, + {"%s: error writing version record: %s\n", 564}, + {"trustdb: lseek failed: %s\n", 565}, + {"trustdb: read failed (n=%d): %s\n", 566}, + {"%s: not a trustdb file\n", 567}, + {"%s: version record with recnum %lu\n", 568}, + {"%s: invalid file version %d\n", 569}, + {"%s: error reading free record: %s\n", 570}, + {"%s: error writing dir record: %s\n", 571}, + {"%s: failed to zero a record: %s\n", 572}, + {"%s: failed to append a record: %s\n", 573}, + {"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n", 574}, + {"trust record %lu, req type %d: read failed: %s\n", 575}, + {"trust record %lu, type %d: write failed: %s\n", 576}, + {"trust record %lu: delete failed: %s\n", 577}, + {"trustdb: sync failed: %s\n", 578}, + {"error reading dir record for LID %lu: %s\n", 579}, + {"lid %lu: expected dir record, got type %d\n", 580}, + {"no primary key for LID %lu\n", 581}, + {"error reading primary key for LID %lu: %s\n", 582}, + {"get_dir_record: search_record failed: %s\n", 583}, + {"NOTE: secret key %08lX is NOT protected.\n", 584}, + {"key %08lX: secret key without public key - skipped\n", 585}, + {"key %08lX: secret and public key don't match\n", 586}, + {"key %08lX: can't put it into the trustdb\n", 587}, + {"key %08lX: query record failed\n", 588}, + {"key %08lX: already in trusted key table\n", 589}, + {"key %08lX: accepted as trusted key.\n", 590}, + {"enumerate secret keys failed: %s\n", 591}, + {"key %08lX.%lu: Good subkey binding\n", 592}, + {"key %08lX.%lu: Invalid subkey binding: %s\n", 593}, + {"key %08lX.%lu: Valid key revocation\n", 594}, + {"key %08lX.%lu: Invalid key revocation: %s\n", 595}, + {"key %08lX.%lu: Valid subkey revocation\n", 596}, + {"Good self-signature", 597}, + {"Invalid self-signature", 598}, + {"Valid user ID revocation skipped due to a newer self signature", 599}, + {"Valid user ID revocation", 600}, + {"Invalid user ID revocation", 601}, + {"Valid certificate revocation", 602}, + {"Good certificate", 603}, + {"Invalid certificate revocation", 604}, + {"Invalid certificate", 605}, + {"sig record %lu[%d] points to wrong record.\n", 606}, + {"duplicated certificate - deleted", 607}, + {"tdbio_search_dir failed: %s\n", 608}, + {"lid ?: insert failed: %s\n", 609}, + {"lid %lu: insert failed: %s\n", 610}, + {"lid %lu: inserted\n", 611}, + {"error reading dir record: %s\n", 612}, + {"%lu keys processed\n", 613}, + {"\t%lu keys with errors\n", 614}, + {"\t%lu keys inserted\n", 615}, + {"enumerate keyblocks failed: %s\n", 616}, + {"lid %lu: dir record w/o key - skipped\n", 617}, + {"\t%lu keys skipped\n", 618}, + {"\t%lu keys updated\n", 619}, + {"Ooops, no keys\n", 620}, + {"Ooops, no user ids\n", 621}, + {"check_trust: search dir record failed: %s\n", 622}, + {"key %08lX: insert trust record failed: %s\n", 623}, + {"key %08lX.%lu: inserted into trustdb\n", 624}, + {"key %08lX.%lu: created in future (time warp or clock problem)\n", 625}, + {"key %08lX.%lu: expired at %s\n", 626}, + {"key %08lX.%lu: trust check failed: %s\n", 627}, + {"user '%s' not found: %s\n", 628}, + {"problem finding '%s' in trustdb: %s\n", 629}, + {"user '%s' not in trustdb - inserting\n", 630}, + {"failed to put '%s' into trustdb: %s\n", 631}, + {"WARNING: can't yet handle long pref records\n", 632}, + {"%s: can't create keyring: %s\n", 633}, + {"%s: keyring created\n", 634}, + {"WARNING: 2 files with confidential information exists.\n", 635}, + {"%s is the unchanged one\n", 636}, + {"%s is the new one\n", 637}, + {"Please fix this possible security flaw\n", 638}, + {"key is not flagged as insecure - can't use it with the faked RNG!\n", 639}, + {"skipped `%s': %s\n", 640}, {"\ skipped `%s': this is a PGP generated ElGamal key which is not secure for \ -signatures!\n", 635}, - {"File `%s' exists. ", 636}, - {"Overwrite (y/N)? ", 637}, - {"%s: unknown suffix\n", 638}, - {"Enter new filename", 639}, - {"writing to stdout\n", 640}, - {"assuming signed data in `%s'\n", 641}, - {"%s: new options file created\n", 642}, - {"%s encrypted data\n", 643}, - {"encrypted with unknown algorithm %d\n", 644}, - {"\ -WARNING: message was encrypted with a weak key in the symmetric cipher.\n", 645}, - {"weak key created - retrying\n", 646}, - {"cannot avoid weak key for symmetric cipher; tried %d times!\n", 647}, - {"edit_ownertrust.value", 648}, - {"revoked_key.override", 649}, - {"untrusted_key.override", 650}, - {"pklist.user_id.enter", 651}, - {"keygen.algo", 652}, - {"keygen.algo.elg_se", 653}, - {"keygen.size", 654}, - {"keygen.size.huge.okay", 655}, - {"keygen.size.large.okay", 656}, - {"keygen.valid", 657}, - {"keygen.valid.okay", 658}, - {"keygen.name", 659}, - {"keygen.email", 660}, - {"keygen.comment", 661}, - {"keygen.userid.cmd", 662}, - {"keygen.sub.okay", 663}, - {"sign_uid.okay", 664}, - {"change_passwd.empty.okay", 665}, - {"keyedit.save.okay", 666}, - {"keyedit.cancel.okay", 667}, - {"keyedit.sign_all.okay", 668}, - {"keyedit.remove.uid.okay", 669}, - {"keyedit.remove.subkey.okay", 670}, - {"keyedit.delsig.valid", 671}, - {"keyedit.delsig.unknown", 672}, - {"keyedit.delsig.invalid", 673}, - {"keyedit.delsig.selfsig", 674}, - {"passphrase.enter", 675}, - {"passphrase.repeat", 676}, - {"detached_signature.filename", 677}, - {"openfile.overwrite.okay", 678}, - {"openfile.askoutname", 679}, - {"No help available", 680}, - {"No help available for `%s'", 681}, +signatures!\n", 641}, + {"File `%s' exists. ", 642}, + {"Overwrite (y/N)? ", 643}, + {"%s: unknown suffix\n", 644}, + {"Enter new filename", 645}, + {"writing to stdout\n", 646}, + {"assuming signed data in `%s'\n", 647}, + {"%s: new options file created\n", 648}, + {"%s encrypted data\n", 649}, + {"encrypted with unknown algorithm %d\n", 650}, + {"\ +WARNING: message was encrypted with a weak key in the symmetric cipher.\n", 651}, + {"weak key created - retrying\n", 652}, + {"cannot avoid weak key for symmetric cipher; tried %d times!\n", 653}, + {"edit_ownertrust.value", 654}, + {"revoked_key.override", 655}, + {"untrusted_key.override", 656}, + {"pklist.user_id.enter", 657}, + {"keygen.algo", 658}, + {"keygen.algo.elg_se", 659}, + {"keygen.size", 660}, + {"keygen.size.huge.okay", 661}, + {"keygen.size.large.okay", 662}, + {"keygen.valid", 663}, + {"keygen.valid.okay", 664}, + {"keygen.name", 665}, + {"keygen.email", 666}, + {"keygen.comment", 667}, + {"keygen.userid.cmd", 668}, + {"keygen.sub.okay", 669}, + {"sign_uid.okay", 670}, + {"change_passwd.empty.okay", 671}, + {"keyedit.save.okay", 672}, + {"keyedit.cancel.okay", 673}, + {"keyedit.sign_all.okay", 674}, + {"keyedit.remove.uid.okay", 675}, + {"keyedit.remove.subkey.okay", 676}, + {"keyedit.delsig.valid", 677}, + {"keyedit.delsig.unknown", 678}, + {"keyedit.delsig.invalid", 679}, + {"keyedit.delsig.selfsig", 680}, + {"passphrase.enter", 681}, + {"passphrase.repeat", 682}, + {"detached_signature.filename", 683}, + {"openfile.overwrite.okay", 684}, + {"openfile.askoutname", 685}, + {"No help available", 686}, + {"No help available for `%s'", 687}, }; -int _msg_tbl_length = 681; +int _msg_tbl_length = 687; diff -urN gnupg-0.9.9/po/de.po gnupg-0.9.10/po/de.po --- gnupg-0.9.9/po/de.po Fri Jul 23 14:25:58 1999 +++ gnupg-0.9.10/po/de.po Wed Aug 4 10:43:35 1999 @@ -3,8 +3,8 @@ # Walter Koch , 1998. msgid "" msgstr "" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" -"PO-Revision-Date: 1999-07-12 21:56+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" +"PO-Revision-Date: 1999-08-02 21:56+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -274,7 +274,7 @@ "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte benЖtigt.)\n" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -282,138 +282,135 @@ "@Befehle:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[Datei]|Eine Unterschrift erzeugen" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[Datei]|Eine Klartextunterschrift erzeugen" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "Eine abgetrennte Unterschrift erzeugen" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "Daten verschlЭsseln" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "Daten symmetrisch verschlЭsseln" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "Nur speichern" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "Daten entschlЭsseln (Voreinstellung)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "Signatur prЭfen" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "Liste der SchlЭssel" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "Liste der SchlЭssel und ihrer Signaturen" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "Signaturen der SchlЭssel prЭfen" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "Liste der SchlЭssel und ihrer \"FingerabdrЭcke\"" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "Liste der geheimen SchlЭssel" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "Ein neues SchlЭsselpaar erzeugen" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "SchlЭssel entfernen" -#: g10/g10.c:201 -#, fuzzy +#: g10/g10.c:203 msgid "sign a key" -msgstr "Den SchlЭssel signieren" +msgstr "SchlЭssel signieren" -#: g10/g10.c:202 -#, fuzzy +#: g10/g10.c:204 msgid "sign a key locally" -msgstr "Den SchlЭssel nur auf diesem Rechner signieren" +msgstr "SchlЭssel nur auf diesem Rechner signieren" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "Unterschreiben oder Bearbeiten eines SchlЭssels" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "Ein SchlЭsselwiderruf-Zertifikat erzeugen" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "SchlЭssel exportieren" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "SchlЭssel zu einem SchlЭsselserver exportieren" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "SchlЭssel von einem SchlЭsselserver importieren" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "SchlЭssel importieren/kombinieren" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "Lediglich die Struktur der Datenpakete anzeigen" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "Exportieren der \"Owner trust\" Werte" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "Importieren der \"Owner trust\" Werte" -#: g10/g10.c:218 -#, fuzzy +#: g10/g10.c:220 msgid "update the trust database" -msgstr "|[NAMEN]|дndern der \"Trust\"-Datenbank" +msgstr "дndern der \"Trust\"-Datenbank" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NAMEN]|эberprЭfen der \"Trust\"-Datenbank" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "Reparieren einer beschДdigten \"Trust\"-Datenbank" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "Datei oder stdin von der ASCII-HЭlle befreien" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "Datei oder stdin in eine ASCII-HЭlle einpacken" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [Dateien]|Message-Digests fЭr die Dateien ausgeben" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -423,171 +420,170 @@ "Optionen:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-HЭlle versehen" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NAME|VerschlЭsseln fЭr NAME" -#: g10/g10.c:234 -#, fuzzy +#: g10/g10.c:236 msgid "|NAME|use NAME as default recipient" -msgstr "|NAME|NAME als voreingestellten SchlЭssel benutzen" +msgstr "|NAME|NAME als voreingestellten EmpfДnger benutzen" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" -msgstr "Kompressionsstufe auf N setzen (0=keine Kompr.)" +msgstr "Kompressionsstufe auf N setzen (0=keine)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "Als Ausgabedatei benutzen" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "Detaillierte Informationen" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "Etwas weniger Infos" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "das Terminal gar nicht benutzen" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "v3 Signaturen erzwingen" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "Beim VerschlЭsseln ein Siegel (MDC) verwenden" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "Keine wirklichen дnderungen durchfЭhren" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "Stapelmodus: Keine Abfragen" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "\"Ja\" als Standardantwort annehmen" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "\"Nein\" als Standardantwort annehmen" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "Als Жffentlichen SchlЭsselbund mitbenutzen" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "Als geheimen SchlЭsselbund mitbenutzen" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|NAME als voreingestellten SchlЭssel benutzen" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|SchlЭssel bei diesem Server nachschlagen" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|Terminalzeichensatz NAME benutzen" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "Optionen aus der Datei lesen" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "Debug-Flags einschalten" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "Alle Debug-Flags einschalten" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "Keine Kommentarpakete schreiben" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "BenЖtigte Vollvertrauen (Voreinstellung 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "BenЖtigte Teilvertrauen (Voreinstellung 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|DATEI|Erweiterungsmodul DATEI laden" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "Den in RFC1991 beschriebenen Modus nachahmen" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -"alle Paket-, VerschlЭsselungs- und Hashoptionen auf OpenPGP-Verhalten " -"einstellen" +"alle Paket-, VerschlЭsselungs- und \n" +"Hashoptionen auf OpenPGP-Verhalten einstellen" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|Verwenden des Mantra-Modus N" -#: g10/g10.c:274 +#: g10/g10.c:276 msgid "|NAME|use message digest algorithm NAME for passphrases" -msgstr "|NAME|Das Hashverfahren NAME fЭr Mantras benutzen" +msgstr "|NAME|Hashverfahren NAME fЭr Mantras benutzen" -#: g10/g10.c:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" -msgstr "|NAME|Das VerschlЭ.verfahren NAME fЭr Mantras benutzen" +msgstr "|NAME|VerschlЭ.verfahren NAME fЭr Mantras benutzen" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" -msgstr "|NAME|Das VerschlЭ.verfahren NAME benutzen" +msgstr "|NAME|VerschlЭ.verfahren NAME benutzen" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" -msgstr "|NAME|Das Hashverfahren NAME benutzen" +msgstr "|NAME|Hashverfahren NAME benutzen" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" -msgstr "|N|Die Komprimierverfahren N benutzen" +msgstr "|N|Komprimierverfahren N benutzen" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" -msgstr "Entferne die Absender-ID verschlЭsselter Pakete" +msgstr "Entferne Absender-ID verschlЭsselter Pakete" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "|NAME=WERT|verwende diese \"notation\"-Daten" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -607,15 +603,15 @@ " --list-keys [Namen] SchlЭssel anzeigen\n" " --fingerprint [Namen] \"FingerabdrЭcke\" anzeigen\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "Berichte Эber Bugs (Programmfehler) bitte an .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h fЭr Hilfe)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -625,7 +621,7 @@ "Signieren, prЭfen, verschlЭsseln, entschlЭsseln\n" "Die voreingestellte Operation ist abhДngig von den Eingabedaten\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -633,173 +629,184 @@ "\n" "UnterstЭtzte Verfahren:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "WidersprЭchliche Befehle\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gЭltiger Zeichensatz.\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewДhlte VerschlЭsslungsverfahren ist ungЭltig\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewДhlte Hashverfahren ist ungЭltig\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "Die angegebene URL fЭr Richtlinien ist ungЭltig\n" -#: g10/g10.c:920 +#: g10/g10.c:941 #, 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:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed mЭssen grЖъer als 0 sein\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed mЭssen grЖъer als 1 sein\n" -#: g10/g10.c:926 +#: g10/g10.c:947 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:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:933 +#: g10/g10.c:954 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:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 -#, fuzzy +#: g10/g10.c:1120 msgid "--lsign-key user-id" -msgstr "--delete-key Benutzername" +msgstr "--lsign-key User-ID" -#: g10/g10.c:1107 -#, fuzzy +#: g10/g10.c:1128 msgid "--edit-key user-id [commands]" -msgstr "--edit-key Username [Befehle]" +msgstr "--edit-key User-ID [Befehle]" -#: g10/g10.c:1123 -#, fuzzy +#: g10/g10.c:1144 msgid "--delete-secret-key user-id" -msgstr "--delete-secret-key Username" +msgstr "--delete-secret-key User-ID" -#: g10/g10.c:1126 -#, fuzzy +#: g10/g10.c:1147 msgid "--delete-key user-id" -msgstr "--delete-key Benutzername" +msgstr "--delete-key User-ID" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 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:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" -msgstr "-k[v][v][v][c] [Benutzername] [Keyring]" +#: g10/g10.c:1182 +msgid "-k[v][v][v][c] [user-id] [keyring]" +msgstr "-k[v][v][v][c] [User-ID] [SchlЭsselbund]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-HЭlle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-HЭlle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "UngЭltiges Hashverfahren '%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "'%s' kann nicht geЖffnet werden\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 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:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -807,12 +814,12 @@ "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " "enthalten und muъ mit einem '=' enden\n" -#: g10/g10.c:1567 +#: g10/g10.c:1588 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:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" @@ -894,17 +901,21 @@ #. Translators: this shoud fit into 24 bytes to that the fingerprint #. * data is properly aligned with the user ID #: g10/pkclist.c:53 -#, fuzzy msgid " Fingerprint:" -msgstr " importiert: %lu" +msgstr " Fingerabdruck:" + +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "\"Fingerabdruck\" anzeigen" # valid user replies (not including 1..4) #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "sSmMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -913,7 +924,7 @@ "Es ist kein \"Owner trust\" fЭr %lu definiert:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -936,23 +947,23 @@ " 4 = Ich vertraue ihm vollstДndig\n" " s = Bitte weitere Information anzeigen\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = ZurЭck zum MenЭ\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr " q = verlassen\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Ihre Auswahl? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Zertifikate fЭhren zu einem letztlich vertrauenswЭrdigen SchlЭssel:\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -963,7 +974,7 @@ "ermitteln kЖnnen.\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -971,7 +982,7 @@ "Kein Pfad fЭhrt zu einen unserer SchlЭsseln.\n" "\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -979,7 +990,7 @@ "Keine Zertifikate mit undefinierten Vertrauen gefunden.\n" "\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -987,38 +998,38 @@ "Keine \"trust\" Werte geДndert.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "SchlЭssel %08lX: SchlЭssel wurde widerrufen\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "Diesen SchlЭssel trotzdem benutzen?" -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "SchlЭssel %08lX: UnterschlЭssel wurde widerrufen\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: SchlЭssel ist verfallen!\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" "%08lX: Keine Infos zur Berechnung der Vertrauenswahrscheinlichkeit " "vorgefunden\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: Wir haben KEIN Vertrauen zu diesem SchlЭssel!\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1027,18 +1038,18 @@ "%08lX: Es ist nicht sicher, daъ dieser SchlЭssel wirklich dem vorgeblichen\n" "Besitzer gehЖrt, aber er wird trotzdem akzeptiert\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "" "Dieser SchlЭssel gehЖrt hЖchstwahrscheinlich dem angegebenen Besitzer\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "" "Dieser SchlЭssel gehЖrt uns (da wir nДmlich den geheimen SchlЭssel dazu " "haben)\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1049,69 +1060,69 @@ "Wenn Sie *wirklich* wissen, was Sie tun, kЖnnen Sie die nДchste\n" "Frage mit ja beantworten\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "WARNUNG: Ein SchlЭssel ohne gesichertes Vertrauen wird benutzt!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "WARNUNG: Dieser SchlЭssel wurde von seinem Besitzer widerrufen!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Das kЖnnte bedeuten, daъ die Signatur gefДlscht ist.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "WARNUNG: Dieser UnterschlЭssel wurde von seinem Besitzer widerrufen!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Hinweis: Dieser SchlЭssel ist verfallen!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "WARNUNG: Dieser SchlЭssel trДgt keine vertrauenswЭrdige Signatur!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Es gibt keinen Hinweis, daъ die Signatur wirklich dem vorgeblichen " "Besitzer gehЖrt.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem SchlЭssel!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " Die Signatur ist wahrscheinlich eine FдLSCHUNG.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "WARNUNG: Dieser SchlЭssel ist nicht durch hinreichend vertrauenswЭrdige " "Signaturen zertifiziert!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Es ist nicht sicher, daъ die Signatur wirklich dem vorgeblichen " "Besitzer gehЖrt.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: Эbersprungen: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: Эbersprungen: Жffentlicher SchlЭssel bereits vorhanden\n" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1119,34 +1130,34 @@ "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Geben Sie die User-ID ein: " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "Keine solche User-ID vorhanden.\n" -#: g10/pkclist.c:739 -#, fuzzy +#: g10/pkclist.c:771 msgid "Public key is disabled.\n" -msgstr "жffentlicher SchlЭssel ist %08lX\n" +msgstr "жffentlicher SchlЭssel ist abgeschaltet.\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, c-format +msgid "unknown default recipient `%s'\n" +msgstr "Unbekannter voreingestellter EmpfДnger '%s'\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: Fehler beim PrЭfen des SchlЭssels: %s\n" -#: g10/pkclist.c:806 -#, fuzzy, c-format +#: g10/pkclist.c:838 +#, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "%s: Эbersprungen: Жffentlicher SchlЭssel bereits vorhanden\n" +msgstr "%s: Эbersprungen: Жffentlicher SchlЭssel ist abgeschaltet\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "Keine gЭltigen Adressaten\n" @@ -1491,17 +1502,17 @@ msgid "error creating passphrase: %s\n" msgstr "Fehler beim Erzeugen des Mantras: %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: WARNUNG: Leere Datei\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "Lesen von '%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s verschlЭsselt fЭr: %s\n" @@ -1533,6 +1544,18 @@ msgid "too many entries in unk cache - disabled\n" msgstr "zu viele EintrДge im unk-Lager - abgeschaltet\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +msgid "No key for user-id\n" +msgstr "Kein SchlЭssel fЭr User-ID\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +msgid "No user-id for key\n" +msgstr "Keine User-ID fЭr SchlЭssel\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1637,7 +1660,7 @@ msgid "no default public keyring\n" msgstr "Kein voreingestellter Жffentlicher SchlЭsselbund\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "Schreiben nach '%s'\n" @@ -1769,14 +1792,14 @@ msgstr "SchlЭssel %08lX: UngЭltige UnterschlЭssel-Anbindung\n" #: g10/import.c:769 -#, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" -msgstr "SchlЭssel %08lX: Эbergehe User-ID '" +#, c-format +msgid "key %08lX: accepted non self-signed user-id '" +msgstr "SchlЭssel %08lX: Nicht eigenbeglaubigte User-ID Эbernommen'" #: g10/import.c:798 #, c-format -msgid "key %08lX: skipped userid '" -msgstr "SchlЭssel %08lX: Эbergehe User-ID '" +msgid "key %08lX: skipped user-id '" +msgstr "SchlЭssel %08lX: User-ID Эbergangen '" #: g10/import.c:821 #, c-format @@ -2246,9 +2269,8 @@ msgstr "UngЭltiger Befehl (versuchen Sie's mal mit \"help\")\n" #: g10/keyedit.c:1065 -#, fuzzy msgid "This key has been disabled" -msgstr "Hinweis: Dieser SchlЭssel ist verfallen!\n" +msgstr "Hinweis: Dieser SchlЭssel ist abgeschaltet" #: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" @@ -2472,7 +2494,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:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n" @@ -2601,7 +2623,7 @@ msgid "%s signature from: %s\n" msgstr "%s Unterschrift von: %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "%s kann nicht erzeugt werden: %s\n" @@ -2610,7 +2632,7 @@ msgid "signing:" msgstr "unterschreibe:" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "WARNUNG: '%s' ist eine leere Datei.\n" @@ -2849,11 +2871,6 @@ msgid "enumerate secret keys failed: %s\n" msgstr "enum_secret_keys fehlgeschlagen: %s\n" -#: g10/trustdb.c:802 -#, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_sdir fehlgeschlagen: %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -2947,9 +2964,9 @@ msgstr "lid %lu: eingefЭgt\n" #: g10/trustdb.c:1652 -#, fuzzy, c-format +#, c-format msgid "error reading dir record: %s\n" -msgstr "Fehler beim Auffinden des Verz.Satzes: %s\n" +msgstr "Fehler beim Lesen des Verz.Satzes: %s\n" #: g10/trustdb.c:1660 g10/trustdb.c:1714 #, c-format @@ -3114,9 +3131,8 @@ msgstr "%s: unbekannte Dateinamenerweiterung\n" #: g10/openfile.c:119 -#, fuzzy msgid "Enter new filename" -msgstr "--store [Dateiname]" +msgstr "Neuen Dateinamen eingeben" #: g10/openfile.c:160 msgid "writing to stdout\n" @@ -3443,6 +3459,9 @@ #, c-format msgid "No help available for `%s'" msgstr "Keine Hilfe fЭr '%s' vorhanden." + +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "tdbio_search_sdir fehlgeschlagen: %s\n" #~ msgid "print all message digests" #~ msgstr "Message-Digests fЭr die Eingabedaten ausgeben" diff -urN gnupg-0.9.9/po/es_ES.po gnupg-0.9.10/po/es_ES.po --- gnupg-0.9.9/po/es_ES.po Fri Jul 23 14:25:59 1999 +++ gnupg-0.9.10/po/es_ES.po Wed Aug 4 10:43:37 1999 @@ -7,7 +7,7 @@ # GPG version: 0.9.7 msgid "" msgstr "" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+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" @@ -283,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:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -291,138 +291,138 @@ "@Comandos:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[file]|hace una firma" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[file]|hace una firma en texto claro" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "hace una firma separada" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "cifra datos" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "cifra sСlo con un cifrado simИtrico" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "sСlo almacenar" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "descifra datos (predefinido)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "lista claves" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "lista claves y firmas" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "comprueba las firmas de las claves" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "lista claves y huellas dactilares" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "lista claves secretas" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "genera un nuevo par de claves" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "elimina la clave del anillo pЗblico" -#: g10/g10.c:201 +#: g10/g10.c:203 #, fuzzy msgid "sign a key" msgstr "firma la clave" -#: g10/g10.c:202 +#: g10/g10.c:204 #, fuzzy msgid "sign a key locally" msgstr "firma la clave localmente" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "firma o modifica una clave" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "genera un certificado de revocaciСn" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "exporta claves" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "exporta claves a un servidor de claves" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "importa claves desde un servidor de claves" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "importa/fusiona claves" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "lista sСlo la secuencia de paquetes" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "exporta los valores de confianza" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "importa los valores de confianza" -#: g10/g10.c:218 +#: g10/g10.c:220 #, fuzzy msgid "update the trust database" msgstr "|[NOMBRES]|actualiza la base de datos de confianza" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NOMBRES]|comprueba la base de datos de confianza" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "arregla una base de datos de confianza daЯada" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "quita la armadura de un fichero o stdin" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "crea la armadura a un fichero o stdin" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [ficheros]|imprime resЗmenes de mensaje" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -432,173 +432,173 @@ "Opciones:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "crea una salida ascii con armadura" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NOMBRE|cifra para NOMBRE" -#: g10/g10.c:234 +#: g10/g10.c:236 #, fuzzy msgid "|NAME|use NAME as default recipient" msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "usa este usuario para firmar o descifrar" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|establece nivel de compresiСn N (0 no comprime)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "usa modo de texto canСnico" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "usa como fichero de salida" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "prolijo" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "algo mАs discreto" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "fuerza firmas v3" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "siempre usa un MCD para cifrar" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "no hace ningЗn cambio" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "proceso por lotes: nunca preguntar" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "asume \"sМ\" en casi todas las preguntas" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "asume \"no\" en casi todas las preguntas" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "aЯade este anillo a la lista de anillos" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "aЯade este anillo secreto a la lista" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|SERVIDOR|usa este servidor de claves" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NOMBRE|usa el juego de caracteres NOMBRE" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "lee opciones del fichero" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "establece los parАmetros de depuraciСn" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "habilita depuraciСn completa" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|DF|escribe informaciСn de estado en descriptor DF" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "no escribe paquetes de comentario" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "(por defecto es 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "(por defecto es 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|FICHERO|carga mСdulo de extensiones FICHERO" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "emula el modo descrito en la RFC1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|usa modo de contraseЯa N" -#: g10/g10.c:274 +#: g10/g10.c:276 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:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n" "contraseЯas" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|usa el algoritmo de compresiСn N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "elimina el campo keyid de los paquetes cifrados" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -618,15 +618,15 @@ " --list-keys [nombres] muestra las claves\n" " --fingerprint [nombres] muestra las huellas dactilares\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "Por favor, informe de posibles \"bugs\" a .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -636,7 +636,7 @@ "Firma, comprueba, cifra o descifra.\n" "La operaciСn por defecto depende del tipo de datos de entrada.\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -644,181 +644,197 @@ "\n" "Algoritmos soportados:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "uso: gpg [opciones] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "comandos incompatibles\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, 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:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado no es vАlido\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no es vАlido\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, 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:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 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:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n" -#: g10/g10.c:933 +#: g10/g10.c:954 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:1010 +#: g10/g10.c:1031 #, 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:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key nombre_usuario" -#: g10/g10.c:1107 +#: g10/g10.c:1128 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key nombre_usuario [comandos]" -#: g10/g10.c:1123 +#: g10/g10.c:1144 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nombre_usuario" -#: g10/g10.c:1126 +#: g10/g10.c:1147 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key nombre_usuario" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "no puede abrirse `%s': %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id_usuario] [anillo]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminaciСn de armadura fallida: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "creaciСn de armadura fallida: %s\n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribuciСn no vАlido `%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[nombre_fichero]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Adelante, teclee su mensaje ...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "no puede abrirse `%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -904,12 +920,17 @@ msgid " Fingerprint:" msgstr " importadas: %lu" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "muestra huella dactilar" + #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "iImMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -918,7 +939,7 @@ "No hay confianza definida para el propietario %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -940,23 +961,23 @@ " 4 = Me fМo completamente\n" " i = Mostrar mАs informaciСn\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = volver al menЗ principal\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr " q = salir\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Su decisiСn: " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que llevan a una clave de confianza absoluta:\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -966,7 +987,7 @@ "si es posible asignar algunos valores de confianza perdidos.\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -974,7 +995,7 @@ "No se ha encontrado ninguna ruta con una de nuestras claves.\n" "\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -982,7 +1003,7 @@ "No se ha encontrado ningЗn certificado sin valor de confianza.\n" "\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -990,36 +1011,36 @@ "No se cambiС ningЗn valor de confianza.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "clave %08lX: ║esta clave ha sido revocada!\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "©Usar esta clave de todas formas? " -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "clave %08lX: ║esta subclave ha sido revocada!\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: clave caducada\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "%08lX: no hay informaciСn para calcular la probabilidad de confianza\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: ║Esta clave NO es de confianza!\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1029,15 +1050,15 @@ "proprietario\n" "pero se acepta igualmente\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "Esta clave probablemente pertenece a su proprietario\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "Esta clave nos pertenece\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1049,66 +1070,66 @@ "\"sМ\" a la siguiente pregunta.\n" "\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "ATENCIсN: ║Usando una clave no fiable!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATENCIсN: ║Esta clave ha sido revocada por su propietario!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Esto puede significar que la firma estА falsificada.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATENCIсN: ║Esta clave ha sido revocada por su propietario!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Nota: ║Esta clave estА caducada!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "ATENCIсN: ║Esta clave no estА certificada por una firma de confianza!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " No hay indicios de que la firma pertenezca al propietario.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATENCIсN: ║Esta clave NO es de confianza!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " La firma es probablemente una FALSIFICACIсN.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATENCIсN: ║Esta clave no estА certificada con suficientes firmas de " "confianza!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 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:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, fuzzy, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: problema lectura del bloque de clave: %s\n" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1116,34 +1137,35 @@ "No se ha especificado un ID de usuario (puede usar \"-r\")\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Introduzca el ID de usuario: " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "ID de usuario inexistente.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 #, fuzzy msgid "Public key is disabled.\n" msgstr "la clave pЗblica es %08lX\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: error comprobando la clave: %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: problema lectura del bloque de clave: %s\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "no hay direcciones vАlidas\n" @@ -1490,17 +1512,17 @@ msgid "error creating passphrase: %s\n" msgstr "error creando contraseЯa: %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ATENCIсN: fichero vacМo\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "leyendo desde `%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s cifrado para: %s\n" @@ -1532,6 +1554,20 @@ msgid "too many entries in unk cache - disabled\n" msgstr "demasiados registros en la cache unk - anulada\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "clave %08lX: no hay identificativo de usuario\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "no hay clave secreta\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1635,7 +1671,7 @@ msgid "no default public keyring\n" msgstr "no hay anillo pЗblico por defecto\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "escribiendo en `%s'\n" @@ -1765,12 +1801,12 @@ #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "clave %08lX: ignorado identificativo de usuario '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "clave %08lX: ignorado identificativo de usuario '" #: g10/import.c:821 @@ -2475,7 +2511,7 @@ 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:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "el subpaquete de tipo %d tiene el bit crМtico activado\n" @@ -2596,7 +2632,7 @@ msgid "%s signature from: %s\n" msgstr "firma %s de %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "no puede crearse %s: %s\n" @@ -2605,7 +2641,7 @@ msgid "signing:" msgstr "firmando:" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATENCIсN `%s' es un fichero vacМo\n" @@ -2843,11 +2879,6 @@ msgid "enumerate secret keys failed: %s\n" msgstr "enum_secret_keys fallido: %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_dir fallida: %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -3292,6 +3323,10 @@ #, c-format msgid "No help available for `%s'" msgstr "Ayuda no disponible para `%s'" + +#, fuzzy +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "tdbio_search_dir fallida: %s\n" #~ msgid "print all message digests" #~ msgstr "imprime todos los resЗmenes de mensaje" diff -urN gnupg-0.9.9/po/fr.po gnupg-0.9.10/po/fr.po --- gnupg-0.9.9/po/fr.po Fri Jul 23 14:26:00 1999 +++ gnupg-0.9.10/po/fr.po Wed Aug 4 10:43:38 1999 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 0.9.7\n" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" "PO-Revision-Date: 1999-05-24 21:48+02:00\n" "Last-Translator: GaКl QuИri \n" "Language-Team: French \n" @@ -276,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:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -284,139 +284,139 @@ "@Commandes:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[fichier]|faire une signature" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[fichier]|faire une signature en texte clair" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "faire une signature dИtachИe" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "chiffrer les donnИes" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "chiffrement symИtrique seulement" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "pas d'action" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "dИchiffrer les donnИes (dИfaut)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "vИrifier une signature" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "lister les clИs" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "lister les clИs et les signatures" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "vИrifier les signatures des clИs" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "lister les clИs et les empreintes" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "lister les clИs secrХtes" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "gИnИrer une nouvelle paire de clИs" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "enlever la clИ du porte-clИs public" -#: g10/g10.c:201 +#: g10/g10.c:203 #, fuzzy msgid "sign a key" msgstr "signer la clИ" -#: g10/g10.c:202 +#: g10/g10.c:204 #, fuzzy msgid "sign a key locally" msgstr "signer la clИ localement" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "signer ou Иditer une clИ" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "gИnИrer un certificat de rИvocation" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "exporter les clИs" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "exporter les clИs vers un serveur de clИs" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "importer les clИs d'un serveur de clИs" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "importer/fusionner les clИs" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "ne lister que les paquets" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "exporter les indices de confiance" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "importer les indices de confiance" # -#: g10/g10.c:218 +#: g10/g10.c:220 #, fuzzy msgid "update the trust database" msgstr "|[NOMS]|mettre la base de confiance Ю jour" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NOMS]|vИrifier la base de confiance" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "rИparer une base de confiance corrompue" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "Enlever l'armure d'un fichier ou de stdin" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "Mettre une armure Ю un fichier ou Ю stdin" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|alg. [fich.]|indiquer les fonctions de hachage" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -426,171 +426,171 @@ "Options:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "crИer une sortie ascii avec armure" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NOM|chiffrer pour NOM" -#: g10/g10.c:234 +#: g10/g10.c:236 #, fuzzy msgid "|NAME|use NAME as default recipient" msgstr "|NOM|utiliser NOM comme clИ secrХte par dИfaut" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "utiliser ce nom pour signer ou dИchiffrer" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|niveau de compression N (0 dИsactive)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "utiliser le mode texte canonique" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "utiliser comme fichier de sortie" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "bavard" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "devenir beaucoup plus silencieux" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" # -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "forcer les signatures en v3" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "toujours utiliser un sceau pour le chiffrement" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "ne rien changer" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "mode automatique : ne jamais rien demander" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "rИpondre oui Ю la plupart des questions" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "rИpondre non Ю la plupart des questions" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "ajouter ce porte-clИs Ю la liste des porte-clИs" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "ajouter ce porte-clИs secret Ю la liste" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NOM|utiliser NOM comme clИ secrХte par dИfaut" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HтTE|utiliser ce serveur pour chercher des clИs" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NOM|le terminal utilise la table de caractХres NOM" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "lire les options du fichier" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "choisir les attributs de dИboguage" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "permettre un dИboguage complet" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|FD|Иcrire l'Иtat sur ce descripteur" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "ne pas Иcrire de paquets de commentaire" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "nombre de signatures complХtes requises (1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "nombre de signatures marginales requises (3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|FICH|charger le module d'extension FICH" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "imiter le mode dИcrit dans la RFC1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" # FIXMOI : faudra trouver mieux ... -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|utiliser le mode de codage des mots de passe N" -#: g10/g10.c:274 +#: g10/g10.c:276 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NOM|utiliser le hachage NOM pour les mots de passe" -#: g10/g10.c:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOM|utiliser l'algorithme de chiffrement NOM" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOM|utiliser la fonction de hachage NOM" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|utiliser l'algorithme de compression N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "supprimer l'identification des paquets chiffrИs" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -610,15 +610,15 @@ " --list-keys [utilisateur] montrer les clИs\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "Rapporter toutes anomalies Ю .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -628,7 +628,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:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -636,181 +636,197 @@ "\n" "Algorithmes supportИs:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, 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:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s' : %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, 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:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sИlectionnИ est invalide\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sИlectionnИe est invalide\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, 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:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "╚ completes-needed ╩ doit Йtre supИrieur Ю 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "╚ marginals-needed ╩ doit Йtre supИrieur Ю 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 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:929 +#: g10/g10.c:950 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:933 +#: g10/g10.c:954 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:1010 +#: g10/g10.c:1031 #, 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:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key utilisateur" -#: g10/g10.c:1107 +#: g10/g10.c:1128 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:1123 +#: g10/g10.c:1144 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key utilisateur" -#: g10/g10.c:1126 +#: g10/g10.c:1147 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key utilisateur" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "ne peut ouvrir %s: %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clИs]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "suppression d'armure non rИussie : %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "construction d'armure non rИussie : %s \n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Continuez et tapez votre message...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "ne peut ouvrir `%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -896,12 +912,17 @@ msgid " Fingerprint:" msgstr " importИe : %lu" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "afficher l'empreinte" + #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "sSmMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -910,7 +931,7 @@ "Pas de confiance dИfinie pour %lu :\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -934,23 +955,23 @@ " 4 = je le crois totalement\n" " s = montrez-moi plus d'informations\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = retour au menu principal\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr " q = quitter\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Votre dИcision ? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificats conduisant vers une clИ Ю confiance ultime :\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -959,7 +980,7 @@ "N'a pas pu trouver un chemin de confiance valide jusqu'Ю la clИ. Voyons si\n" "nous ne pouvons pas assigner quelques indices de confiance manquants.\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -967,7 +988,7 @@ "Aucun chemin menant vers une de nos clИs n'a ИtИ trouvИ.\n" "\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -975,7 +996,7 @@ "Aucun certificat Ю confiance indИfinie n'a ИtИ trouvИ.\n" "\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -983,36 +1004,36 @@ "Pas d'indice de confiance changИ.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "clИ %08lX : la clИ a ИtИ rИvoquИe !\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "Utiliser cette clИ quand-mЙme ? " -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "clИ %08lX : la sous-clИ a ИtИ rИvoquИe !\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX : la clИ a expirИ\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "%08lX : pas d'information pour calculer une probabilitИ de confiance\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX : Nous ne faisons PAS confiance Ю cette clИ\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1022,15 +1043,15 @@ "propriИtaire\n" "mais elle est quand mЙme acceptИe\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "Cette clИ appartient probablement Ю son propriИtaire\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "Cette clИ nous appartient\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1042,67 +1063,67 @@ "oui Ю la prochaine question\n" "\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENTION : Utilisation d'une clИ sans confiance !\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATTENTION : Cette clИ Ю ИtИ rИvoquИe par son propriИtaire !\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Cela pourrait signifier que la signature est fausse.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATTENTION : Cette sous-clИ Ю ИtИ rИvoquИe par son propriИtaire !\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Note : Cette clИ a expirИ !\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "ATTENTION : Cette clИ n'est pas certifiИe avec une signature de confiance !\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Rien ne dit que la signature appartient Ю son propriИtaire.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENTION : Nous ne faisons PAS confiance Ю cette clИ !\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " La signature est certainement FAUSSE.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATTENTION : Les signatures de cette clИ n'ont pas une confiance suffisante " "!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Il n'est pas sШr que la signature appartient Ю son propriИtaire.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s : ignorИ : %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, 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:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1111,34 +1132,35 @@ "\"-r\")\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Entrez le nom d'utilisateur : " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "Pas de tel utilisateur.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 #, fuzzy msgid "Public key is disabled.\n" msgstr "la clИ publique est %08lX\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "NOTE : pas de fichier d'options par dИfaut `%s'\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s : erreur pendant la vИrification de la clИ : %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s : problХme de lecture du bloc de clИs : %s\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "pas de destinataire valide\n" @@ -1484,17 +1506,17 @@ msgid "error creating passphrase: %s\n" msgstr "erreur pendant la crИation du mot de passe : %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s : ATTENTION : fichier vide\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "lecture de `%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s chiffrИ pour : %s\n" @@ -1526,6 +1548,20 @@ msgid "too many entries in unk cache - disabled\n" msgstr "trop d'entrИes dans le cache unk - dИsactivИ\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "clИ %08lX : pas de nom d'utilisateur\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "pas de clИ secrХte\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1631,7 +1667,7 @@ msgid "no default public keyring\n" msgstr "pas de porte-clИs public par dИfaut\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "Иcriture de `%s'\n" @@ -1761,12 +1797,12 @@ #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "clИ %08lX : utilisateur non pris en compte '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "clИ %08lX : utilisateur non pris en compte '" #: g10/import.c:821 @@ -2472,7 +2508,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:932 +#: g10/parse-packet.c:939 #, 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" @@ -2599,7 +2635,7 @@ msgid "%s signature from: %s\n" msgstr "Signature %s de : %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "ne peut crИer %s : %s\n" @@ -2608,7 +2644,7 @@ msgid "signing:" msgstr "signature :" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATTENTION : `%s' est un fichier vide\n" @@ -2853,11 +2889,6 @@ msgid "enumerate secret keys failed: %s\n" msgstr "l'ИnumИration des clИs secrХtes a ИchouИ : %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_dir a ИchouИ : %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -3348,6 +3379,10 @@ #, c-format msgid "No help available for `%s'" msgstr "Pas d'aide disponible pour `%s'" + +#, fuzzy +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "tdbio_search_dir a ИchouИ : %s\n" #~ msgid "print all message digests" #~ msgstr "Иcrire toutes les fonctions de hachage" diff -urN gnupg-0.9.9/po/gnupg.pot gnupg-0.9.10/po/gnupg.pot --- gnupg-0.9.9/po/gnupg.pot Fri Jul 23 14:25:57 1999 +++ gnupg-0.9.10/po/gnupg.pot Wed Aug 4 09:56:07 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -265,309 +265,309 @@ "the OS a chance to collect more entropy! (Need %d more bytes)\n" msgstr "" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " msgstr "" -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "" -#: g10/g10.c:201 +#: g10/g10.c:203 msgid "sign a key" msgstr "" -#: g10/g10.c:202 +#: g10/g10.c:204 msgid "sign a key locally" msgstr "" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "" -#: g10/g10.c:218 +#: g10/g10.c:220 msgid "update the trust database" msgstr "" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" " " msgstr "" -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "" -#: g10/g10.c:234 +#: g10/g10.c:236 msgid "|NAME|use NAME as default recipient" msgstr "" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "" -#: g10/g10.c:274 +#: g10/g10.c:276 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "" -#: g10/g10.c:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -579,198 +579,213 @@ " --fingerprint [names] show fingerprints\n" msgstr "" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" msgstr "" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" msgstr "" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "" -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "" -#: g10/g10.c:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:926 +#: g10/g10.c:947 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/g10.c:933 +#: g10/g10.c:954 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/g10.c:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 msgid "--lsign-key user-id" msgstr "" -#: g10/g10.c:1107 +#: g10/g10.c:1128 msgid "--edit-key user-id [commands]" msgstr "" -#: g10/g10.c:1123 +#: g10/g10.c:1144 msgid "--delete-secret-key user-id" msgstr "" -#: g10/g10.c:1126 +#: g10/g10.c:1147 msgid "--delete-key user-id" msgstr "" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -853,19 +868,23 @@ msgid " Fingerprint:" msgstr "" +#: g10/pkclist.c:80 +msgid "Fingerprint:" +msgstr "" + #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" "%4u%c/%08lX %s \"" msgstr "" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -878,92 +897,92 @@ " s = please show me more information\n" msgstr "" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr "" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr "" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "" -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" "\n" msgstr "" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" msgstr "" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "" -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" "but it is accepted anyway\n" msgstr "" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -971,95 +990,96 @@ "\n" msgstr "" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr "" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr "" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, c-format msgid "%s: skipped: public key already present\n" msgstr "" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" msgstr "" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "" -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 msgid "Public key is disabled.\n" msgstr "" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" +#: g10/pkclist.c:800 +#, c-format +msgid "unknown default recipient `%s'\n" msgstr "" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "" @@ -1361,17 +1381,17 @@ msgid "error creating passphrase: %s\n" msgstr "" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "" @@ -1403,6 +1423,18 @@ msgid "too many entries in unk cache - disabled\n" msgstr "" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +msgid "No key for user-id\n" +msgstr "" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +msgid "No user-id for key\n" +msgstr "" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1506,7 +1538,7 @@ msgid "no default public keyring\n" msgstr "" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "" @@ -1634,12 +1666,12 @@ #: g10/import.c:769 #, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "" #: g10/import.c:798 #, c-format -msgid "key %08lX: skipped userid '" +msgid "key %08lX: skipped user-id '" msgstr "" #: g10/import.c:821 @@ -2317,7 +2349,7 @@ msgid "can't handle public key algorithm %d\n" msgstr "" -#: g10/parse-packet.c:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" @@ -2432,7 +2464,7 @@ msgid "%s signature from: %s\n" msgstr "" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "" @@ -2441,7 +2473,7 @@ msgid "signing:" msgstr "" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "" @@ -2673,11 +2705,6 @@ #: g10/trustdb.c:511 #, c-format msgid "enumerate secret keys failed: %s\n" -msgstr "" - -#: g10/trustdb.c:802 -#, c-format -msgid "tdbio_search_sdir failed: %s\n" msgstr "" #: g10/trustdb.c:877 diff -urN gnupg-0.9.9/po/it.po gnupg-0.9.10/po/it.po --- gnupg-0.9.9/po/it.po Fri Jul 23 14:26:01 1999 +++ gnupg-0.9.10/po/it.po Wed Aug 4 10:43:39 1999 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.9.7\n" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" -"PO-Revision-Date: 1999-06-28 19:49+02:00\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" +"PO-Revision-Date: 1999-07-25 14:36+02:00\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -271,7 +271,7 @@ "altra cosa per dare all'OS la possibilitЮ di raccogliere altra entropia!\n" "(Servono ancora %d altri byte)\n" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -279,138 +279,135 @@ "@Comandi:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[file]|fai una firma" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[file]|fai una firma mantenendo il testo in chiaro" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "fai una firma separata" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "cifra dati" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "cifra solo con un cifrario simmetrico" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "immagazzina soltanto" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "decifra dati (predefinito)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "elenca le chiavi" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "elenca le chiavi e le firme" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "controlla le firme delle chiavi" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "elenca le chiavi e le impronte digitali" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "elenca le chiavi segrete" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "genera una nuova coppia di chiavi" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "rimuove una chiave dal portachiavi pubblico" -#: g10/g10.c:201 -#, fuzzy +#: g10/g10.c:203 msgid "sign a key" -msgstr "firma la chiave" +msgstr "firma una chiave" -#: g10/g10.c:202 -#, fuzzy +#: g10/g10.c:204 msgid "sign a key locally" -msgstr "firma la chiave localmente" +msgstr "firma localmente una chiave" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "firma o modifica una chiave" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "genera un certificato di revoca" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "esporta delle chiavi" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "esporta le chiavi a un key server" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "importa le chiavi da un key server" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "importa/aggiungi delle chiavi" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "elenca solo la sequenza dei pacchetti" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "esporta i valori di fiducia" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "importa i valori di fiducia" -#: g10/g10.c:218 -#, fuzzy +#: g10/g10.c:220 msgid "update the trust database" -msgstr "|[NOMI]|controlla il database della fiducia" +msgstr "aggiorna il database della fiducia" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NOMI]|controlla il database della fiducia" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "ripara un database della fiducia rovinato" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "rimuovi l'armatura a un file o a stdin" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "crea l'armatura a un file o a stdin" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [files]|stampa tutti i message digests" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -420,169 +417,170 @@ "Opzioni:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "crea un output ascii con armatura" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NOME|cifra per NOME" -#: g10/g10.c:234 -#, fuzzy +#: g10/g10.c:236 msgid "|NAME|use NAME as default recipient" -msgstr "|NAME|usa NAME come chiave segreta predefinita" +msgstr "|NOME|usa NOME come destinatario predefinito" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" -msgstr "" +msgstr "usa la chiave predefinita come destinatario predefinito" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "usa questo user-id per firmare o decifrare" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" -msgstr "|N|imposta il livello di compressione (0 disabilita)" +msgstr "|N|imposta il livello di compressione (0 disab.)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "usa il modo testo canonico" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "usa come file di output" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "prolisso" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "meno prolisso" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "non usa per niente il terminale" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "forza l'uso di firme v3" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "usa sempre un MDC per cifrare" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "non fa cambiamenti" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "modo batch: non fare domande" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "assumi \"sЛ\" a quasi tutte le domande" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "assumi \"no\" a quasi tutte le domande" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "aggiungi questo portachiavi alla lista" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "aggiungi questo portachiavi segreto alla lista" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" -msgstr "|NAME|usa NAME come chiave segreta predefinita" +msgstr "|NOME|usa NOME come chiave segreta predefinita" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|cerca le chiavi in questo keyserver" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" -msgstr "|NAME|imposta il set di caratteri del terminale NOME" +msgstr "|NOME|imposta il set di caratteri del terminale NOME" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "leggi le opzioni dal file" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "imposta i flag di debugging" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "abilita il debugging completo" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|FD|scrivi le informazioni di stato su questo fd" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "non scrivere pacchetti di commento" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "(predefinito Х 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "(predefinito Х 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|FILE|carica il modulo di estensione FILE" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "emula il modo descritto in RFC 1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" -msgstr "imposta per OpenPGP le opzioni di pacchetto, cifrario e digest" +msgstr "" +"imposta tutte le opzioni di pacchetto,\n" +"cifrario e digest per OpenPGP" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|usa il modo N per la passphrase" -#: g10/g10.c:274 +#: g10/g10.c:276 msgid "|NAME|use message digest algorithm NAME for passphrases" -msgstr "|NAME|usa l'algoritmo di message digest NOME" +msgstr "|NOME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" -msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase" +msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" -msgstr "|NAME|usa l'algoritmo di cifratura NOME" +msgstr "|NOME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" -msgstr "|NAME|usa l'algoritmo di message digest NOME" +msgstr "|NOME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|usa l'algoritmo di compressione N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "elimina il campo keyid dei pacchetti cifrati" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "|NOME=VALORE|usa questi dati per una nota" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -602,15 +600,15 @@ " --list-keys [nomi] mostra le chiavi\n" " --fingerprint [nomi] mostra le impronte digitali\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "Per favore segnala i bug a .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -620,7 +618,7 @@ "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -628,173 +626,185 @@ "\n" "Algoritmi gestiti:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "uso: gpg [options] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: manca il file con le opzioni predefinite `%s'\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "file con le opzioni `%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "%s non Х un set di caratteri valido\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non Х valido\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non Х valido\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "L'URL della policy indicato non Х valido\n" -#: g10/g10.c:920 +#: g10/g10.c:941 #, 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:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve essere tra 1 e 255\n" -#: g10/g10.c:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: l'uso del modo S2K semplice (0) Х fortemente scoraggiato\n" -#: g10/g10.c:933 +#: g10/g10.c:954 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:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" -msgstr "" +msgstr "--sign-key user-id" -#: g10/g10.c:1099 -#, fuzzy +#: g10/g10.c:1120 msgid "--lsign-key user-id" -msgstr "--delete-key nomeutente" +msgstr "--lsign-key user-id" -#: g10/g10.c:1107 -#, fuzzy +#: g10/g10.c:1128 msgid "--edit-key user-id [commands]" -msgstr "--edit-key nomeutente [comandi]" +msgstr "--edit-key user-id [comandi]" -#: g10/g10.c:1123 -#, fuzzy +#: g10/g10.c:1144 msgid "--delete-secret-key user-id" -msgstr "--delete-secret-key nomeutente" +msgstr "--delete-secret-key user-id" -#: g10/g10.c:1126 -#, fuzzy +#: g10/g10.c:1147 msgid "--delete-key user-id" -msgstr "--delete-key nomeutente" +msgstr "--delete-key user-id" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire `%s': %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [userid] [portachiavi]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Vai avanti e scrivi il messaggio...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "impossibile aprire `%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" "il primo carattere del nome di una nota deve essere una lettera o un\n" "underscore\n" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -802,11 +812,11 @@ "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n" "underscore e deve finire con `='\n" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "il valore di una nota non deve usare caratteri di controllo\n" @@ -888,18 +898,22 @@ #. Translators: this shoud fit into 24 bytes to that the fingerprint #. * data is properly aligned with the user ID #: g10/pkclist.c:53 -#, fuzzy msgid " Fingerprint:" -msgstr "importate: %lu" +msgstr " Fingerprint:" + +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "mostra le impronte digitali" # 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:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "sSmMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -908,7 +922,7 @@ "Nessun valore di fiducia assegnato a %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -930,23 +944,23 @@ " 4 = Mi fido completamente\n" " s = mostrami ulteriori informazioni\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = torna al menЫ principale\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr " q = abbandona\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Cosa hai deciso? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificati che portano a chiavi definitivamente affidabili:\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -956,20 +970,20 @@ "se possiamo assegnare qualche valore di fiducia del proprietario mancante.\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "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:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "Non Х stato trovato alcun certificato con fiducia non definita.\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -977,37 +991,37 @@ "Nessun valore di fiducia modificato.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "chiave %08lX: la chiave Х stata revocata!\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "Uso lo stesso questa chiave? " -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "chiave %08lX: la subchiave Х stata revocata!\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: la chiave Х scaduta\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, 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:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: NON ci fidiamo di questa chiave!\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1016,15 +1030,15 @@ "%08lX: Non Х sicuro che questa chiave appartenga veramente al proprietario\n" "ma Х accettata comunque\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "Questa chiave probabilmente appartiene al proprietario\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "Questa chiave ci appartiene\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1036,65 +1050,65 @@ "prossima domanda.\n" "\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENZIONE: uso di una chiave non fidata!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATTENZIONE: questa chiave Х stata revocata dal suo proprietario!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Questo puР significare che la firma Х stata falsificata.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATTENZIONE: questa subchiave Х stata revocata dal proprietario!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Nota: questa chiave Х scaduta!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "ATTENZIONE: questa chiave non Х certificata con una firma fidata!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Non ci sono indicazioni che la firma appartenga al proprietario.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " La firma Х probabilmente un FALSO.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATTENZIONE: questa chiave non Х certificata con firme abbastanza fidate!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 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:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: saltata: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: saltato: chiave pubblica giЮ presente\n" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1102,34 +1116,34 @@ "Non hai specificato un user ID. (puoi usare \"-r\")\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Inserisci l'user ID: " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "User ID inesistente.\n" -#: g10/pkclist.c:739 -#, fuzzy +#: g10/pkclist.c:771 msgid "Public key is disabled.\n" -msgstr "la chiave pubblica Х %08lX\n" +msgstr "La chiave pubblica Х disabilitata.\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "destinatario predefinito sconosciuto `s'\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: errore nel controllare la chiave: %s\n" -#: g10/pkclist.c:806 -#, fuzzy, c-format +#: g10/pkclist.c:838 +#, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "%s: saltato: chiave pubblica giЮ presente\n" +msgstr "%s: saltato: chiave pubblica disabilitata\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "nessun indirizzo valido\n" @@ -1470,17 +1484,17 @@ msgid "error creating passphrase: %s\n" msgstr "errore nella creazione della passhprase: %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ATTENZIONE: file vuoto\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "lettura da `%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s cifrato per: %s\n" @@ -1512,6 +1526,20 @@ msgid "too many entries in unk cache - disabled\n" msgstr "troppe voci nella unk cache - disabilitata\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "chiave %08lX: nessun user id\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "manca la chiave segreta\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1615,7 +1643,7 @@ msgid "no default public keyring\n" msgstr "nessun portachiavi pubblico predefinito\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "scrittura in `%s'\n" @@ -1745,12 +1773,12 @@ #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" -msgstr "chiave %08lX: saltato l'user id '" +msgid "key %08lX: accepted non self-signed user-id '" +msgstr "chiave %08lX: accettato l'userid non autofirmato '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "chiave %08lX: saltato l'user id '" #: g10/import.c:821 @@ -2113,21 +2141,19 @@ #: g10/keyedit.c:594 msgid "disable" -msgstr "" +msgstr "disable" #: g10/keyedit.c:594 -#, fuzzy msgid "disable a key" -msgstr "chiave sbagliata" +msgstr "disabilita una chiave" #: g10/keyedit.c:595 msgid "enable" -msgstr "" +msgstr "abilita" #: g10/keyedit.c:595 -#, fuzzy msgid "enable a key" -msgstr "chiave sbagliata" +msgstr "abilita una chiave" #: g10/keyedit.c:614 msgid "can't do that in batchmode\n" @@ -2223,9 +2249,8 @@ msgstr "Comando non valido (prova \"help\")\n" #: g10/keyedit.c:1065 -#, fuzzy msgid "This key has been disabled" -msgstr "Nota: questa chiave Х scaduta!\n" +msgstr "Questa chiave Х stata disabilitata" #: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" @@ -2327,19 +2352,18 @@ msgstr "dati cifrati con la chiave pubblica: DEK corretto\n" #: g10/mainproc.c:275 -#, fuzzy, c-format +#, c-format msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n" -msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s" +msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n" #: g10/mainproc.c:285 -#, fuzzy, c-format +#, c-format msgid "encrypted with %s key, ID %08lX\n" -msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n" +msgstr "Firma fatta con la chiave %s con ID %08lX\n" #: g10/mainproc.c:291 -#, fuzzy msgid "no secret key for decryption available\n" -msgstr "la chiave segreta non Х disponibile" +msgstr "nessuna chiave disponibile per decifrare\n" #: g10/mainproc.c:300 #, c-format @@ -2446,7 +2470,7 @@ msgid "can't handle public key algorithm %d\n" msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n" -#: g10/parse-packet.c:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n" @@ -2472,9 +2496,8 @@ msgstr " (key ID principale %08lX)" #: g10/passphrase.c:190 -#, fuzzy msgid "can't query password in batchmode\n" -msgstr "impossibile fare questo in batch mode\n" +msgstr "impossibile chiedere la password in batch mode\n" #: g10/passphrase.c:194 msgid "Enter passphrase: " @@ -2571,7 +2594,7 @@ msgid "%s signature from: %s\n" msgstr "Firma %s da: %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "impossibile creare %s: %s\n" @@ -2580,7 +2603,7 @@ msgid "signing:" msgstr "firma:" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATTENZIONE: `%s' Х un file vuoto\n" @@ -2816,11 +2839,6 @@ msgid "enumerate secret keys failed: %s\n" msgstr "enumerate secret keys fallito: %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_dir fallita: %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -2855,15 +2873,13 @@ msgstr "Autofirma non valida" #: g10/trustdb.c:1060 -#, fuzzy msgid "Valid user ID revocation skipped due to a newer self signature" msgstr "" -"Evitata la revoca dell'user ID valida a causa di una autofirma piЫ recente\n" +"Saltata una revoca dell'user ID valida a causa di una autofirma piЫ recente" #: g10/trustdb.c:1066 -#, fuzzy msgid "Valid user ID revocation" -msgstr "Revoca dell'user ID valida\n" +msgstr "Revoca dell'user ID valida" #: g10/trustdb.c:1071 msgid "Invalid user ID revocation" @@ -2915,9 +2931,9 @@ msgstr "lid %lu: inserito\n" #: g10/trustdb.c:1652 -#, fuzzy, c-format +#, c-format msgid "error reading dir record: %s\n" -msgstr "%s: errore durante la lettura del record libero: %s\n" +msgstr "errore durante la lettura del dir record: %s\n" #: g10/trustdb.c:1660 g10/trustdb.c:1714 #, c-format @@ -3082,9 +3098,8 @@ msgstr "%s: suffisso sconosciuto\n" #: g10/openfile.c:119 -#, fuzzy msgid "Enter new filename" -msgstr "--store [nomefile]" +msgstr "Inserire il nome del nuovo file" #: g10/openfile.c:160 msgid "writing to stdout\n" @@ -3257,7 +3272,7 @@ #. openfile.c (ask_outfile_name) #: g10/helptext.c:220 msgid "openfile.askoutname" -msgstr "" +msgstr "openfile.askoutname" #: g10/helptext.c:235 msgid "No help available" @@ -3268,82 +3283,5 @@ msgid "No help available for `%s'" msgstr "Non Х disponibile un aiuto per `%s'" -#~ msgid "print all message digests" -#~ msgstr "stampa tutti i message digests" - -#~ 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" - -#~ 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" - -#~ msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n" -#~ msgstr "Il rec di %lu[%d] nella hintlist di %lu non punta a un record dir\n" - -#~ msgid "lid %lu: no primary key\n" -#~ msgstr "lid %lu: manca la chiave primaria\n" - -#~ msgid "lid %lu: user id not found in keyblock\n" -#~ msgstr "lid %lu: user id non trovato nel keyblock\n" - -#~ msgid "lid %lu: user id without signature\n" -#~ msgstr "chiave %08lX: user id senza firma\n" - -#~ msgid "lid %lu: self-signature in hintlist\n" -#~ msgstr "lid %lu: autofirma nella hintlist\n" - -#~ msgid "very strange: no public key\n" -#~ msgstr "molto strano: non ci sono chiavi pubbliche\n" - -#~ msgid "hintlist %lu[%d] of %lu does not point to a dir record\n" -#~ msgstr "hintlist %lu[%d] di %lu non punta a un record dir\n" - -#~ msgid "lid %lu does not have a key\n" -#~ msgstr "Il lid %lu non ha una chiave\n" - -#~ msgid "lid %lu: can't get keyblock: %s\n" -#~ msgstr "lid %lu: impossibile ottenere il keyblock: %s\n" - -#~ msgid "Too many preferences" -#~ msgstr "Troppe preferenze" - -#~ msgid "Too many preference items" -#~ msgstr "Troppi elementi di preferenza" - -#~ msgid "public key not anymore available" -#~ msgstr "chiave pubblica non piЫ disponibile" - -#~ msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" -#~ msgstr "" -#~ "uid %08lX.%lu/%02X%02X: ha shadow dir %lu ma non Х ancora marcato.\n" - -#~ msgid "insert_trust_record: keyblock not found: %s\n" -#~ msgstr "insert_trust_record: keyblock non trovato: %s\n" - -#~ msgid "lid %lu: update failed: %s\n" -#~ msgstr "lid %lu: aggiornamento fallito: %s\n" - -#~ msgid "lid %lu: updated\n" -#~ msgstr "lid %lu: aggiornato\n" - -#~ msgid "lid %lu: okay\n" -#~ msgstr "lid %lu: corretto\n" - -#~ msgid "%s: keyblock read problem: %s\n" -#~ msgstr "%s: il keyblock ha problemi di lettura: %s\n" - -#~ msgid "%s: update failed: %s\n" -#~ msgstr "%s: aggiornamento fallito: %s\n" - -#~ msgid "%s: updated\n" -#~ msgstr "%s: aggiornato\n" - -#~ msgid "%s: okay\n" -#~ msgstr "%s: va bene\n" - -#~ msgid "lid %lu: keyblock not found: %s\n" -#~ msgstr "lid %lu: keyblock non trovato: %s\n" - -#~ msgid "keyedit.cmd" -#~ msgstr "keyedit.cmd" +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "tdbio_search_sdir fallita: %s\n" diff -urN gnupg-0.9.9/po/pl.po gnupg-0.9.10/po/pl.po --- gnupg-0.9.9/po/pl.po Fri Jul 23 14:26:03 1999 +++ gnupg-0.9.10/po/pl.po Wed Aug 4 10:43:40 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.9.7\n" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" "PO-Revision-Date: 1999-05-30 19:08+02:00\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -285,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:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -293,138 +293,138 @@ "@Polecenia:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[plik]|zЁo©enie podpisu" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[plik]|zЁo©enie podpisu na czytelnym dokumencie" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "sporz╠dzenie podpisu oddzielonego od dokumentu" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "szyfrowanie danych" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "szyfrowanie tylko szyfrem symetrycznym" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "tylko zapis" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "odszyfrowywanie danych (domy╤lnie)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "sprawdzenie podpisu" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "lista kluczy" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "lista kluczy i podpisСw" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "sprawdzenie podpisСw kluczy" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "lista kluczy i ich odciskСw" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "lista kluczy tajnych" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "generacja nowej pary klucza" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "usuniЙcie klucza ze zbioru kluczy publicznych" -#: g10/g10.c:201 +#: g10/g10.c:203 #, fuzzy msgid "sign a key" msgstr "zЁo©enie podpisu na kluczu" -#: g10/g10.c:202 +#: g10/g10.c:204 #, fuzzy msgid "sign a key locally" msgstr "zЁo©enie lokalnego podpisu na kluczu" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "podpisanie lub modyfikacja klucza" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "generacja certyfikatu uniewa©nienia klucza" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "eksport kluczy do pliku" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "eksport kluczy do serwera kluczy" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "import kluczy z serwera kluczy" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "import/doЁ╠czenie kluczy" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "wypisane sekwencji pakietСw" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "eksport warto╤ci zaufania" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "wczytanie warto╤Фi zaufania" -#: g10/g10.c:218 +#: g10/g10.c:220 #, fuzzy msgid "update the trust database" msgstr "|[NAZWY]|naniesienie poprawek do bazy zaufania" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NAZWY]|sprawdzenie bazy zaufania" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "naprawa uszkodzonej Bazy Zaufania" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "zdjЙcie opakowania ASCII pliku lub potoku" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "opakowanie ASCII pliku lub potoku" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [pliki]|skrСty wiadomo╤ci" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -434,169 +434,169 @@ "Opcje:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "plik wynikowy w opakowaniu ASCII" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA" -#: g10/g10.c:234 +#: g10/g10.c:236 #, fuzzy msgid "|NAME|use NAME as default recipient" msgstr "|NAZWA|u©ycie NAZWA jako domy╤lnego klucza tajnego" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "identyfikator do podpisania lub odszyfrowania" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|poziom kompresji N (0 - brak)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "kanoniczny format tekstowy" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "plik wyj╤ciowy" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "z informacjami dodatkowymi" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "mniej komunikatСww" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "wymuszenie trzeciej wersji formatu podpisСw" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "do szyfrowania bЙdzie u©ywany MDC" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "pozostawienie bez zmian" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "tryb wsadowy: ©adnych pytaЯ" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "automatyczna odpowied╪ tak na wiЙkszo╤Ф pytaЯ" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "automatyczna odpowied╪ nie na wiЙkszo╤Ф pytaЯ" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "dodaФ zbiСr kluczy do listy u©ywanych" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "dodaФ zbiСr kluczy tajnych do listy" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NAZWA|u©ycie NAZWA jako domy╤lnego klucza tajnego" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|serwer kluczy w ktСrym bЙd╠ poszukiwane" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NAZWA|zestaw znakСw terminala NAZWA" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "wczytanie opcji z pliku" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "ustawienie opcji ╤ledzenia wykonania programu" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "umo©liwienie peЁnego ╤ledzenia programu" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|FD|zapisaФ opis stanu do FD" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "nie zapisywaФ pakietСw z komentarzem" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "(domy╤lnie 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "(domy╤lnie 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|PLIK|Ёadowanie moduЁu rozszerzenia z PLIK" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "emulacja trybu opisanego w RFC1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|N-ty tryb wprowadzania wyra©enia przej╤ciowego" -#: g10/g10.c:274 +#: g10/g10.c:276 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|ALG|algorytm obliczania skrСtСw wiadomo╤ci ALG" -#: g10/g10.c:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|ALG|algorytmu szyfruj╠cy ALG dla hasЁa" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAZWA|algorytm szyfruj╠cy NAZWA" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAZWA|algorytm obliczania skrСtСw wiadomo╤ci NAZWA" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|algorytm kompresji N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "usuniЙcie identyfikatorСw kluczy z pakietСw" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -617,15 +617,15 @@ " --list-keys [nazwy] pokazuje klucze\n" " --fingerprint [nazwy] pokazuje odciski kluczy\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "BЁЙdy prosimy zgЁaszaФ na adres .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "WywoЁanie: gpg [opcje] [pliki] (-h podaje pomoc)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -635,7 +635,7 @@ "podpisywanie, sprawdzanie podpisСw, szyfrowanie, deszyfrowanie\n" "domy╤lnie wykonywana operacja zale©y od danych wej╤ciowych\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -643,181 +643,197 @@ "\n" "ObsЁugiwane algorytmy:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "wywoЁanie: gpg [opcje]" -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "sprzeczne polecenia\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "UWAGA: brak domy╤lnego pliku opcji '%s'\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "plik opcji '%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "odczyt opcji z '%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nie jest poprawn╠ nazw╠ zestawu znakСw\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj╠cy jest niepoprawny\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm geenracji skrСtСw wiadomo╤ci jest niepoprawny\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, 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:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "warto╤Ф completes-needed musi byФ wiЙksza od 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "warto╤Ф marginals-needed musi byФ wiЙksza od 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 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:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/g10.c:933 +#: g10/g10.c:954 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:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Inicjowanie Bazy Zaufania nie powiodЁo siЙ: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key nazwa u©ytkownika" -#: g10/g10.c:1107 +#: g10/g10.c:1128 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key nazwa u©ytkownika [polecenia]" -#: g10/g10.c:1123 +#: g10/g10.c:1144 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nazwa u©ytkownika" -#: g10/g10.c:1126 +#: g10/g10.c:1147 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key nazwa u©ytkownika" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "nie mogЙ otworzyФ %s: %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiСr kluczy]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "usuniЙcie opakowania ASCII nie powiodЁo siЙ: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "opakowywanie ASCII nie powiodЁo siЙ: %s\n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niewЁa╤ciwy algorytm skrСtu '%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Wpisz tutaj swoj╠ wiadomo╤Ф ...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "nie mogЙ otworzyФ '%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -903,12 +919,17 @@ msgid " Fingerprint:" msgstr " doЁ╠czono do zbioru: %lu" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "okazanie odcisku klucza" + #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "iIpPwW" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -917,7 +938,7 @@ "Brak warto╤ci zaufania dla %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -940,23 +961,23 @@ " 4 = W peЁni mu ufam.\n" " i = potrzebujЙ wiЙcej informacji\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " p = powrСt do gЁСwnego menu\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr "w = wyj╤cie\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Twoja decyzja? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certyfikaty prowadz╠ce do ostatecznie zaufanego klucza:\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -966,7 +987,7 @@ "Sprawd╪my czy mo©na przypisaФ brakuj╠ce warto╤ci zaufania.\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -974,7 +995,7 @@ "Brak ╤cie©ki prowadz╠cej do ktСrego╤ z naszych kluczy.\n" "\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -982,7 +1003,7 @@ "Brak certyfikatСw o niezdefiniowanym poziomie zaufania.\n" "\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -990,36 +1011,36 @@ "Parametry zaufania nie zostaЁy zmienione.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "klucz %08lX: klucz zostaЁ uniewa©niony!\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "U©yФ tego klucza pomimo to? " -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "klucz %08lX: podklucz zostaЁ uniewa©niony!\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: data wa©no╤ci klucza upЁynЙЁa\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "%08lX: brak informacji aby obliczyФ prawdopodobieЯstwo zaufania\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: NIE UFAMY temu kluczowi\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1028,16 +1049,16 @@ "%08lX: Nie ma pewno╤Фi ©e ten klucz faktycznie nale©y do odoby podaj╠cej\n" "siЙ za jego wЁa╤ciciela, ale jest akceptowalny.\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "" "Ten klucz prawdopodobnie nale©y do osoby podaj╠cej siЙ za jego wЁa╤ciciela.\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "Ten klucz nale©y do nas\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1048,67 +1069,67 @@ "wЁa╤ciciela. Je╤li nie masz co do tego ©adnych w╠tpliwo╤ci i *naprawdЙ*\n" "wiesz co robisz mo©esz odpowiedzieФ \"tak\" na nastЙpne pytanie.\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "OSTRZE╞ENIE: u©ywany jest klucz nie obdarzony zaufaniem!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "OSTRZE╞ENIE: Ten klucz zostaЁ uniewa©niony przez wЁa╤ciciela!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " To mo©e oznaczaФ ©e podpis jest faЁszerstwem.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "OSTRZE╞ENIE: Ten podklucz zostaЁ uniewa©niony przez wЁa╤ciciela!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Uwaga: Data wa©no╤ci tego klucza upЁynЙЁa!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "OSTRZE╞ENIE: Ten klucz nie jest po╤wiadczony zaufanym podpisem!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Nic nie wskazuje na to ©e ten podpis zЁo©yЁ wЁa╤ciciel klucza.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "OSTRZE╞ENIE: NIE UFAMY temu kluczowi!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " Ten podpis prawdopodobnie jest FAёSZERSTWEM.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "OSTRZE╞ENIE: Ten klucz nie jest po╤wiadczony wystarczaj╠co zaufanymi " "podpisami!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Nie ma pewno╤ci ©e ten podpis zostaЁ zЁo©nony przez wЁa╤ciciela.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: pominiЙty: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, fuzzy, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: problem przy odczycie bloku klucza: %s\n" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1116,34 +1137,35 @@ "Nie podaЁe╤ identyfikatora u©ytkownika (user ID). \n" "Mo©na to zrobiФ za pomoc╠ opcji \"-r\".\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Wprowad╪ identyfikator u©ytkownika (user ID): " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "Brak takiego identyfikatora u©ytkownika.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 #, fuzzy msgid "Public key is disabled.\n" msgstr "klucz publiczny %08lX\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "UWAGA: brak domy╤lnego pliku opcji '%s'\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: bЁ╠d podczas sprawdzania klucza: %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: problem przy odczycie bloku klucza: %s\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "brak poprawnych adresСw\n" @@ -1492,17 +1514,17 @@ msgid "error creating passphrase: %s\n" msgstr "bЁ╠d podczs tworzenia wyra©enia przej╤ciowego (hasЁa): %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: OSTRZE╞ENIE: plik jest pusty\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "odczyt z '%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s zaszyfrowany dla: %s\n" @@ -1534,6 +1556,20 @@ msgid "too many entries in unk cache - disabled\n" msgstr "zbyt wiele wpisСw w buforze nieznanych kluczy - wyЁ╠czony\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "klucz %08lX: brak identyfikatora u©ytkownika\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "brak klucza prywatnego\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1637,7 +1673,7 @@ msgid "no default public keyring\n" msgstr "brak domy╤lnego zbioru kluczy publicznych\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "zapis do '%s'\n" @@ -1770,12 +1806,12 @@ #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "klucz %08lX: zostaЁ pominiЙty identyfikator u©ytkownika '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "klucz %08lX: zostaЁ pominiЙty identyfikator u©ytkownika '" #: g10/import.c:821 @@ -2487,7 +2523,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:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n" @@ -2614,7 +2650,7 @@ msgid "%s signature from: %s\n" msgstr "%s podpis zЁo©ony przez: %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "nie mogЙ stworzyФ %s: %s\n" @@ -2623,7 +2659,7 @@ msgid "signing:" msgstr "podpis:" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "OSTRZE╞ENIE: plik '%s' jest pusty\n" @@ -2859,11 +2895,6 @@ msgid "enumerate secret keys failed: %s\n" msgstr "wyliczenie kluczy tajnych nie powiodЁo siЙ %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "Procedura tdbio_search_dir nie powiodЁa siЙ: %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -3364,6 +3395,10 @@ #, c-format msgid "No help available for `%s'" msgstr "Brak pomocy o '%s'" + +#, fuzzy +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "Procedura tdbio_search_dir nie powiodЁa siЙ: %s\n" #~ msgid "print all message digests" #~ msgstr "wszystkie skrСty wiadomo╤ci" diff -urN gnupg-0.9.9/po/pt_BR.po gnupg-0.9.10/po/pt_BR.po --- gnupg-0.9.9/po/pt_BR.po Fri Jul 23 14:26:04 1999 +++ gnupg-0.9.10/po/pt_BR.po Wed Aug 4 10:43:41 1999 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+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" @@ -285,7 +285,7 @@ "para que o sistema possa coletar mais entropia!\n" "(SЦo necessАrios mais %d bytes)\n" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -293,141 +293,141 @@ "@Comandos:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[arquivo]|faz uma assinatura" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[arquivo]|faz uma assinatura em texto puro" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "faz uma assinatura separada" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "criptografa dados" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "criptografa apenas com criptografia simИtrica" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "apenas armazena" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "descriptografa dados (padrЦo)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "verifica uma assinatura" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "lista as chaves" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "lista as chaves e as assinaturas" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "confere as assinaturas das chaves" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "lista as chaves e as impressУes digitais" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "lista as chaves secretas" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "gera um novo par de chaves" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "remove a chave do chaveiro pЗblico" -#: g10/g10.c:201 +#: g10/g10.c:203 #, fuzzy msgid "sign a key" msgstr "assina a chave" -#: g10/g10.c:202 +#: g10/g10.c:204 #, fuzzy msgid "sign a key locally" msgstr "assina a chave localmente" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "assina ou edita uma chave" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "gera um certificado de revogaГЦo" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "exporta as chaves" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "exporta chaves para um servidor" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "importa chaves de um servidor" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "importa/funde as chaves" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "lista apenas as seqЭЙncias de pacotes" # ownertrust ??? -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "exporta os valores de confianГa" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "importa os valores de confianГa" -#: g10/g10.c:218 +#: g10/g10.c:220 #, fuzzy msgid "update the trust database" msgstr "|[NOMES]|atualiza o banco de dados de confiabilidade" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NOMES]|confere o banco de dados de confiabilidade" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "" "conserta um banco de dados de confiabilidade\n" "danificado" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "Retira a armadura de um arquivo ou de \"stdin\"" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "Cria armadura para um arquivo ou \"stdin\"" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [arquivos]|imprime \"digests\" de mensagens" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -437,177 +437,177 @@ "OpГУes:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "cria uma saМda com armadura ascii" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NOME|criptografa para NOME" -#: g10/g10.c:234 +#: g10/g10.c:236 #, fuzzy msgid "|NAME|use NAME as default recipient" msgstr "|NOME|usa NOME como chave secreta padrЦo" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "" "usa este identificador de usuАrio para assinar\n" "ou descriptografar" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|estabelece nМvel de compressЦo N (0 desabilita)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "usa modo de texto canТnico" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "usa como arquivo de saМda" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "detalhado" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "ser mais silencioso" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "forГa assinaturas v3" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "sempre usar um MDC para criptografar" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "nЦo fazer alteraГУes" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "modo nЦo-interativo: nunca perguntar" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "assumir sim para a maioria das perguntas" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "assumir nЦo para a maioria das perguntas" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "adiciona este chaveiro Ю lista de chaveiros" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "adiciona este chaveiro secreto Ю lista" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usa NOME como chave secreta padrЦo" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|ENDEREгO|usa este servidor para buscar chaves" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NOME|define mapa de caracteres do terminal como NOME" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "lЙ opГУes do arquivo" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "define parБmetros de depuraГЦo" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "habilita depuraГЦo completa" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "" "|DA|escreve informaГУes de status para o descritor\n" "de arquivo DA" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "nЦo escreve pacotes de comentАrio" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "(o padrЦo И 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "(o padrЦo И 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|ARQUIVO|carrega mСdulo de extensЦo ARQUIVO" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "emula o modo descrito no RFC1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|usa frase secreta modo N" -#: g10/g10.c:274 +#: g10/g10.c:276 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:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOME|usa algoritmo de criptografia NOME para\n" "frases secretas" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOME|usa algoritmo de criptografia NOME" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|usa algoritmo de compressЦo N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "elimina o campo keyid dos pacotes criptografados" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -627,16 +627,16 @@ " --list-keys [nomes] mostra chaves\n" " --fingerprint [nomes] mostra impressУes digitais\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opГУes] [arquivos] (-h para ajuda)" # em cima, "check" estА como "conferir" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -646,7 +646,7 @@ "assina, verifica, criptografa ou descriptografa\n" "a operaГЦo padrЦo depende dos dados de entrada\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -654,182 +654,198 @@ "\n" "Algoritmos suportados:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "uso: gpg [opГУes] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de opГУes padrЦo `%s' inexistente\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de opГУes `%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "lendo opГУes de `%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nЦo И um conjunto de caracteres vАlido\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado nЦo И vАlido\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado nЦo И vАlido\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "o algoritmo de compressЦo deve estar na faixa %d..%d\n" -#: g10/g10.c:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 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:929 +#: g10/g10.c:950 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:933 +#: g10/g10.c:954 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:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key nome_do_usuАrio" -#: g10/g10.c:1107 +#: g10/g10.c:1128 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key nome_do_usuАrio [comandos]" -#: g10/g10.c:1123 +#: g10/g10.c:1144 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nome_do_usuАrio" -#: g10/g10.c:1126 +#: g10/g10.c:1147 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key nome_do_usuАrio" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossМvel abrir %s: %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id_do_usuАrio] [chaveiro]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "criaГЦo de armadura falhou: %s\n" # "hash" poderia ser "espalhamento", mas nЦo fica claro -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash invАlido `%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "VА em frente e digite sua mensagem ...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "impossМvel abrir `%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -915,14 +931,19 @@ msgid " Fingerprint:" msgstr " importados: %lu" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "mostra impressЦo digital" + # ??? #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 #, fuzzy msgid "sSmMqQ" msgstr "sSmMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -931,7 +952,7 @@ "Nenhum valor de confianГa designado para %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -954,23 +975,23 @@ " 4 = Eu confio completamente\n" " 5 = Mostrar mais informaГЦo\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = volta ao menu principal\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr " q = sai\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Sua decisЦo? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -980,13 +1001,13 @@ "Vamos ver se И possМvel designar alguns valores de confianГa ausentes.\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "Nenhuma rota encontrada que leve a uma de nossas chaves.\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -994,7 +1015,7 @@ "Nenhum certificado com confianГa indefinida encontrado.\n" "\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -1002,36 +1023,36 @@ "Nenhum valor de confianГa modificado.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "chave %08lX: a chave foi revogada!\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "Usa esta chave de qualquer modo? " -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "chave %08lX: a subchave foi revogada!\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: a chave expirou\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "%08lX: sem informaГЦo para calcular probabilidade de confianГa\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: NСs NцO confiamos nesta chave\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1040,15 +1061,15 @@ "%08lX: NЦo se tem certeza de que esta chave realmente pertence ao dono,\n" "mas И aceita de qualquer modo\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "Esta chave provavelmente pertence ao dono\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "Esta chave pertence a nСs\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1060,65 +1081,65 @@ "afirmativamente Ю prСxima pergunta\n" "\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "AVISO: Usando chave nЦo confiАvel!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Isto pode significar que a assinatura И falsificada.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Nota: Esta chave expirou!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "AVISO: Esta chave nЦo estА certificada com uma assinatura confiАvel!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " NЦo hА indicaГЦo de que a assinatura pertence ao dono.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "AVISO: NСs NцO confiamos nesta chave!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " A assinatura И provavelmente uma FALSIFICAгцO.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "AVISO: Esta chave nЦo estА certificada com assinaturas suficientemente\n" " confiАveis!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 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:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, 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:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1126,34 +1147,35 @@ "VocЙ nЦo especificou um ID de usuАrio. (pode-se usar \"-r\")\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Digite o identificador de usuАrio: " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "Identificador de usuАrio inexistente.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 #, fuzzy msgid "Public key is disabled.\n" msgstr "a chave pЗblica И %08lX\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "NOTA: arquivo de opГУes padrЦo `%s' inexistente\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: erro na verificaГЦo da chave: %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: erro de leitura de bloco de chaves: %s\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "nenhum endereГo vАlido\n" @@ -1496,17 +1518,17 @@ msgid "error creating passphrase: %s\n" msgstr "erro na criaГЦo da frase secreta: %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: AVISO: arquivo vazio\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "lendo de `%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s criptografado para: %s\n" @@ -1538,6 +1560,20 @@ msgid "too many entries in unk cache - disabled\n" msgstr "entradas demais no cache unk - desabilitado\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "chave %08lX: sem id de usuАrio\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "nenhuma chave secreta\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1641,7 +1677,7 @@ msgid "no default public keyring\n" msgstr "sem chaveiro pЗblico padrЦo\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "escrevendo para `%s'\n" @@ -1771,12 +1807,12 @@ #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "chave %08lX: id de usuАrio ignorado '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "chave %08lX: id de usuАrio ignorado '" #: g10/import.c:821 @@ -2488,7 +2524,7 @@ msgid "can't handle public key algorithm %d\n" msgstr "impossМvel manipular algoritmo de chave pЗblica %d\n" -#: g10/parse-packet.c:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpacote de tipo %d tem bit crМtico ligado\n" @@ -2609,7 +2645,7 @@ msgid "%s signature from: %s\n" msgstr "%s assinatura de: %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "impossМvel criar %s: %s\n" @@ -2618,7 +2654,7 @@ msgid "signing:" msgstr "assinando:" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVISO: `%s' И um arquivo vazio\n" @@ -2856,11 +2892,6 @@ msgid "enumerate secret keys failed: %s\n" msgstr "enumeraГЦo de chaves secretas falhou: %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_dir falhou: %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -3307,6 +3338,10 @@ #, c-format msgid "No help available for `%s'" msgstr "Nenhuma ajuda disponМvel para `%s'" + +#, fuzzy +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "tdbio_search_dir falhou: %s\n" #~ msgid "print all message digests" #~ msgstr "imprime todos os \"digests\" de mensagens" diff -urN gnupg-0.9.9/po/ru.po gnupg-0.9.10/po/ru.po --- gnupg-0.9.9/po/ru.po Fri Jul 23 14:26:05 1999 +++ gnupg-0.9.10/po/ru.po Wed Aug 4 10:43:42 1999 @@ -9,7 +9,7 @@ # QingLong (couldn't send an email to let you know) msgid "" msgstr "" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck \n" @@ -330,7 +330,7 @@ "Недостаточно случайных данных. Пожалуйста, поделайте что-нибудь, чтобы\n" "ОС могла набрать дополнительные случайные числа! (нужно еще %d байт)\n" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -338,142 +338,142 @@ "@Команды:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 #, fuzzy msgid "|[file]|make a signature" msgstr "|[файл]|создать подпись" -#: g10/g10.c:186 +#: g10/g10.c:188 #, fuzzy msgid "|[file]|make a clear text signature" msgstr "|[файл]|создать текстовую подпись" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "создать отдельную подпись" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "зашифровать данные" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "зашифровать симметричным алгоритмом" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "только сохранить" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "расшифровать данные (по умолчанию)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "проверить подпись" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "список ключей" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "список ключей и подписей" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "проверить подпись на ключе" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "список ключей с их \"отпечатками пальцев\"" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "список секретных ключей" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "сгенерировать новую пару ключей (открытый и секретный)" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "удалить ключ со связки" -#: g10/g10.c:201 +#: g10/g10.c:203 #, fuzzy msgid "sign a key" msgstr "подписать ключ" -#: g10/g10.c:202 +#: g10/g10.c:204 #, fuzzy msgid "sign a key locally" msgstr "подписать ключ" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "подписать или редактировать ключ" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "сгенерировать отзывающий сертификат" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "экспортировать ключи" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "импортировать/добавить ключи" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "напечатать только последовательность пакетов" -#: g10/g10.c:214 +#: g10/g10.c:216 #, fuzzy msgid "export the ownertrust values" msgstr "экспортировать параметры доверия\n" -#: g10/g10.c:216 +#: g10/g10.c:218 #, fuzzy msgid "import ownertrust values" msgstr "импортировать параметры доверия\n" -#: g10/g10.c:218 +#: g10/g10.c:220 #, fuzzy msgid "update the trust database" msgstr "|[ИМЕНА]|проверить базу данных доверия" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[ИМЕНА]|проверить базу данных доверия" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "исправить разрушенную базу данных доверия" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "Декодировать stdin или файл из ASCII-представления" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "Закодировать stdin или файл в ASCII-представление" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [files]|напечатать дайджест сообщения" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -483,178 +483,178 @@ "Параметры:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "вывод в ASCII-представлении" -#: g10/g10.c:231 +#: g10/g10.c:233 #, fuzzy msgid "|NAME|encrypt for NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:234 +#: g10/g10.c:236 #, fuzzy msgid "|NAME|use NAME as default recipient" msgstr "|ИМЯ|использовать ИМЯ в качестве секретного ключа по умолчанию" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "" "использовать указанный идентификатор пользователя для подписи или расшифровки" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|установить уровень сжатия (0 - не сжимать)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "использовать канонический текстовый режим" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "использовать в качестве выходного файла" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "многословный" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:250 #, fuzzy msgid "force v3 signatures" msgstr "проверить подпись на ключе" -#: g10/g10.c:249 +#: g10/g10.c:251 #, fuzzy msgid "always use a MDC for encryption" msgstr "использовать указанный идентификатор пользователя для шифрования" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "Keine wirklichen дnderungen durchfЭhren" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "пакетный режим: ничего не спрашивать" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "отвечать \"да\" на большинство вопросов" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "отвечать \"нет\" на большинство вопросов" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "добавить эту связку к списку связок ключей" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "добавить эту секретную связку к списку связок ключей" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|ИМЯ|использовать ИМЯ в качестве секретного ключа по умолчанию" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "" -#: g10/g10.c:259 +#: g10/g10.c:261 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "читать параметры из файла" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "установить отладочные флаги" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "разрешить всю отладку" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|FD| записывать информацию о состоянии в дескриптор (FD)" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "не писать пакеты с комментариями" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "(по умолчанию 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "(по умолчанию 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 #, fuzzy msgid "|FILE|load extension module FILE" msgstr "|ФАЙЛ|загрузить ФАЙЛ с расширяющими модулями" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "эмулировать режим описанный в RFC1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:272 +#: g10/g10.c:274 #, fuzzy msgid "|N|use passphrase mode N" msgstr "|N|использовать ключевую фразу режима N\n" -#: g10/g10.c:274 +#: g10/g10.c:276 #, fuzzy msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ для ключевых фраз" -#: g10/g10.c:276 +#: g10/g10.c:278 #, fuzzy msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ для ключевых фраз" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|использовать алгоритм сжатия N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "выбрасывать поле keyid у зашифрованных пакетов" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 #, fuzzy msgid "" "@\n" @@ -675,17 +675,17 @@ " --list-keys [names] показать список ключей\n" " --fingerprint [names] показать \"отпечатки пальцев\" ключей\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "" "Пожалуйста, отправляйте сообщения об ошибках по адресу " ".\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Использование: gpg [параметры] [файлы] (-h для помощи)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -695,7 +695,7 @@ "подписывает, проверяет подписи, шифрует или расшифровывает\n" "режим работы зависит от входных данных\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -703,182 +703,198 @@ "\n" "Поддерживаемые алгоритмы:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "Использование: gpg [параметры] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "WidersprЭchliche Kommandos\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, fuzzy, c-format msgid "NOTE: no default option file `%s'\n" msgstr "замечание: файл параметров по умолчанию `%s' отсутствует\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "файл параметров `%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "читаются параметры из `%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "Недопустимый символ в комментарии.\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "выбран недопустимый алгоритм шифрования\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "выбран недопустимый дайджест-алгоритм\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "алгоритм упаковки может иметь значения от %d до %d\n" -#: g10/g10.c:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed должен быть больше 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed должен быть больше 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:929 +#: g10/g10.c:950 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "замечание: простой S2K режим (0) очень не рекомендуется\n" -#: g10/g10.c:933 +#: g10/g10.c:954 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "недопустимый режим S2K: должен быть 0, 1 или 3\n" -#: g10/g10.c:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Ошибка инициализации базы данных доверия: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [имя файла]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [имя файла]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [имя файла]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [имя файла]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [имя файла]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [имя файла]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [имя файла]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key имя-пользователя" -#: g10/g10.c:1107 +#: g10/g10.c:1128 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key имя-пользователя" -#: g10/g10.c:1123 +#: g10/g10.c:1144 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key имя-пользователя" -#: g10/g10.c:1126 +#: g10/g10.c:1147 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key имя-пользователя" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "невозможно открыть файл `%s': %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [идентификатор пользователя] [связка ключей]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "ошибка декодирования: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "ошибка кодирования: %s\n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "недопустимый хэш-алгоритм `%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[имя файла]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "невозможно открыть файл `%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -965,14 +981,19 @@ msgid " Fingerprint:" msgstr "" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "показать \"отпечаток пальца\"" + # valid user replies (not including 1..4) #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 #, fuzzy msgid "sSmMqQ" msgstr "sSmMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, fuzzy, c-format msgid "" "No trust value assigned to %lu:\n" @@ -981,7 +1002,7 @@ "Не определены параметры доверия для %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 #, fuzzy msgid "" "Please decide how far you trust this user to correctly\n" @@ -1006,23 +1027,23 @@ " 4 = Верю полностью\n" " s = Пожалуйста, покажите дополнительную информацию\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = обратно в главное меню\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr "" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Ваше решение? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -1033,70 +1054,70 @@ "некоторые недостающие значения \"доверия владельцу\"\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 #, fuzzy msgid "" "No trust values changed.\n" "\n" msgstr "Значения параметров доверия не изменены.\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, fuzzy, c-format msgid "key %08lX: key has been revoked!\n" msgstr "build_sigrecs: ключ ist widerrufen\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "Все равно использовать этот ключ?" -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, fuzzy, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "build_sigrecs: ключ ist widerrufen\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, fuzzy, c-format msgid "%08lX: key has expired\n" msgstr "Замечание: Срок действия ключа уже истек!\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, fuzzy, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "ВНИМАНИЕ: Мы НЕ доверяем этому ключу!\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" "but it is accepted anyway\n" msgstr "" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1107,65 +1128,65 @@ "кто указан его владельцем. Отвечайте \"да\" на следующий вопрос,\n" "только если вы *действительно* понимаете что делаете.\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "ВНИМАНИЕ: Используется ключ к которому нет доверия!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ВНИМАНИЕ: Владелец ключа уже отозвал его!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Это может означать, что подпись поддельная.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 #, fuzzy msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ВНИМАНИЕ: Владелец ключа уже отозвал его!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Замечание: Срок действия ключа уже истек!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "ВНИМАНИЕ: Этот ключ не заверен доверенной подписью!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Нет никаких указания на то, что ключ принадлежит его владельцу.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "ВНИМАНИЕ: Мы НЕ доверяем этому ключу!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " Подпись вероятно -- ПОДДЕЛКА.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "ВНИМАНИЕ: Этот ключ не заверен достаточно доверенными подписями!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Нет уверенности, что подпись принадлежит владельцу.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: пропущен: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, c-format msgid "%s: skipped: public key already present\n" msgstr "" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1174,34 +1195,35 @@ "\"-r\").\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Введите идентификатор пользователя: " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "Нет такого идентификатора пользователя.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 #, fuzzy msgid "Public key is disabled.\n" msgstr "Открытый ключ не найден" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "замечание: файл параметров по умолчанию `%s' отсутствует\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: ошибка при проверке ключа: %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "нет допустимых адресов\n" @@ -1551,17 +1573,17 @@ msgid "error creating passphrase: %s\n" msgstr "ошибка при создании ключевой фразы: %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, fuzzy, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: предупреждение: пустой файл.\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "Читается из `%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, fuzzy, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s зашифровано для: %s\n" @@ -1594,6 +1616,20 @@ msgid "too many entries in unk cache - disabled\n" msgstr "" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "ключ %08lX: нет идентификатора пользователя\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "Плохой секретный ключ" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1697,7 +1733,7 @@ msgid "no default public keyring\n" msgstr "нет связки открытых ключей по умолчанию\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "записывается в `%s'\n" @@ -1827,12 +1863,12 @@ #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "ключ %08lX: пропущен идентификатор пользователя '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "ключ %08lX: пропущен идентификатор пользователя '" #: g10/import.c:821 @@ -2566,7 +2602,7 @@ msgid "can't handle public key algorithm %d\n" msgstr "невозможно заблокировать связку открытых ключей: %s\n" -#: g10/parse-packet.c:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" @@ -2690,7 +2726,7 @@ msgid "%s signature from: %s\n" msgstr "ПЛОХАЯ подпись от \"" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "%s: невозможно открыть: %s\n" @@ -2700,7 +2736,7 @@ msgid "signing:" msgstr "подписать" -#: g10/sign.c:401 +#: g10/sign.c:404 #, fuzzy, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "%s: предупреждение: пустой файл.\n" @@ -2935,11 +2971,6 @@ msgid "enumerate secret keys failed: %s\n" msgstr "обновление секрета не удалось: %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "ошибка декодирования: %s\n" - #: g10/trustdb.c:877 #, fuzzy, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -3408,6 +3439,10 @@ #, c-format msgid "No help available for `%s'" msgstr "Помощь для `%s' отсутствует." + +#, fuzzy +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "ошибка декодирования: %s\n" #~ msgid "print all message digests" #~ msgstr "напечатать все дайджесты сообщения" diff -urN gnupg-0.9.9/scripts/ChangeLog gnupg-0.9.10/scripts/ChangeLog --- gnupg-0.9.9/scripts/ChangeLog Wed Jul 14 19:42:14 1999 +++ gnupg-0.9.10/scripts/ChangeLog Wed Aug 4 10:34:19 1999 @@ -1,3 +1,9 @@ +Wed Aug 4 10:34:18 CEST 1999 Werner Koch + + + * config.guess: Updated from gnu/common and applied my emx patch again. + * config.sub: Updated from gnu/common. + Wed Jul 14 19:42:08 CEST 1999 Werner Koch diff -urN gnupg-0.9.9/scripts/config.guess gnupg-0.9.10/scripts/config.guess --- gnupg-0.9.9/scripts/config.guess Tue Jul 6 15:37:54 1999 +++ gnupg-0.9.10/scripts/config.guess Wed Aug 4 09:19:10 1999 @@ -1,6 +1,7 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 +# Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -114,7 +115,13 @@ esac fi rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 @@ -158,7 +165,7 @@ SR2?01:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*) + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 @@ -414,7 +421,7 @@ case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 ) + 9000/[678][0-9][0-9]) sed 's/^ //' << EOF >$dummy.c #include #include @@ -488,7 +495,7 @@ 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; - *9??*:MPE*:*:*) + *9??*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) @@ -507,6 +514,9 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -546,7 +556,7 @@ echo cray2-cray-unicos exit 0 ;; F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; @@ -559,12 +569,12 @@ hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; i?86:BSD/386:*:* | i?86:BSD/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; @@ -589,6 +599,15 @@ i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i386-pc-interix + exit 0 ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit 0 ;; @@ -622,7 +641,36 @@ sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; + elf32ppc) + # Determine Lib Version + cat >$dummy.c < +#if defined(__GLIBC__) +extern char __libc_version[]; +extern char __libc_release[]; +#endif +main(argc, argv) + int argc; + char *argv[]; +{ +#if defined(__GLIBC__) + printf("%s %s\n", __libc_version, __libc_release); +#else + printf("unkown\n"); +#endif + return 0; +} +EOF + LIBC="" + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null + if test "$?" = 0 ; then + ./$dummy | grep 1\.99 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi + rm -f $dummy.c $dummy + echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then @@ -755,6 +803,14 @@ echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} fi exit 0 ;; + i?86:*:5:7*) + UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` + (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586 + (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} + exit 0 ;; i?86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 + (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i?86:UnixWare:*:*) - if /bin/uname -X 2>/dev/null >/dev/null ; then - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - fi - echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION} - exit 0 ;; pc:*:*:*) # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. @@ -862,7 +915,7 @@ news*:NEWS-OS:*:6*) echo mips-sony-newsos6 exit 0 ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*) + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -993,7 +1046,7 @@ #endif #if defined(__EMX__) - printf ("i386-emx-os2"); exit(0); + printf ("i386-pc-os2_emx"); exit(0); #endif exit (1); diff -urN gnupg-0.9.9/scripts/config.sub gnupg-0.9.10/scripts/config.sub --- gnupg-0.9.9/scripts/config.sub Tue Jul 6 15:37:49 1999 +++ gnupg-0.9.10/scripts/config.sub Wed Aug 4 09:19:14 1999 @@ -1,6 +1,6 @@ #! /bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc. +# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc. # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -98,11 +98,21 @@ os= basic_machine=$1 ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=vxworks + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; -sco5) - os=sco3.2v5 + os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) @@ -121,6 +131,9 @@ os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -isc) os=-isc2.2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -152,14 +165,20 @@ tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w \ + | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp11 | mips64 | mipsel | mips64el \ + | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ - | sparc | sparclet | sparclite | sparc64 | v850) + | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ + | mips64vr5000 | miprs64vr5000el \ + | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ + | thumb | d10v) basic_machine=$basic_machine-unknown ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -175,26 +194,41 @@ vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ + | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ | xmp-* | ymp-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ - | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67] \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ + | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ + | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ | mipstx39-* | mipstx39el-* \ - | f301-* | armv*-*) + | f301-* | armv*-* | t3e-* \ + | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ + | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; alliant | fx80) basic_machine=fx80-alliant ;; @@ -224,6 +258,10 @@ basic_machine=m68k-apollo os=-sysv ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; aux) basic_machine=m68k-apple os=-aux @@ -300,6 +338,10 @@ encore | umax | mmax) basic_machine=ns32k-encore ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; fx2800) basic_machine=i860-alliant ;; @@ -318,6 +360,14 @@ basic_machine=h8300-hitachi os=-hms ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; harris) basic_machine=m88k-harris os=-sysv3 @@ -333,13 +383,30 @@ basic_machine=m68k-hp os=-hpux ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) basic_machine=m68k-hp ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) @@ -348,13 +415,13 @@ hppa-next) os=-nextstep3 ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - os=-mpeix + hppaosf) + basic_machine=hppa1.1-hp + os=-osf ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - os=-mpeix + hppro) + basic_machine=hppa1.1-hp + os=-proelf ;; i370-ibm* | ibm*) basic_machine=i370-ibm @@ -377,6 +444,22 @@ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + i386-go32 | go32) + basic_machine=i386-unknown + os=-go32 + ;; + i386-mingw32 | mingw32) + basic_machine=i386-unknown + os=-mingw32 + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -405,6 +488,10 @@ miniframe) basic_machine=m68000-convergent ;; + *mint | *MiNT) + basic_machine=m68k-atari + os=-mint + ;; mipsel*-linux*) basic_machine=mipsel-unknown os=-linux-gnu @@ -419,10 +506,22 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + msdos) + basic_machine=i386-unknown + os=-msdos + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; netwinder) basic_machine=armv4l-corel os=-linux @@ -439,6 +538,10 @@ basic_machine=mips-sony os=-newsos ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; next | m*-next ) basic_machine=m68k-next case $os in @@ -464,9 +567,25 @@ basic_machine=i960-intel os=-nindy ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; np1) basic_machine=np1-gould ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -484,19 +603,19 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | nexen) + pentium | p5 | k5 | k6 | nexen) basic_machine=i586-pc ;; - pentiumpro | p6 | k6 | 6x86) + pentiumpro | p6 | 6x86) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i786-pc ;; - pentium-* | p5-* | k5-* | nexen-*) + pentium-* | p5-* | k5-* | k6-* | nexen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-* | k6-* | 6x86-*) + pentiumpro-* | p6-* | 6x86-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-*) @@ -520,12 +639,20 @@ ps2) basic_machine=i386-ibm ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; sequent) basic_machine=i386-sequent ;; @@ -533,6 +660,10 @@ basic_machine=sh-hitachi os=-hms ;; + sparclite-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; sps7) basic_machine=m68k-bull os=-sysv2 @@ -540,6 +671,13 @@ spur) basic_machine=spur-unknown ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; sun2) basic_machine=m68000-sun ;; @@ -584,6 +722,10 @@ basic_machine=i386-sequent os=-dynix ;; + t3e) + basic_machine=t3e-cray + os=-unicos + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -601,6 +743,10 @@ basic_machine=a29k-nyu os=-sym1 ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; vaxv) basic_machine=vax-dec os=-sysv @@ -624,6 +770,14 @@ basic_machine=a29k-wrs os=-vxworks ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; xmp) basic_machine=xmp-cray os=-unicos @@ -631,12 +785,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; - *mint | *MiNT) - basic_machine=m68k-atari - os=-mint - ;; - os2 ) - os=-os2 + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim ;; none) basic_machine=none-none @@ -645,6 +796,15 @@ # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; mips) if [ x$os = x-linux-gnu ]; then basic_machine=mips-unknown @@ -667,7 +827,7 @@ we32k) basic_machine=we32k-att ;; - sparc) + sparc | sparcv9) basic_machine=sparc-sun ;; cydra) @@ -679,6 +839,16 @@ orion105) basic_machine=clipper-highlevel ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 @@ -732,14 +902,21 @@ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \ - | -openstep* | -mpeix* | -oskit*) + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -764,6 +941,9 @@ -acis*) os=-aos ;; + -386bsd) + os=-bsd + ;; -ctix* | -uts*) os=-sysv ;; @@ -795,6 +975,12 @@ # This must come after -sysvr4. -sysv*) ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; -xenix) os=-xenix ;; @@ -850,6 +1036,15 @@ # default. # os=-sunos4 ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -862,6 +1057,15 @@ *-ibm) os=-aix ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; *-hp) os=-hpux ;; @@ -925,6 +1129,15 @@ f301-fujitsu) os=-uxpv ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; *-atari*) os=-mint ;; @@ -949,10 +1162,10 @@ -aix*) vendor=ibm ;; - -hpux*) - vendor=hp + -beos*) + vendor=be ;; - -mpeix*) + -hpux*) vendor=hp ;; -mpeix*) @@ -983,6 +1196,12 @@ vendor=wrs ;; -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) vendor=apple ;; -*mint | -*MiNT) diff -urN gnupg-0.9.9/scripts/gnupg.spec gnupg-0.9.10/scripts/gnupg.spec --- gnupg-0.9.9/scripts/gnupg.spec Fri Jul 23 14:26:37 1999 +++ gnupg-0.9.10/scripts/gnupg.spec Wed Aug 4 10:44:05 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.9 +%define version 0.9.10 %define name gnupg Summary: GPL public key crypto Name: %{name} diff -urN gnupg-0.9.9/util/iobuf.c gnupg-0.9.10/util/iobuf.c --- gnupg-0.9.9/util/iobuf.c Fri Jun 18 07:48:05 1999 +++ gnupg-0.9.10/util/iobuf.c Wed Aug 4 10:24:10 1999 @@ -92,7 +92,7 @@ if( control == IOBUFCTRL_UNDERFLOW ) { assert( size ); /* need a buffer */ - if ( feof(fp)) { /* On terminals you could easiely read as many EOFs as you call */ + 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. */ } @@ -425,7 +425,7 @@ log_debug("iobuf chain: %d.%d `%s' filter_eof=%d start=%d len=%d\n", a->no, a->subno, desc, a->filter_eof, - a->d.start, a->d.len ); + (int)a->d.start, (int)a->d.len ); } } -----BEGIN PGP SIGNATURE----- Version: GnuPG v0.9.10 (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE3qAJ+aLeriVdUjc0RAjJjAJ9afITc+mLryB+bwrMMbJ6ErdyC2wCePQac fyWkCuKv2fc+cV6XwC/c4O0= =Za6/ -----END PGP SIGNATURE-----