From 750d74333ce5b3ec8ff37d45b64fd0603e043051 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 23 Dec 1998 12:41:40 +0000 Subject: [PATCH] See ChangeLog: Wed Dec 23 13:34:22 CET 1998 Werner Koch --- AUTHORS | 22 +- ChangeLog | 4 + INSTALL | 15 +- NEWS | 6 +- PROJECTS | 37 +- README | 396 +++++++++++-------- TODO | 53 ++- VERSION | 2 +- cipher/blowfish.c | 6 +- cipher/blowfish.h | 6 +- cipher/cast5.c | 6 +- cipher/cast5.h | 6 +- cipher/cipher.c | 6 +- cipher/des.c | 6 +- cipher/des.h | 6 +- cipher/dsa.c | 6 +- cipher/dsa.h | 6 +- cipher/dynload.c | 6 +- cipher/dynload.h | 6 +- cipher/elgamal.c | 6 +- cipher/elgamal.h | 6 +- cipher/g10c.c | 6 +- cipher/gost.c | 6 +- cipher/gost.h | 6 +- cipher/md.c | 6 +- cipher/md5.c | 2 +- cipher/md5.h | 6 +- cipher/primegen.c | 6 +- cipher/pubkey.c | 6 +- cipher/rand-internal.h | 6 +- cipher/random.c | 6 +- cipher/random.h | 6 +- cipher/rmd.h | 6 +- cipher/rmd160.c | 6 +- cipher/rmd160test.c | 6 +- cipher/sha1.c | 6 +- cipher/sha1.h | 6 +- cipher/smallprime.c | 6 +- cipher/tiger.c | 6 +- doc/HACKING | 38 ++ g10/ChangeLog | 12 + g10/armor.c | 2 +- g10/build-packet.c | 6 +- g10/cipher.c | 6 +- g10/comment.c | 6 +- g10/compress.c | 6 +- g10/dearmor.c | 6 +- g10/decrypt.c | 6 +- g10/delkey.c | 6 +- g10/encode.c | 6 +- g10/encr-data.c | 6 +- g10/export.c | 6 +- g10/filter.h | 6 +- g10/free-packet.c | 6 +- g10/g10.c | 6 +- g10/getkey.c | 42 +- g10/gpgd.c | 8 +- g10/import.c | 3 + g10/kbnode.c | 6 +- g10/keydb.h | 8 +- g10/keyedit.c | 6 +- g10/keygen.c | 6 +- g10/keyid.c | 6 +- g10/keylist.c | 6 +- g10/ks-proto.c | 6 +- g10/ks-proto.h | 6 +- g10/main.h | 6 +- g10/mainproc.c | 6 +- g10/mdfilter.c | 6 +- g10/misc.c | 6 +- g10/openfile.c | 6 +- g10/options.h | 6 +- g10/options.skel | 2 +- g10/packet.h | 23 +- g10/parse-packet.c | 107 ++++- g10/passphrase.c | 6 +- g10/pkclist.c | 22 +- g10/plaintext.c | 6 +- g10/pref.c | 6 +- g10/pref.h | 6 +- g10/pubkey-enc.c | 6 +- g10/revoke.c | 6 +- g10/ringedit.c | 36 +- g10/seckey-cert.c | 6 +- g10/seskey.c | 6 +- g10/sig-check.c | 6 +- g10/sign.c | 6 +- g10/signal.c | 6 +- g10/skclist.c | 6 +- g10/status.c | 6 +- g10/status.h | 6 +- g10/tdbio.c | 6 +- g10/tdbio.h | 6 +- g10/textfilter.c | 6 +- g10/trustdb.c | 32 +- g10/trustdb.h | 9 +- g10/verify.c | 6 +- mpi/g10m.c | 6 +- mpi/mpi-add.c | 6 +- mpi/mpi-bit.c | 6 +- mpi/mpi-cmp.c | 6 +- mpi/mpi-div.c | 6 +- mpi/mpi-gcd.c | 6 +- mpi/mpi-inline.h | 6 +- mpi/mpi-internal.h | 6 +- mpi/mpi-inv.c | 6 +- mpi/mpi-mpow.c | 6 +- mpi/mpi-mul.c | 6 +- mpi/mpi-pow.c | 6 +- mpi/mpi-scan.c | 6 +- mpi/mpicoder.c | 6 +- mpi/mpih-add.c | 6 +- mpi/mpih-cmp.c | 6 +- mpi/mpih-div.c | 6 +- mpi/mpih-mul.c | 6 +- mpi/mpih-sub.c | 6 +- mpi/mpiutil.c | 6 +- po/de.po | 859 +++++++++++++++++++++++------------------ po/es_ES.po | 602 +++++++++++++++-------------- po/fr.po | 528 ++++++++++++------------- po/it.po | 600 ++++++++++++++-------------- po/pt_BR.po | 602 +++++++++++++++-------------- po/ru.po | 600 ++++++++++++++-------------- scripts/ChangeLog | 4 + scripts/gnupg.spec | 90 +++-- tools/bftest.c | 6 +- tools/mpicalc.c | 6 +- util/dotlock.c | 6 +- util/errors.c | 6 +- util/fileutil.c | 6 +- util/g10u.c | 6 +- util/iobuf.c | 6 +- util/logger.c | 6 +- util/memory.c | 6 +- util/miscutil.c | 6 +- util/secmem.c | 6 +- util/strgutil.c | 6 +- util/ttyio.c | 6 +- 138 files changed, 2976 insertions(+), 2432 deletions(-) diff --git a/AUTHORS b/AUTHORS index 062af1029..ca125fdd1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -59,14 +59,20 @@ This program uses the zlib compression library written by Jean-loup Gailly and Mark Adler. Most of the stuff in mpi has been taken from the GMP library. +[Who is the author??] -The file cipher/rndunix.c is heavily based on Peter Gutmann's -rndunix.c from cryptlib. - He promised to add the GPL as an alternative -license to this and some other files. We don't have a disclaimer for -this file, but due to the fact that this is only needed for non-free -system we can easily remove this from the distribution and put it as -a module on some FTP server. +The keybox implementation is based on GDBM 1.7.3 by Philip A. Nelson. -The RPM specs file scripts/gnupg.specs has been contributed by -Caskey L. Dickson and Reuben Sumner. +The file cipher/rndunix.c is based on Peter Gutmann's rndunix.c from +cryptlib. - He promised to add the GPL as an alternative license to +this and some other files. We don't have a disclaimer yet, but due +to the fact that this is only needed for non-free systems we can +easily remove this from the distribution and put it as an extra module +on the FTP server. + +The files in debian/ are by James Troup who is the Debian maintainer +for GnuPG. + +The RPM specs file scripts/gnupg.spec has been contributed by +several people. diff --git a/ChangeLog b/ChangeLog index f1ab556db..839ad6994 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Dec 23 13:18:14 CET 1998 Werner Koch + + * README: Replaced the command overview with a short intro. + Sat Dec 12 18:40:32 CET 1998 Werner Koch * configure.in: Add check for dlopen in libc (Greg Troxel) diff --git a/INSTALL b/INSTALL index d5bf12e6b..ac59f6115 100644 --- a/INSTALL +++ b/INSTALL @@ -54,9 +54,6 @@ Don't forget to delete "config.cache" and run "./config.status --recheck". The Random Device ================= -The current version of GNUPG needs the support of a random device. -If there is no such device, it uses a very simple RNG, which does -not generate strong random numbers. Random devices are available in Linux, FreeBSD and OpenBSD. The device files may not exist on your system, please check this and create them if needed. @@ -75,6 +72,18 @@ You can create them with: mknod /dev/random c 2 3 mknod /dev/urandom c 2 4 +Unices without a random devices must use another entropy collector +which is called rndunix and available as an extension module. You +should put this in your ~/.gnupg/options file: +===8<==================== +load-extension rndunix +===>8==================== +This collector works by running a lot of tools which yields more or +less unpredictable output and fedds this as entropy into the random +generator - It should work reliable but you should check whether +it produces good output for your kinf of Unix. There are some debug +options to help you (see cipher/rndunix.c). + Installation diff --git a/NEWS b/NEWS index 5683b98bf..44827ee08 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +Noteworthy changes in version 0.x.x +----------------------------------- * --export does now only exports rfc2440 compatible keys; the old behavious is available with --export-all. @@ -13,8 +15,8 @@ * New option --escape-from-lines to "dash-escape" "From " lines to prevent mailers to change them to ">From ". This is not enabled by - default because it is not in compliace with rfc2440. but you should - turn it on. + default because it is not in compliance with rfc2440 - however, you + should turn it on. Noteworthy changes in version 0.4.5 ----------------------------------- diff --git a/PROJECTS b/PROJECTS index 0ffd0fce1..deaf4e56b 100644 --- a/PROJECTS +++ b/PROJECTS @@ -1,15 +1,15 @@ - * Check if an object (a message, detached sign, public key, or whatever) - is signed by definite user, i.e. define user - (userid, or any other unique identification) on command line. - --> NO: Use a script and --status-fd + * Check if an object (a message, detached sign, public key, or whatever) + is signed by definite user, i.e. define user + (userid, or any other unique identification) on command line. + --> NO: Use a script and --status-fd * Change the internal represention of keyid into a struct which can also hold the localid and extend the localid to hold information of the subkey number because two subkeys may have the same keyid. * signature verification is done duplicated on import: in import.c and - tehn in trustdb.c too. Maybe we can use a flag to skip the actual + then in trustdb.c too. Maybe we can use a flag to skip the actual verification process (this should work if we use the same keyblock, but I'm not sure how to accomplish that). Another way is to allow the import of bogus data and let trustdb mark these keys as invalid; @@ -17,16 +17,14 @@ keyserver by sending him a lot of bogus signatures which he has to check - Needs further investigation. - * abstraction of the MPI + * Add a way to override the current cipher/md implementations + by others (using extensions) - * Add a way to override the current cipher/md implementations - by others (using extensions) + * Not GnuPG replated: What about option completion in bash? + Can "--dump-options" be used for this or should we place the + options in a special ELF segment? - * Not GnuPG replated: What about option completion in bash? - Can "--dump-options" be used for this or should we place the - options in a special ELF segment? - - * Split key support (n-out-of-m) + * Split key support (n-out-of-m) * Check Berkeley DB - it is in glibc - any licensing problems? @@ -34,3 +32,16 @@ can do this in trustdb.c:verify_own_keys. (special tool?) + * rewrite --list-packets or put it into another tool. + + * We need a maintainence pass over the trustdb which flags + signatures as expired if the key used to make the signature has + expired. Maybe it is a good idea to store the exiration time + in the key record of the trustdb. + * write a tool to extract selected keys from a file. + + * Change the buffering to a mbuf like scheme? Need it for PSST anyway; + see Michael's proposal. + + * Work on the library + diff --git a/README b/README index 8e78f46a7..73a83df43 100644 --- a/README +++ b/README @@ -1,17 +1,17 @@ ------BEGIN PGP SIGNED MESSAGE----- + GnuPG - The GNU Privacy Guard + ------------------------------- + Version 0.9 - GnuPG - The GNU Privacy Guard - ------------------------------- - Version 0.4 + GnuPG is now in Beta test and you should report all bugs to the + mailing list (see below). The 0.9.x versions are mainly released + to fix all remaining serious bugs. As soon as version 1.0 is out, + development will continue with a 1.1 series and bug fixes for the + 1.0 version are released as needed. - As you can see from the version number, the program may have some - bugs and some features may not work at all - please report this to - the mailing list. - - On a Linux box (version 2.x.x, alpha or x86 CPU) it should - work reliably. You may create your key on such a machine and - use it. Please verify the tar file; there is a PGP and a GnuPG - signature available. My PGP 2 key is well known and published in + GnuPG works best on GNU/Linux or *BSD. Other Unices are + also supported but not as good tested as those Freenix ones. + Please verify the tar file; there is a PGP2 and a GnuPG/PGP5 + signature available. 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 @@ -19,39 +19,37 @@ "pub 1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) " "Key fingerprint = 6BD9 050F D8FC 941B 4341 2DCC 68B7 AB89 5754 8DCD" - Old version of gnupg are signed with this key: - "pub 1312G/FF3EAA0B 1998-02-09 Werner Koch " - "Key fingerprint = 8489 6CD0 1851 0E33 45DA CD67 036F 11B8 FF3E AA0B" - - My usual key is now: + My new DSA key is: "pub 1024D/621CC013 1998-07-07 Werner Koch " "Key fingerprint = ECAF 7590 EB34 43B5 C7CF 3ACB 6C7E E1B8 621C C013" - You may add it to your GnuPG pubring and use it in the future to + You may want add it 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 sure that the above fingerprints are correct. Please subscribe to g10@net.lut.ac.uk by sending a mail with the word "subscribe" in the body to "g10-request@net.lut.ac.uk". - This mailing is closed (only subscribers can post) to avoid spam. + This mailing list is a closed one (only subscribers are allowed + to post) to avoid misuse by folks who don't know the Netiquette + and trash you mailspool with commercial junk. See the file COPYING for copyright and warranty information. + GnuPG is in compliance with RFC2440 (OpenPGP), see doc/OpenPGP for + details. + Due to the fact that GnuPG does not use use any patented algorithm, - it cannot be compatible with old PGP versions, because those use + it cannot be compatible with PGP2 versions; PGP 2.x does only use IDEA (which is patented worldwide) and RSA (which is patented in the United States until Sep 20, 2000). - GnuPG is in compliance with RFC2440 (OpenPGP), see doc/OpenPGP for - deatils. - - The default algorithms are now DSA and ELGamal. ELGamal for signing + The default algorithms are now DSA and ElGamal. ElGamal for signing is still available, but due to the larger size of such signatures it is depreciated (Please note that the GnuPG implementation of ElGamal - signatures is *not* insecure). Symmetric algorithms are: 3DES, Blowfish - and CAST5, Digest algorithms are MD5, RIPEMD160, SHA1 and TIGER/192. - + signatures is *not* insecure). Symmetric algorithms are: 3DES, + Blowfish and CAST5 (Twofish will come soon), available digest + algorithms are MD5, RIPEMD160, SHA1 and TIGER/192. Installation @@ -67,27 +65,51 @@ 3) "make install" - 4) You end up with a binary "gpg" in /usr/local/bin + 4) You end up with the binaries "gpg" and "gpgm" in /usr/local/bin. - 5) Optional, but suggested: install the program "gpg" as suid root. + 5) Optional, but suggested: install the binary "gpg" as suid root. - Key Generation - -------------- + Intro + ----- + This is a brief overview how to use GnuPG - it is highly suggested + that you read the manual^H^H^H more information about the use + of cryptography. GnuPG is only the technical tool to do it and + the security highly depends on that YOU KNOW WHAT YOU ARE DOING. + + If you already have a DSA key from PGP 5 (they call them DH/ElGamal) + you can simply copy the pgp keyrings over the GnuPG keyrings after + running gpg once, so that it can create the correct directory. + + The normal way to create a key is: gpg --gen-key This asks some questions and then starts key generation. To create - good random numbers for prime number generation, it uses a /dev/random - which will only emit bytes if the kernel can gather enough entropy. - If you see no progress, you should start some other activities such - as mouse moves, "find /" or using the keyboard (in another window). - Because we have no hardware device to generate randomness we have to - use this method. + good random numbers for the key parameters, GnuPG needs to gather + enough noise (entropy) from your system. If you see no progress + during key generation you should start some other activities such + as mouse moves or hitting on the CTRL and SHIFT keys. - You should make a revocation certificate in case someone gets - knowledge of your secret key or you forgot your passphrase: + Generate a key ONLY on a machine where you have direct physical + access - don't do it over the network or on a machine used also + by others - especially if you have no access to the root account. + + When you are asked for a passphrase; use a good one which you can easy + remember. Don't make the passphrase too long because you have to + type it for every decryption or signing; but - AND THIS IS VERY + IMPORTANT - use a good one which is not easily guessable as the + security of the whole system relies on your secret key and the + passphrase is used to protect this secret key in case someone was + able to get access to your secret keyring. A good way to select + a passphrase is to figure out a short nonsense sentence which makes + some sense for you and modify it by inserting extra spaces, non-letters + and changing the case of some characters - this is really easy to + remember especially if you associate some pictures with it. + + Then you should create a revocation certificate in case someone + gets knowledge of your secret key or you forgot your passphrase: gpg --gen-revoke your_user_id @@ -95,36 +117,7 @@ so that you can print it and (hopefully never) re-create it if your electronic media fails. - If you decided to create a DSA key, you should add an ElGamal - for encryption: - - gpg --add-key user_id_of_your_key - - and follow the displayed instructions (select "ElGamal using v4 packets"). - - - You can sign a key with this command: - - gpg --sign-key Donald - - This let you sign the key of "Donald" with your default userid. - - gpg --sign-key -u Karl -u Joe Donald - - This let you sign the key of of "Donald" with the userids of "Karl" - and "Joe". - All existing signatures are checked; if some are invalid, a menu is - offered to delete some of them, and then you are asked for every user - whether you want to sign this key. - - You may remove a signature at any time using the option "--edit-sig", - which asks for the sigs to remove. Self-signatures are not removable. - - - - - Sign - ---- + Now you can use your key to create digital signatures: gpg -s file @@ -133,66 +126,191 @@ gpg -sa file - Same as above, but file.gpg is ascii armored. + Same as above, but creates the file.asc which is ascii armored and + and ready for sending by mail. Note: It is better to use your + mailers features to create signatures (The mailer uses GnuPG to do + this) because the mailer has the ability to MIME encode such + signatures - but this is not a security issue. gpg -s -o out file Creates a signature of file, but writes the output to the file "out". - If you use the option "--rfc1991", gnupg tries to me more compatible - to RFC1991 (pgp 2.x). + Everyone who knows your public key (you can and should publish + your key by putting it on a key server, a web page or in your .plan + file) is now able to check whether you really signed this text; + gpg --verify file - Encrypt - ------- + GnuPG now checks whether the signature is valid and prints an + appropriate message. If the signature is good, you know at least + that the person (or machine) has access to the secret key which + corresponds to the published public key. + If you run gpg without an option it will verify the signature and + create a new file which is identical to the original file. gpg + can also run as a filter, so that you can pipe data to verify + trough it: + + cat signed-file | gpg | wc -l + + will check the signature of signed-file and then display the + number of lines in the original file. + + To send a message encrypted to someone you can use this: gpg -e -r heine file - This encrypts files with the public key of "heine" and writes it - to "file.gpg" + This encrypts file with the public key of the user "heine" and + writes it to "file.gpg" echo "hallo" | gpg -ea -r heine | mail heine - Ditto, but encrypts "hallo\n" and mails it as ascii armored message. - - - Sign and Encrypt - ---------------- + Ditto, but encrypts "hallo\n" and mails it as ascii armored message + to the user with the mail address heine. gpg -se -r heine file - This encrypts files with the public key of "heine" and writes it - to "file.gpg" after signing it with the default user id. - + This encrypts file with the public key of "heine" and writes it + to "file.gpg" after signing it with your user id. gpg -se -r heine -u Suttner file - Ditto, but sign the file with the user id "Suttner" + Ditto, but sign the file with your alternative user id "Suttner" - Keyring Management - ------------------ - To export your complete keyring(s) do this: + GnuPG has some options to help you publish public keys; this is + called "exporting" a key: - gpg --export + gpg --export >all-my-keys - To export only some user ids do this: + exports all the keys in the keyring and writes them (in a binary format) + to all-my-keys. You may then mail "all-my-keys" as an MIME attachment + to someone else or put it on an FTP server. To export only some + user IDs, you give them as arguments on the command line. - gpg --export userids + To mail a public key or put it on a web page you have to create + the key in ASCII armored format: - Use "-a" or "--armor" to create ASCII armored output. + gpg --export --armor | mail panther@tiger.int - Importing keys is done with the option, you guessed it, "--import": + This will send all your public keys to your friend panther. + + If you have received a key from someone else you can put it + into your public keyring; is called "importing": gpg --import [filenames] - New keys are appended to the default keyring and already existing - keys are merged. Keys without a self-signature are ignored. + New keys are appended to your keyring and already existing + keys are updated. Note that GnuPG does not allow keys which + are not self-signed by the user. + + Because anyone can claim that the public key belongs to her + we must have some way to check that the public key really belongs + to the owner. This can be achieved by comparing the key during + a phone call. Sure, it is not very easy to compare a binary file + by reading the complete hex dump of the file - GnuPG (and nearly + every other program used for management of cryptographic keys) + provides other solutions: + + gpg --fingerprint + + prints the so called "fingerprint" of the given username; this + is a sequence of hex bytes (which you may have noticed in mail + sigs or on business cards) which uniquely identify the public + key - two different keys will always have different fingerprints. + It is easy to compare this fingerprint by phone and I suggest + that you print your fingerprint on the back of your business + card. + + If you don't know the owner of the public key you are in trouble; + but wait: A friend of you knows someone who knows someone who + has met the owner of the public key at some computer conference. + So all the persons between you and the public key holder may now + act as introducer to you; this is done by signing the keys and + thereby certifying the other keys. If you then trust all the + introducers to correctly sign other keys, you can be be sure that + the other key really belongs to the one who claims so. + + There are 2 steps to validate a target key: + 1. First check that there is a complete chain + of signed keys from the public key you want to use + and your key and verify each signature. + 2. Make sure that you have full trust in the certificates + of all the introduces between the public key holder and + you. + Step 2 is the more complicated part because there is no easy way + for a computer to decide who is trustworthy and who is not. GnuPG + leaves this decision to you and will ask you for a trust value + (here also referenced as the owner-trust of a key) for every key + needed to check the chain of certificates. You may choose from: + a) "I don't know" - then it is not possible to use any + of the chains of certificates, in which this key is used + as an introducer, to validate the target key. Use this if + you don't know the introducer. + b) "I do not trust" - Use this if you know that the introducer + does not do a good job in certifying other keys. The effect + is the same as with a) but for a) you may later want to + change the value because you got new information about this + introducer. + c) "I trust marginally" - Use this if you assume that the + introducer knows what he is doing. Together with some + other marginally trusted keys, GnuPG validates the target + key then as good. + d) "I fully trust" - Use this if you really know that this + introducer does a good job when certifying other keys. + If all the introducer are of this trust value, GnuPG + normally needs only one chain of signatures to validate + a target key okay. (But this may be adjusted with the help + of some options). + These information are confidential because they give your + personal opinion on the trustworthy of someone else. Therefore + this data is not stored in the keyring but in the "trustdb" + (~/.gnupg/trustdb.gpg). Do not assign a high trust value just + because the introducer is a friend of you - decide how far she + understands all the implications of key signatures and you may + want to tell him more about public key cryptography so you + can later change the trust value you assigned. + + Okay, here is how GnuPG helps you in key management: Most stuff is + done with the --edit-key command: + + gpg --edit-key + + GnuPG displays some information about the key and then prompts + for a command (enter "help" to see a list of commands and see + the man page for a more detailed explanation). To sign a key + you select the user ID you want to sign by entering the number + which is displayed in the leftmost column (or do nothing if the + key has only one user ID) and then enter the command "sign" and + follow all the prompts. When you are ready, give the command + "save" (or use "quit" to cancel your actions). + + If you want to sign the key with another user ID of yours, you + must give an "-u" option on the command line together with the + "--edit-key". + + Normally you want to sign only one user ID because GnuPG + does only use one and this keeps the public key certificate + small. Because such key signatures are very important you + should make sure that the signators of your key sign a user ID + which is very likely to stay for a long time - choose one with an + email address you have full control of or do not enter an email + address at all. In future GnuPG will have a way to tell which + user ID is the one with an email address you prefer - because + you have no signatures on this email address it is easy to change + this address. Remember: Your signators sign your public key (the + primary one) together with one od your user IDs - so it is not possible + to change the user ID later without voiding all the signatures. + + Tip: If you hear about a key signing party on a computer conference + join it because this is a very convenient way to get your key + certified (But remember that signatures have nothing to to with the + trust you assign to a key). - How to Specify a UserID - ----------------------- - There are several ways to specify a userID, here are some examples: + 7 Ways to Specify a User ID + -------------------------- + There are several ways to specify a user ID, here are some examples: * Only by the short keyid (prepend a zero if it begins with A..F): @@ -216,7 +334,7 @@ The first one is MD5 the others are ripemd160 or sha1. - * By an exact string (not yet implemented): + * By an exact string: "=Heinrich Heine " @@ -224,17 +342,13 @@ "" - This can be used by a keyserver instead of a substring to - find this key faster. - - * By the Local ID (from the trustdb): + * By the Local ID (from the trust DB): "#34" - This can be used by a MUA to specify an exact key after selecting + This may be used by a MUA to specify an exact key after selecting a key from GnuPG (by the use of a special option or an extra utility) - * Or by the usual substring: "Heine" @@ -243,14 +357,12 @@ The '*' indicates substring search explicitly. - - Batch mode ---------- If you use the option "--batch", GnuPG runs in non-interactive mode and never prompts for input data. This does not even allow entering the passphrase; until we have a better solution (something like ssh-agent), - you can use the option "--passhrase-fd n", which works like PGPs + you can use the option "--passphrase-fd n", which works like PGPs PGPPASSFD. Batch mode also causes GnuPG to terminate as soon as a BAD signature is @@ -261,8 +373,8 @@ ----------- GnuPG returns with an exit status of 1 if in batch mode and a bad signature has been detected or 2 or higher for all other errors. You should parse - stderr or the output of the fd specified with --status-fd to get detailed - information about the errors. + stderr or better the output of the fd specified with --status-fd to get + detailed information about the errors. Esoteric commands @@ -272,73 +384,41 @@ Use this to list the contents of a data file. If the file is encrypted you are asked for the passphrase, so that GnuPG is able to look at the - inner structure of a encrypted packet. + inner structure of a encrypted packet. This command should be able + to list all kinds of rfc2440 messages. gpgm --list-trustdb - List the contents of the trustdb in a human readable format + List the contents of the trust DB in a human readable format gpgm --list-trustdb List the tree of certificates for the given usernames - gpgm --list-trust-path depth username + gpgm --list-trust-path username - List the possible trust paths for the given username, up to the specified - depth. If depth is negative, duplicate introducers are not listed, - because those would increase the trust probability only minimally. - (you must use the special option "--" to stop option parsing when - using a negative number). This option may create new entries in the - trustdb. + List the possible trust paths for the given username. The length + of such a trust path is limited by the option --max-cert-depth + which defaults to 5. - gpgm --print-mds filenames - - List all available message digest values for the fiven filenames - - For more options/commands see the file g10/OPTIONS, or use "gpg --help" - - - Debug Flags - ----------- - Use the option "--debug n" to output debug information. This option - can be used multiple times, all values are ORed; n maybe prefixed with - 0x to use hex-values. - - value used for - ----- ---------------------------------------------- - 1 packet reading/writing - 2 MPI details - 4 ciphers and primes (may reveal sensitive data) - 8 iobuf filter functions - 16 iobuf stuff - 32 memory allocation stuff - 64 caching - 128 show memory statistics at exit - 256 trust verification stuff + For more options/commands see the man page or use "gpg --help". Other Notes ----------- - This is work in progress, so you may find duplicated code fragments, - ugly data structures, weird usage of filenames and other things. The primary FTP site is "ftp://ftp.gnupg.org/pub/gcrypt/" The primary WWW page is "http://www.gnupg.org" - If you like, send your keys to ; use - "gpg --export --armor | mail gnupg-keys@isil.d.shuttle.de" to do this. + See http://www.gnugp.org/mirrors.html for a list of FTP mirrors + and use them if possible. Please direct bug reports to or better - post them to the mailing list (this is a closed list, - please subscribe before posting, see above (~line 33)). + post them to the mailing list (this is a + closed list - subscribe before posting, see above (~line 33)). + Please direct questions about GnuPG to the mailing list or + one of the pgp newsgroups; this gives me more time to improve + GnuPG. Commercial support for GnuPG will be availabe soon. + Have fun and remember: Echelon is looking at you kid. ------BEGIN PGP SIGNATURE----- -Version: GnuPG v0.4.4 (GNU/Linux) -Comment: For info finger gcrypt@ftp.guug.de - -iQB1AwUBNlXAUh0Z9MEMmFelAQFmhwL/RfW9WxAMTh/edDy0yGTJjDgo7d/Kfmtq -8C0LJ4b2M0py1ctW6jZyiQsYtvkrttKiTYXGtRoIzVFWX2hqABKPCTHzOeXQEOSu -ro5fnRwsuj9cRxhH8lpN+diY+m1E5Fu3 -=sciv ------END PGP SIGNATURE----- diff --git a/TODO b/TODO index 96dcaab23..f37ed3d4c 100644 --- a/TODO +++ b/TODO @@ -1,49 +1,48 @@ +Bugs +---- + * clearsig: keep lineendings as they are. Remember that trailings + blanks are not hashed. Funny: pgp263in works fine even with + a source file with CR,LF but GnuPG and pgp263in has problems + if the clearsign has been created by pgp263ia. + Needs more investigation - anyone? +Important +---------- * Check revocation and expire stuff. PLEASE: THIS MUST BE TESTED! - * Escape "From " - * Check calculation of key validity. PLEASE: IT IS IMPORTED THAT THIS GET TESTED. - * preferences of hash algorithms are not yet used. + * It has been reported that lockfiles are not removed in all cases. + cleanup is done with atexit() and all signals trigger exit() - + anything wrong with this? * I noticed, that we sometimes have only 3 items in a trustrecord, but a next pointer ro more records - check wehther the reuse code really works. Maybe this is the reason for the "Hmmm public key lost" - * clearsig: keep lineendings as they are. Remember that trailings - blanks are not hashed. +Needed +------ + * remove more "Fixmes" - * should we flush the getkey.c caches while doing an import? - - * We need a maintainence pass over the trustdb which flags - signatures as expired if the key used to make the signature has - expired. Maybe it is a good idea to store the exiration time - in the key record of the trustdb. - - * write a tool to extract selected keys from a file. + * Replace Blowfish by Twofish and add the new encrypted packet typ + which has a MACing option (append SHA1 hash to the plaintext and + encrypt this all) - We need an identifier for Twofish to put this + one into the cipher preferences. +Nice to have +------------ + * preferences of hash algorithms are not yet used. * new menu to delete signatures and list signature in menu - * Replace the SIGUSR1 stuff by semaphores to avoid loss of a signal. or use POSIX.4 realtime signals. - * add test cases for invalid data (scrambled armor or other random data) - - * rewrite --list-packets or put it into another tool. - + * add checking of armor trailers * Burn the buffers used by fopen(), or use read(2). Does this really make sense? - - * Change the buffering to a mbuf like scheme? Need it for PSST anyway; - see Michael's proposal. - * add checking of armor trailers - * remove all "Fixmes" ;-) - * change the fake_data stuff to mpi_set_opaque - * Replace Blowfish by Twofish - - * Work on the library +Minor Bugs +---------- + * md_start_debug used to crash at pgm termination. diff --git a/VERSION b/VERSION index 911e57f05..6f9a81767 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.5a +0.4.5b diff --git a/cipher/blowfish.c b/cipher/blowfish.c index f5c29c6aa..fdc4c4bfb 100644 --- a/cipher/blowfish.c +++ b/cipher/blowfish.c @@ -5,14 +5,14 @@ * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. * ISBN 0-471-11709-9. Pages 336 ff. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/blowfish.h b/cipher/blowfish.h index d3848aae8..b1d65f36c 100644 --- a/cipher/blowfish.h +++ b/cipher/blowfish.h @@ -1,14 +1,14 @@ /* blowfish.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/cast5.c b/cipher/cast5.c index 64866ba7f..279838fa3 100644 --- a/cipher/cast5.c +++ b/cipher/cast5.c @@ -1,14 +1,14 @@ /* cast5.c - CAST5 cipher (RFC2144) * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/cast5.h b/cipher/cast5.h index ea6fa9e43..df7f16519 100644 --- a/cipher/cast5.h +++ b/cipher/cast5.h @@ -1,14 +1,14 @@ /* cast5.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/cipher.c b/cipher/cipher.c index 95c4b70df..f27eec397 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -1,14 +1,14 @@ /* cipher.c - cipher dispatcher * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/des.c b/cipher/des.c index f730568e0..f7187c0a1 100644 --- a/cipher/des.c +++ b/cipher/des.c @@ -8,14 +8,14 @@ * Bruce Schneier: Applied Cryptography. Second Edition. * John Wiley & Sons, 1996. ISBN 0-471-12845-7. Pages 358 ff. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/des.h b/cipher/des.h index f3b95ba65..cf2f320d8 100644 --- a/cipher/des.h +++ b/cipher/des.h @@ -1,14 +1,14 @@ /* des.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/dsa.c b/cipher/dsa.c index 2d5c17344..7222df338 100644 --- a/cipher/dsa.c +++ b/cipher/dsa.c @@ -1,14 +1,14 @@ /* dsa.c - DSA signature scheme * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/dsa.h b/cipher/dsa.h index dda32bd6d..e5bc8c7b8 100644 --- a/cipher/dsa.h +++ b/cipher/dsa.h @@ -1,14 +1,14 @@ /* dsa.h - DSA signature scheme * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/dynload.c b/cipher/dynload.c index abef2da52..220f91600 100644 --- a/cipher/dynload.c +++ b/cipher/dynload.c @@ -1,14 +1,14 @@ /* dynload.c - load cipher extensions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/dynload.h b/cipher/dynload.h index d107b5a0a..f22f5f3ee 100644 --- a/cipher/dynload.h +++ b/cipher/dynload.h @@ -1,14 +1,14 @@ /* dynload.5 * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/elgamal.c b/cipher/elgamal.c index b330ccff0..9a9b35629 100644 --- a/cipher/elgamal.c +++ b/cipher/elgamal.c @@ -5,14 +5,14 @@ * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. * ISBN 0-471-11709-9. Pages 476 ff. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/elgamal.h b/cipher/elgamal.h index 672f07704..ac708a9bb 100644 --- a/cipher/elgamal.h +++ b/cipher/elgamal.h @@ -1,14 +1,14 @@ /* elgamal.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/g10c.c b/cipher/g10c.c index 263091d49..718520057 100644 --- a/cipher/g10c.c +++ b/cipher/g10c.c @@ -1,14 +1,14 @@ /* g10c.c - Wrapper for cipher functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/gost.c b/cipher/gost.c index aaf2a8e17..4a527722f 100644 --- a/cipher/gost.c +++ b/cipher/gost.c @@ -5,14 +5,14 @@ * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. * ISBN 0-471-11709-9. . * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/gost.h b/cipher/gost.h index 4c0367477..d8e7ebfc5 100644 --- a/cipher/gost.h +++ b/cipher/gost.h @@ -1,14 +1,14 @@ /* gost.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/md.c b/cipher/md.c index 9a2b17920..de74c283e 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -1,14 +1,14 @@ /* md.c - message digest dispatcher * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/md5.c b/cipher/md5.c index 72fce0e22..214e13727 100644 --- a/cipher/md5.c +++ b/cipher/md5.c @@ -19,7 +19,7 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Written by Ulrich Drepper , 1995. */ -/* modified for GNUPG by */ +/* modified for GnuPG by */ /* Test values: * "" D4 1D 8C D9 8F 00 B2 04 E9 80 09 98 EC F8 42 7E diff --git a/cipher/md5.h b/cipher/md5.h index a4bcf5c63..89fc843cc 100644 --- a/cipher/md5.h +++ b/cipher/md5.h @@ -1,14 +1,14 @@ /* md5.h - message digest 5 * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/primegen.c b/cipher/primegen.c index addc51fd5..e94842189 100644 --- a/cipher/primegen.c +++ b/cipher/primegen.c @@ -1,14 +1,14 @@ /* primegen.c - prime number generator * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/pubkey.c b/cipher/pubkey.c index 514711700..2ca8dd854 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -1,14 +1,14 @@ /* pubkey.c - pubkey dispatcher * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/rand-internal.h b/cipher/rand-internal.h index 230ea975e..290f034f9 100644 --- a/cipher/rand-internal.h +++ b/cipher/rand-internal.h @@ -1,14 +1,14 @@ /* rand-internal.h - header to glue the random functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/random.c b/cipher/random.c index c49cc6e08..d57cd07ce 100644 --- a/cipher/random.c +++ b/cipher/random.c @@ -1,14 +1,14 @@ /* random.c - random number generator * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/random.h b/cipher/random.h index d4c134275..ca9ee3ab7 100644 --- a/cipher/random.h +++ b/cipher/random.h @@ -1,14 +1,14 @@ /* random.h - random functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/rmd.h b/cipher/rmd.h index 64a8a02b5..0c1fbad99 100644 --- a/cipher/rmd.h +++ b/cipher/rmd.h @@ -1,14 +1,14 @@ /* rmd.h - RIPE-MD hash functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/rmd160.c b/cipher/rmd160.c index 3b1702cb0..4d644756f 100644 --- a/cipher/rmd160.c +++ b/cipher/rmd160.c @@ -1,14 +1,14 @@ /* rmd160.c - RIPE-MD160 * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/rmd160test.c b/cipher/rmd160test.c index bfbd9bc83..f0acd2ad6 100644 --- a/cipher/rmd160test.c +++ b/cipher/rmd160test.c @@ -1,14 +1,14 @@ /* rmd160test.c - ripe md 160 test program * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/sha1.c b/cipher/sha1.c index 0a6ffab2c..b3da296f8 100644 --- a/cipher/sha1.c +++ b/cipher/sha1.c @@ -3,14 +3,14 @@ * * Please see below for more legal information! * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/sha1.h b/cipher/sha1.h index 2a47b3e91..3d9302671 100644 --- a/cipher/sha1.h +++ b/cipher/sha1.h @@ -1,14 +1,14 @@ /* sha1.h - SHA1 hash function * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/smallprime.c b/cipher/smallprime.c index a286aa658..8187aa768 100644 --- a/cipher/smallprime.c +++ b/cipher/smallprime.c @@ -1,14 +1,14 @@ /* smallprime.c - List of small primes * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/cipher/tiger.c b/cipher/tiger.c index c473e92d3..51c6450c8 100644 --- a/cipher/tiger.c +++ b/cipher/tiger.c @@ -1,14 +1,14 @@ /* tiger.c - The TIGER hash function * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/doc/HACKING b/doc/HACKING index e4c1aa972..01627fe14 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -55,6 +55,44 @@ RFCs +Debug Flags +----------- +Use the option "--debug n" to output debug information. This option +can be used multiple times, all values are ORed; n maybe prefixed with +0x to use hex-values. + + value used for + ----- ---------------------------------------------- + 1 packet reading/writing + 2 MPI details + 4 ciphers and primes (may reveal sensitive data) + 8 iobuf filter functions + 16 iobuf stuff + 32 memory allocation stuff + 64 caching + 128 show memory statistics at exit + 256 trust verification stuff + + + + +Directory Layout +---------------- + ./ Readme, configure + ./scripts Scripts needed by configure and others + ./doc Documentaion + ./util General purpose utility function + ./mpi Multi precision integer library + ./cipher Cryptographic functions + ./g10 GnuPG application + ./tools Some helper and demo programs + ./keybox The keybox library + ./gcrypt Stuff needed to build libgcrypt + + + + + Memory allocation ----------------- Use only the functions: diff --git a/g10/ChangeLog b/g10/ChangeLog index b2ccffac4..8e959a21d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,15 @@ +Wed Dec 23 13:18:14 CET 1998 Werner Koch + + * pkclist.c (add_ownertrust): Refresh validity values. + + * trustdb.c (enum_cert_paths_print): New arg refresh. + + * ringedit.c: Fixed problems fix keyrings + * parse-packet.c (dbg_parse_packet): New debug functions. + + * getkey.c (getkey_disable_caches): New. + * import.c (import_keys): Disable caches. + Thu Dec 17 18:31:15 CET 1998 Werner Koch * misc.c (trap_unaligned): Only for glibc 1 diff --git a/g10/armor.c b/g10/armor.c index ca74fe448..0aca33333 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -1179,7 +1179,7 @@ armor_filter( void *opaque, int control, iobuf_writestr(a, "-----\n"); } else if( !afx->any_data && !afx->inp_bypass ) - log_error(_("no valid RFC1991 or OpenPGP data found.\n")); + log_error(_("no valid OpenPGP data found.\n")); } else if( control == IOBUFCTRL_DESC ) *(char**)buf = "armor_filter"; diff --git a/g10/build-packet.c b/g10/build-packet.c index d83568328..5b952f153 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -1,14 +1,14 @@ /* build-packet.c - assemble packets and write them * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/cipher.c b/g10/cipher.c index 4664a4a83..c654db011 100644 --- a/g10/cipher.c +++ b/g10/cipher.c @@ -1,14 +1,14 @@ /* cipher.c - En-/De-ciphering filter * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/comment.c b/g10/comment.c index 71d524c40..6d27e481b 100644 --- a/g10/comment.c +++ b/g10/comment.c @@ -1,14 +1,14 @@ /* comment.c - write comment stuff * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/compress.c b/g10/compress.c index 6a2f8f8c5..31cc4c500 100644 --- a/g10/compress.c +++ b/g10/compress.c @@ -1,14 +1,14 @@ /* compress.c - compress filter * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/dearmor.c b/g10/dearmor.c index 6b15f491b..43fc6b059 100644 --- a/g10/dearmor.c +++ b/g10/dearmor.c @@ -1,14 +1,14 @@ /* dearmor.c - Armor utility * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/decrypt.c b/g10/decrypt.c index cb1cccd4c..4094321c3 100644 --- a/g10/decrypt.c +++ b/g10/decrypt.c @@ -1,14 +1,14 @@ /* verify.c - verify signed data * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/delkey.c b/g10/delkey.c index 08648b84b..8d4f1a5b0 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -1,14 +1,14 @@ /* delkey.c - delete keys * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/encode.c b/g10/encode.c index 8245dd02e..303cf798a 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -1,14 +1,14 @@ /* encode.c - encode data * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/encr-data.c b/g10/encr-data.c index e5338c75d..ff7954c64 100644 --- a/g10/encr-data.c +++ b/g10/encr-data.c @@ -1,14 +1,14 @@ /* encr-data.c - process an encrypted data packet * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/export.c b/g10/export.c index c9056115d..6b4b41cdd 100644 --- a/g10/export.c +++ b/g10/export.c @@ -1,14 +1,14 @@ /* export.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/filter.h b/g10/filter.h index f4d924965..75d629e68 100644 --- a/g10/filter.h +++ b/g10/filter.h @@ -1,14 +1,14 @@ /* filter.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/free-packet.c b/g10/free-packet.c index e2bbc1640..bd4ed0422 100644 --- a/g10/free-packet.c +++ b/g10/free-packet.c @@ -1,14 +1,14 @@ /* free-packet.c - cleanup stuff for packets * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/g10.c b/g10/g10.c index 1f1fed5e5..8191ea03b 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -1,14 +1,14 @@ /* g10.c - The GnuPG utility (main for gpg) * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/getkey.c b/g10/getkey.c index 65c0ae495..f31529910 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1,14 +1,14 @@ /* getkey.c - Get a key from the database * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -160,7 +160,7 @@ cache_public_key( PKT_public_key *pk ) if( pk_cache_entries >= MAX_PK_CACHE_ENTRIES ) { /* fixme: use another algorithm to free some cache slots */ pk_cache_disabled=1; - if( opt.verbose ) + if( opt.verbose > 1 ) log_info(_("too many entries in pk cache - disabled\n")); return; } @@ -208,6 +208,38 @@ cache_user_id( PKT_user_id *uid, u32 *keyid ) } +void +getkey_disable_caches() +{ + #if MAX_UNK_CACHE_ENTRIES + { + keyid_list_t kl, kl2; + for( kl = unknown_keyids; kl; kl = kl2 ) { + kl2 = kl->next; + m_free(kl); + } + unknown_keyids = NULL; + unk_cache_disabled = 1; + } + #endif + #if MAX_PK_CACHE_ENTRIES + { + pk_cache_entry_t ce, ce2; + u32 keyid[2]; + + for( ce = pk_cache; ce; ce = ce2 ) { + ce2 = ce->next; + free_public_key( ce->pk ); + m_free( ce ); + } + pk_cache_disabled=1; + pk_cache_entries = 0; + pk_cache = NULL; + } + #endif + /* fixme: disable user id cache ? */ +} + /**************** * Get a public key and store it into the allocated pk @@ -259,7 +291,7 @@ get_pubkey( PKT_public_key *pk, u32 *keyid ) ; else if( ++unk_cache_entries > MAX_UNK_CACHE_ENTRIES ) { unk_cache_disabled = 1; - if( opt.verbose ) + if( opt.verbose > 1 ) log_info(_("too many entries in unk cache - disabled\n")); } else { diff --git a/g10/gpgd.c b/g10/gpgd.c index 5d85e1f13..b4be6044c 100644 --- a/g10/gpgd.c +++ b/g10/gpgd.c @@ -1,14 +1,14 @@ -/* ggpd.c - The GNUPG daemon (keyserver) +/* ggpd.c - The GnuPG daemon (keyserver) * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/import.c b/g10/import.c index 2fa25c542..7de0fc919 100644 --- a/g10/import.c +++ b/g10/import.c @@ -130,6 +130,9 @@ import_keys( const char *fname, int fast ) return G10ERR_OPEN_FILE; } + + getkey_disable_caches(); + if( !opt.no_armor ) /* armored reading is not disabled */ iobuf_push_filter( inp, armor_filter, &afx ); diff --git a/g10/kbnode.c b/g10/kbnode.c index 1048f316d..70c85f7bd 100644 --- a/g10/kbnode.c +++ b/g10/kbnode.c @@ -1,14 +1,14 @@ /* kbnode.c - keyblock node utility functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/keydb.h b/g10/keydb.h index a3abbe76f..1d1c6c26c 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -1,14 +1,14 @@ /* keydb.h - Key database * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -77,6 +77,7 @@ struct keyblock_pos_struct { byte keybuf[21]; #endif PACKET *pkt; /* ditto */ + int valid; }; typedef struct keyblock_pos_struct KBPOS; @@ -130,6 +131,7 @@ char *get_last_passphrase(void); /*-- getkey.c --*/ int classify_user_id( const char *name, u32 *keyid, byte *fprint, const char **retstr, size_t *retlen ); +void getkey_disable_caches(void); int get_pubkey( PKT_public_key *pk, u32 *keyid ); int get_pubkey_byname( GETKEY_CTX *rx, PKT_public_key *pk, const char *name, KBNODE *ret_keyblock ); diff --git a/g10/keyedit.c b/g10/keyedit.c index b402b4f99..0a711c282 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1,14 +1,14 @@ /* keyedit.c - keyedit stuff * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/keygen.c b/g10/keygen.c index cea7ffdb5..2745649c5 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1,14 +1,14 @@ /* keygen.c - generate a key pair * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/keyid.c b/g10/keyid.c index 21e7e12e3..665b3be86 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -1,14 +1,14 @@ /* keyid.c - jeyid and fingerprint handling * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/keylist.c b/g10/keylist.c index f2ded0455..3c68680e4 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -1,14 +1,14 @@ /* keylist.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/ks-proto.c b/g10/ks-proto.c index b5109f2ad..43abf468a 100644 --- a/g10/ks-proto.c +++ b/g10/ks-proto.c @@ -1,14 +1,14 @@ /* ks-proto.c keyserver protocol handling * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/ks-proto.h b/g10/ks-proto.h index 67d2ed4ae..bd58db5f9 100644 --- a/g10/ks-proto.h +++ b/g10/ks-proto.h @@ -1,14 +1,14 @@ /* ks-proto.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/main.h b/g10/main.h index 72f433fcc..b917bae26 100644 --- a/g10/main.h +++ b/g10/main.h @@ -1,14 +1,14 @@ /* main.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/mainproc.c b/g10/mainproc.c index acf5bf5e7..0d5c88f5c 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1,14 +1,14 @@ /* mainproc.c - handle packets * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/mdfilter.c b/g10/mdfilter.c index a18636e8b..1d26e20ba 100644 --- a/g10/mdfilter.c +++ b/g10/mdfilter.c @@ -1,14 +1,14 @@ /* mdfilter.c - filter data and calculate a message digest * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/misc.c b/g10/misc.c index e7990475b..e533966d9 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -1,14 +1,14 @@ /* misc.c - miscellaneous functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/openfile.c b/g10/openfile.c index a6d24ed38..1ffeeedee 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -1,14 +1,14 @@ /* openfile.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/options.h b/g10/options.h index b6b1cd2de..e6491864e 100644 --- a/g10/options.h +++ b/g10/options.h @@ -1,14 +1,14 @@ /* options.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/options.skel b/g10/options.skel index 82916826c..1ad93b487 100644 --- a/g10/options.skel +++ b/g10/options.skel @@ -33,7 +33,7 @@ force-v3-sigs # cleartext signatures; all other PGP versions it this way too. # To enable full OpenPGP compliance you have to remove this option. -escape_from_lines +escape-from-lines # If you do not use the Latin-1 (ISO-8859-1) charset, you should # tell GnuPG which is the native character set. Please check diff --git a/g10/packet.h b/g10/packet.h index e047fd944..1f5f57416 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -1,14 +1,14 @@ /* packet.h - packet read/write stuff * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -27,6 +27,8 @@ #include "cipher.h" #include "filter.h" +#define DEBUG_PARSE_PACKET 1 + typedef enum { PKT_NONE =0, PKT_PUBKEY_ENC =1, /* public key encrypted packet */ @@ -236,11 +238,26 @@ int list_packets( IOBUF a ); /*-- parse-packet.c --*/ int set_packet_list_mode( int mode ); + +#if DEBUG_PARSE_PACKET +int dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos, const char* file, int lineno ); +int dbg_parse_packet( IOBUF inp, PACKET *ret_pkt, const char* file, int lineno ); +int dbg_copy_all_packets( IOBUF inp, IOBUF out, const char* file, int lineno ); +int dbg_copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff, const char* file, int lineno ); +int dbg_skip_some_packets( IOBUF inp, unsigned n, const char* file, int lineno ); +#define search_packet( a,b,c,d ) dbg_search_packet( (a), (b), (c), (d), __FILE__, __LINE__ ) +#define parse_packet( a, b ) dbg_parse_packet( (a), (b), __FILE__, __LINE__ ) +#define copy_all_packets( a,b ) dbg_copy_all_packets((a),(b), __FILE__, __LINE__ ) +#define copy_some_packets( a,b,c ) dbg_copy_some_packets((a),(b),(c), __FILE__, __LINE__ ) +#define skip_some_packets( a,b ) dbg_skip_some_packets((a),(b), __FILE__, __LINE__ ) +#else int search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos ); int parse_packet( IOBUF inp, PACKET *ret_pkt); int copy_all_packets( IOBUF inp, IOBUF out ); int copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff ); int skip_some_packets( IOBUF inp, unsigned n ); +#endif + const byte *parse_sig_subpkt( const byte *buffer, sigsubpkttype_t reqtype, size_t *ret_n ); const byte *parse_sig_subpkt2( PKT_signature *sig, diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 29e4fc4e6..5bee45b32 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1,14 +1,14 @@ /* parse-packet.c - read packets * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -39,7 +39,11 @@ static int mpi_print_mode = 0; static int list_mode = 0; static int parse( IOBUF inp, PACKET *pkt, int reqtype, - ulong *retpos, int *skip, IOBUF out, int do_skip ); + ulong *retpos, int *skip, IOBUF out, int do_skip + #ifdef DEBUG_PARSE_PACKET + ,const char *dbg_w, const char *dbg_f, int dbg_l + #endif + ); static int copy_packet( IOBUF inp, IOBUF out, int pkttype, unsigned long pktlen ); static void skip_packet( IOBUF inp, int pkttype, unsigned long pktlen ); @@ -119,6 +123,18 @@ unknown_pubkey_warning( int algo ) * Note: The function may return an error and a partly valid packet; * caller must free this packet. */ +#ifdef DEBUG_PARSE_PACKET +int +dbg_parse_packet( IOBUF inp, PACKET *pkt, const char *dbg_f, int dbg_l ) +{ + int skip, rc; + + do { + rc = parse( inp, pkt, 0, NULL, &skip, NULL, 0, "parse", dbg_f, dbg_l ); + } while( skip ); + return rc; +} +#else int parse_packet( IOBUF inp, PACKET *pkt ) { @@ -129,10 +145,24 @@ parse_packet( IOBUF inp, PACKET *pkt ) } while( skip ); return rc; } +#endif /**************** * Like parse packet, but only return packets of the given type. */ +#ifdef DEBUG_PARSE_PACKET +int +dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos, + const char *dbg_f, int dbg_l ) +{ + int skip, rc; + + do { + rc = parse( inp, pkt, pkttype, retpos, &skip, NULL, 0, "search", dbg_f, dbg_l ); + } while( skip ); + return rc; +} +#else int search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos ) { @@ -143,10 +173,24 @@ search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos ) } while( skip ); return rc; } +#endif /**************** * Copy all packets from INP to OUT, thereby removing unused spaces. */ +#ifdef DEBUG_PARSE_PACKET +int +dbg_copy_all_packets( IOBUF inp, IOBUF out, + const char *dbg_f, int dbg_l ) +{ + PACKET pkt; + int skip, rc=0; + do { + init_packet(&pkt); + } while( !(rc = parse( inp, &pkt, 0, NULL, &skip, out, 0, "copy", dbg_f, dbg_l ))); + return rc; +} +#else int copy_all_packets( IOBUF inp, IOBUF out ) { @@ -157,11 +201,28 @@ copy_all_packets( IOBUF inp, IOBUF out ) } while( !(rc = parse( inp, &pkt, 0, NULL, &skip, out, 0 ))); return rc; } +#endif /**************** * Copy some packets from INP to OUT, thereby removing unused spaces. * Stop at offset STOPoff (i.e. don't copy packets at this or later offsets) */ +#ifdef DEBUG_PARSE_PACKET +int +dbg_copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff, + const char *dbg_f, int dbg_l ) +{ + PACKET pkt; + int skip, rc=0; + do { + if( iobuf_tell(inp) >= stopoff ) + return 0; + init_packet(&pkt); + } while( !(rc = parse( inp, &pkt, 0, NULL, &skip, out, 0, + "some", dbg_f, dbg_l )) ); + return rc; +} +#else int copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff ) { @@ -174,10 +235,26 @@ copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff ) } while( !(rc = parse( inp, &pkt, 0, NULL, &skip, out, 0 )) ); return rc; } +#endif /**************** * Skip over N packets */ +#ifdef DEBUG_PARSE_PACKET +int +dbg_skip_some_packets( IOBUF inp, unsigned n, + const char *dbg_f, int dbg_l ) +{ + int skip, rc=0; + PACKET pkt; + + for( ;n && !rc; n--) { + init_packet(&pkt); + rc = parse( inp, &pkt, 0, NULL, &skip, NULL, 1, "skip", dbg_f, dbg_l ); + } + return rc; +} +#else int skip_some_packets( IOBUF inp, unsigned n ) { @@ -190,7 +267,7 @@ skip_some_packets( IOBUF inp, unsigned n ) } return rc; } - +#endif /**************** @@ -202,7 +279,11 @@ skip_some_packets( IOBUF inp, unsigned n ) */ static int parse( IOBUF inp, PACKET *pkt, int reqtype, ulong *retpos, - int *skip, IOBUF out, int do_skip ) + int *skip, IOBUF out, int do_skip +#ifdef DEBUG_PARSE_PACKET + ,const char *dbg_w, const char *dbg_f, int dbg_l +#endif + ) { int rc=0, c, ctb, pkttype, lenbytes; unsigned long pktlen; @@ -214,6 +295,7 @@ parse( IOBUF inp, PACKET *pkt, int reqtype, ulong *retpos, assert( !pkt->pkt.generic ); if( retpos ) *retpos = iobuf_tell(inp); + if( (ctb = iobuf_get(inp)) == -1 ) { rc = -1; goto leave; @@ -221,7 +303,8 @@ parse( IOBUF inp, PACKET *pkt, int reqtype, ulong *retpos, hdrlen=0; hdr[hdrlen++] = ctb; if( !(ctb & 0x80) ) { - log_error("%s: invalid packet (ctb=%02x)\n", iobuf_where(inp), ctb ); + log_error("%s: invalid packet (ctb=%02x) near %lu\n", + iobuf_where(inp), ctb, iobuf_tell(inp) ); rc = G10ERR_INVALID_PACKET; goto leave; } @@ -294,9 +377,16 @@ parse( IOBUF inp, PACKET *pkt, int reqtype, ulong *retpos, goto leave; } - if( DBG_PACKET ) + if( DBG_PACKET ) { + #ifdef DEBUG_PARSE_PACKET + log_debug("parse_packet(iob=%d): type=%d length=%lu%s (%s.%s.%d)\n", + iobuf_id(inp), pkttype, pktlen, new_ctb?" (new_ctb)":"", + dbg_w, dbg_f, dbg_l ); + #else log_debug("parse_packet(iob=%d): type=%d length=%lu%s\n", iobuf_id(inp), pkttype, pktlen, new_ctb?" (new_ctb)":"" ); + #endif + } pkt->pkttype = pkttype; rc = G10ERR_UNKNOWN_PACKET; /* default error */ switch( pkttype ) { @@ -384,6 +474,7 @@ copy_packet( IOBUF inp, IOBUF out, int pkttype, unsigned long pktlen ) return G10ERR_WRITE_FILE; /* write error */ } else if( !pktlen && pkttype == PKT_COMPRESSED ) { + log_debug("copy_packet: compressed!\n"); /* compressed packet, copy till EOF */ while( (n = iobuf_read( inp, buf, 100 )) != -1 ) if( iobuf_write(out, buf, n ) ) diff --git a/g10/passphrase.c b/g10/passphrase.c index 966338ff9..7f975b840 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -1,14 +1,14 @@ /* passphrase.c - Get a passphrase * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/pkclist.c b/g10/pkclist.c index fb0a89e7a..86c239115 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -1,14 +1,14 @@ /* pkclist.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -205,6 +205,8 @@ edit_ownertrust( ulong lid, int mode ) /**************** * Try to add some more owner trusts (interactive) + * This function presents all the signator in a certificate + * chain who have no trust value assigned. * Returns: -1 if no ownertrust were added. */ static int @@ -232,10 +234,18 @@ _("Could not find a valid trust path to the key. Let's see whether we\n" if( lid == pk->local_id ) continue; any=1; - if( otrust == TRUST_UNDEFINED || otrust == TRUST_EXPIRED || - otrust == TRUST_UNKNOWN ) { + if( changed ) { + /* because enum_cert_paths() makes a snapshop of the + * trust paths, the otrust and validity are not anymore + * valid after changing an entry - we have to reread + * those values from then on + */ + otrust = get_ownertrust( lid ); + } + if( otrust == TRUST_UNDEFINED ) { any_undefined=1; - enum_cert_paths_print( &context, NULL, lid ); + enum_cert_paths_print( &context, NULL, changed, lid ); + tty_printf("\n"); rc = edit_ownertrust( lid, 0 ); if( rc == -1 ) { *quit = 1; diff --git a/g10/plaintext.c b/g10/plaintext.c index d471b9fe3..60f00cbf3 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -1,14 +1,14 @@ /* plaintext.c - process an plaintext packet * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/pref.c b/g10/pref.c index 342696907..53ae41845 100644 --- a/g10/pref.c +++ b/g10/pref.c @@ -1,14 +1,14 @@ /* pref.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/pref.h b/g10/pref.h index ec173c90b..cc827bbc5 100644 --- a/g10/pref.h +++ b/g10/pref.h @@ -1,14 +1,14 @@ /* pref.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c index cb021c47f..4e6e78409 100644 --- a/g10/pubkey-enc.c +++ b/g10/pubkey-enc.c @@ -1,14 +1,14 @@ /* pubkey-enc.c - public key encoded packet handling * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/revoke.c b/g10/revoke.c index 2491ee023..b4728e27d 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -1,14 +1,14 @@ /* revoke.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/ringedit.c b/g10/ringedit.c index 008fa18c9..d46094cee 100644 --- a/g10/ringedit.c +++ b/g10/ringedit.c @@ -1,14 +1,14 @@ /* ringedit.c - Function for key ring editing * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -298,7 +298,7 @@ add_keyblock_resource( const char *url, int force, int secret ) else log_info(_("%s: keyring created\n"), filename ); } - #ifdef __MINGW32__ + #if __MINGW32__ || 1 /* must close it again */ iobuf_close( iobuf ); iobuf = NULL; @@ -687,6 +687,7 @@ enum_keyblocks( int mode, KBPOS *kbpos, KBNODE *ret_root ) kbpos->resno = i; rentry = check_pos( kbpos ); kbpos->rt = resource_table[i].rt; + kbpos->valid = 0; switch( kbpos->rt ) { case rt_RING: kbpos->fp = iobuf_open( rentry->fname ); @@ -860,7 +861,7 @@ update_keyblock( KBPOS *kbpos, KBNODE root ) * A string "GnuPG user db", a \n. * user ids of one key, delimited by \t, * a # or ^ followed by a 20 byte fingerprint, followed by an \n - * The literal characters =, \n, \t, #, ^ must be replaced by a equal sign + * The literal characters %, \n, \t, #, ^ must be replaced by a percent sign * and their hex value. * * (We use Boyer/Moore pattern matching) @@ -1019,8 +1020,9 @@ keyring_search( PACKET *req, KBPOS *kbpos, IOBUF iobuf, const char *fname ) init_packet(&pkt); save_mode = set_packet_list_mode(0); kbpos->rt = rt_RING; + kbpos->valid = 0; - #if __MINGW32__ + #if __MINGW32__ || 1 assert(!iobuf); iobuf = iobuf_open( fname ); if( !iobuf ) { @@ -1057,13 +1059,15 @@ keyring_search( PACKET *req, KBPOS *kbpos, IOBUF iobuf, const char *fname ) BUG(); free_packet(&pkt); } - if( !rc ) + if( !rc ) { kbpos->offset = offset; + kbpos->valid = 1; + } leave: free_packet(&pkt); set_packet_list_mode(save_mode); - #if __MINGW32__ + #if __MINGW32__ || 1 iobuf_close(iobuf); #endif return rc; @@ -1089,6 +1093,8 @@ keyring_read( KBPOS *kbpos, KBNODE *ret_root ) return G10ERR_OPEN_FILE; } + if( !kbpos->valid ) + log_debug("kbpos not valid in keyring_read, want %d\n", (int)kbpos->offset ); if( iobuf_seek( a, kbpos->offset ) ) { log_error("can't seek to %lu\n", kbpos->offset); iobuf_close(a); @@ -1112,6 +1118,12 @@ keyring_read( KBPOS *kbpos, KBNODE *ret_root ) } /* make a linked list of all packets */ switch( pkt->pkttype ) { + case PKT_COMPRESSED: + log_error("skipped compressed packet in keyring\n" ); + free_packet(pkt); + init_packet(pkt); + break; + case PKT_PUBLIC_KEY: case PKT_SECRET_KEY: if( in_cert ) @@ -1129,6 +1141,7 @@ keyring_read( KBPOS *kbpos, KBNODE *ret_root ) } } ready: + kbpos->valid = 0; if( rc == -1 && root ) rc = 0; @@ -1174,6 +1187,12 @@ keyring_enum( KBPOS *kbpos, KBNODE *ret_root, int skipsigs ) } /* make a linked list of all packets */ switch( pkt->pkttype ) { + case PKT_COMPRESSED: + log_error("skipped compressed packet in keyring\n" ); + free_packet(pkt); + init_packet(pkt); + break; + case PKT_PUBLIC_KEY: case PKT_SECRET_KEY: if( root ) { /* store this packet */ @@ -1387,6 +1406,7 @@ keyring_copy( KBPOS *kbpos, int mode, KBNODE root ) goto leave; } } + kbpos->valid = 0; } if( mode == 2 || mode == 3 ) { /* delete or update */ diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c index 1950ae0e1..6adfafdf4 100644 --- a/g10/seckey-cert.c +++ b/g10/seckey-cert.c @@ -1,14 +1,14 @@ /* seckey-cert.c - secret key certifucate packet handling * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/seskey.c b/g10/seskey.c index b9dab28cc..bb158abc0 100644 --- a/g10/seskey.c +++ b/g10/seskey.c @@ -1,14 +1,14 @@ /* seskey.c - make sesssion keys etc. * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/sig-check.c b/g10/sig-check.c index 63bdda220..355f6cdef 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -1,14 +1,14 @@ /* sig-check.c - Check a signature * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/sign.c b/g10/sign.c index f3373ed4f..8a9ef0bba 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -1,14 +1,14 @@ /* sign.c - sign data * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/signal.c b/g10/signal.c index 8a0f3feee..1f599d9d0 100644 --- a/g10/signal.c +++ b/g10/signal.c @@ -1,14 +1,14 @@ /* signal.c - signal handling * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/skclist.c b/g10/skclist.c index caaab207c..baf4a5cf3 100644 --- a/g10/skclist.c +++ b/g10/skclist.c @@ -1,14 +1,14 @@ /* skclist.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/status.c b/g10/status.c index e441d5e21..71a4e8341 100644 --- a/g10/status.c +++ b/g10/status.c @@ -1,14 +1,14 @@ /* status.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/status.h b/g10/status.h index 4adce1282..fa1583687 100644 --- a/g10/status.h +++ b/g10/status.h @@ -1,14 +1,14 @@ /* status.h * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/tdbio.c b/g10/tdbio.c index 5d1864c3d..f7ba36f7c 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -1,14 +1,14 @@ /* tdbio.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/tdbio.h b/g10/tdbio.h index d2d369bed..925c7f93c 100644 --- a/g10/tdbio.h +++ b/g10/tdbio.h @@ -1,14 +1,14 @@ /* tdbio.h - Trust database I/O functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/textfilter.c b/g10/textfilter.c index fc81a9136..9e820d159 100644 --- a/g10/textfilter.c +++ b/g10/textfilter.c @@ -1,14 +1,14 @@ /* textfilter.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/g10/trustdb.c b/g10/trustdb.c index ff05a32ac..de76a25e6 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -1,14 +1,14 @@ /* trustdb.c * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -1750,7 +1750,8 @@ enum_cert_paths( void **context, ulong *lid, * Print the current path */ int -enum_cert_paths_print( void **context, FILE *fp, ulong selected_lid ) +enum_cert_paths_print( void **context, FILE *fp, + int refresh, ulong selected_lid ) { struct enum_cert_paths_ctx *ctx; TRUST_SEG_LIST tsl; @@ -1760,11 +1761,32 @@ enum_cert_paths_print( void **context, FILE *fp, ulong selected_lid ) ctx = *context; if( !ctx->tsl ) return; + tsl = ctx->tsl; if( !fp ) fp = stderr; - print_path( ctx->tsl->pathlen, ctx->tsl->path, fp, selected_lid ); + if( refresh ) { /* update the ownertrust and if possible the validity */ + int i; + int match = tdbio_db_matches_options(); + + for( i = 0; i < tsl->pathlen; i++ ) { + TRUSTREC rec; + + read_record( tsl->path[i].lid, &rec, RECTYPE_DIR ); + tsl->path[i].otrust = rec.r.dir.ownertrust; + /* update validity only if we have it in the cache + * calculation is too time consuming */ + if( match && (rec.r.dir.dirflags & DIRF_VALVALID) + && rec.r.dir.validity ) { + tsl->path[i].trust = rec.r.dir.validity; + if( rec.r.dir.dirflags & DIRF_REVOKED ) + tsl->path[i].trust = TRUST_FLAG_REVOKED; + } + } + } + + print_path( tsl->pathlen, tsl->path, fp, selected_lid ); } diff --git a/g10/trustdb.h b/g10/trustdb.h index fd92826ba..52caadb8f 100644 --- a/g10/trustdb.h +++ b/g10/trustdb.h @@ -1,14 +1,14 @@ /* trustdb.h - Trust database * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -53,7 +53,8 @@ int check_trust( PKT_public_key *pk, unsigned *r_trustlevel ); int query_trust_info( PKT_public_key *pk ); int enum_cert_paths( void **context, ulong *lid, unsigned *ownertrust, unsigned *validity ); -int enum_cert_paths_print( void **context, FILE *fp, ulong selected_lid ); +int enum_cert_paths_print( void **context, FILE *fp, + int refresh, ulong selected_lid ); unsigned get_ownertrust( ulong lid ); int get_ownertrust_info( ulong lid ); byte *get_pref_data( ulong lid, const byte *namehash, size_t *ret_n ); diff --git a/g10/verify.c b/g10/verify.c index 02cc5d003..86537d07c 100644 --- a/g10/verify.c +++ b/g10/verify.c @@ -1,14 +1,14 @@ /* verify.c - verify signed data * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/g10m.c b/mpi/g10m.c index 3100ea3a2..eb9c9bedc 100644 --- a/mpi/g10m.c +++ b/mpi/g10m.c @@ -1,14 +1,14 @@ /* g10m.c - Wrapper for MPI * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-add.c b/mpi/mpi-add.c index 9e70316e0..3dd22eb0e 100644 --- a/mpi/mpi-add.c +++ b/mpi/mpi-add.c @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-bit.c b/mpi/mpi-bit.c index f60d5e3b9..8ca5c57dd 100644 --- a/mpi/mpi-bit.c +++ b/mpi/mpi-bit.c @@ -1,14 +1,14 @@ /* mpi-bit.c - MPI bit level fucntions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-cmp.c b/mpi/mpi-cmp.c index 7d4c8330a..f4dd70e90 100644 --- a/mpi/mpi-cmp.c +++ b/mpi/mpi-cmp.c @@ -1,14 +1,14 @@ /* mpi-cmp.c - MPI functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-div.c b/mpi/mpi-div.c index b5f5809f1..6e50456d4 100644 --- a/mpi/mpi-div.c +++ b/mpi/mpi-div.c @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-gcd.c b/mpi/mpi-gcd.c index eabee63d4..226faf15a 100644 --- a/mpi/mpi-gcd.c +++ b/mpi/mpi-gcd.c @@ -1,14 +1,14 @@ /* mpi-gcd.c - MPI functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-inline.h b/mpi/mpi-inline.h index fab790551..5dc6fc0a3 100644 --- a/mpi/mpi-inline.h +++ b/mpi/mpi-inline.h @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h index f0b414d2a..f73efb76c 100644 --- a/mpi/mpi-internal.h +++ b/mpi/mpi-internal.h @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-inv.c b/mpi/mpi-inv.c index fca609600..667571235 100644 --- a/mpi/mpi-inv.c +++ b/mpi/mpi-inv.c @@ -1,14 +1,14 @@ /* mpi-inv.c - MPI functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-mpow.c b/mpi/mpi-mpow.c index 0a7ef50e9..689a7600f 100644 --- a/mpi/mpi-mpow.c +++ b/mpi/mpi-mpow.c @@ -1,14 +1,14 @@ /* mpi-mpow.c - MPI functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-mul.c b/mpi/mpi-mul.c index 74967fa6b..df8eb2586 100644 --- a/mpi/mpi-mul.c +++ b/mpi/mpi-mul.c @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c index 24430489e..96a1218d9 100644 --- a/mpi/mpi-pow.c +++ b/mpi/mpi-pow.c @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpi-scan.c b/mpi/mpi-scan.c index d0a3ef51e..82ac7262a 100644 --- a/mpi/mpi-scan.c +++ b/mpi/mpi-scan.c @@ -1,14 +1,14 @@ /* mpi-scan.c - MPI functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c index 1fab786f5..2ef4c1419 100644 --- a/mpi/mpicoder.c +++ b/mpi/mpicoder.c @@ -1,14 +1,14 @@ /* mpicoder.c - Coder for the external representation of MPIs * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpih-add.c b/mpi/mpih-add.c index 566469c3e..d6b0c3eb0 100644 --- a/mpi/mpih-add.c +++ b/mpi/mpih-add.c @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpih-cmp.c b/mpi/mpih-cmp.c index dad993c2e..9c9cb4a6c 100644 --- a/mpi/mpih-cmp.c +++ b/mpi/mpih-cmp.c @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpih-div.c b/mpi/mpih-div.c index cda6150f1..0d711cb58 100644 --- a/mpi/mpih-div.c +++ b/mpi/mpih-div.c @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpih-mul.c b/mpi/mpih-mul.c index f402f4ae7..b457a0b5f 100644 --- a/mpi/mpih-mul.c +++ b/mpi/mpih-mul.c @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpih-sub.c b/mpi/mpih-sub.c index 52d25b329..7bfcddeae 100644 --- a/mpi/mpih-sub.c +++ b/mpi/mpih-sub.c @@ -2,14 +2,14 @@ * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c index 18af9e04b..d90cd4d34 100644 --- a/mpi/mpiutil.c +++ b/mpi/mpiutil.c @@ -1,14 +1,14 @@ /* mpiutil.ac - Utility functions for MPI * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/po/de.po b/po/de.po index a3b700a80..b8cad6d90 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1998-12-09 00:39+0100\n" +"POT-Creation-Date: 1998-12-17 18:30+0100\n" "PO-Revision-Date: 1998-12-13 22:34+0100\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -217,11 +217,12 @@ msgstr "Ohhh jeeee ... dies ist eine Wanze (Programmfehler) (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "Sie haben eine Wanze (Programmfehler) gefunden ... (%s:%d)\n" -#: cipher/random.c:379 +#: cipher/random.c:406 msgid "WARNING: using insecure random number generator!!\n" -msgstr "WARNUNG: Der Zufallszahlengenerator erzeugt keine echten Zufallszahlen!\n" +msgstr "" +"WARNUNG: Der Zufallszahlengenerator erzeugt keine echten Zufallszahlen!\n" -#: cipher/random.c:380 +#: cipher/random.c:407 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -235,7 +236,7 @@ msgstr "" "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n" "\n" -#: cipher/rndlinux.c:154 +#: cipher/rndlinux.c:118 #, c-format msgid "" "\n" @@ -247,7 +248,7 @@ msgstr "" "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte benЖtigt.)\n" -#: g10/g10.c:158 +#: g10/g10.c:160 msgid "" "@Commands:\n" " " @@ -255,123 +256,123 @@ msgstr "" "@Kommandos:\n" " " -#: g10/g10.c:161 +#: g10/g10.c:163 msgid "|[file]|make a signature" msgstr "|[file]|Eine Unterschrift erzeugen" -#: g10/g10.c:162 +#: g10/g10.c:164 msgid "|[file]|make a clear text signature" msgstr "|[file]|Eine Klartextunterschrift erzeugen" -#: g10/g10.c:163 +#: g10/g10.c:165 msgid "make a detached signature" msgstr "Eine abgetrennte Unterschrift erzeugen" -#: g10/g10.c:164 +#: g10/g10.c:166 msgid "encrypt data" msgstr "Daten verschlЭsseln" -#: g10/g10.c:165 +#: g10/g10.c:167 msgid "encryption only with symmetric cipher" msgstr "Daten nur symmetrisch verschlЭsseln" -#: g10/g10.c:166 +#: g10/g10.c:168 msgid "store only" msgstr "Nur speichern" -#: g10/g10.c:167 +#: g10/g10.c:169 msgid "decrypt data (default)" msgstr "Daten entschlЭsseln (Voreinstellung)" -#: g10/g10.c:168 +#: g10/g10.c:170 msgid "verify a signature" msgstr "Signatur prЭfen" -#: g10/g10.c:170 +#: g10/g10.c:172 msgid "list keys" msgstr "Liste der SchlЭssel" -#: g10/g10.c:171 +#: g10/g10.c:173 msgid "list keys and signatures" msgstr "Liste der SchlЭssel und ihrer Signaturen" -#: g10/g10.c:172 +#: g10/g10.c:174 msgid "check key signatures" msgstr "Signaturen der SchlЭssel prЭfen" -#: g10/g10.c:173 +#: g10/g10.c:175 msgid "list keys and fingerprints" msgstr "Liste der SchlЭssel und ihrer \"FingerabdrЭcke\"" -#: g10/g10.c:174 +#: g10/g10.c:176 msgid "list secret keys" msgstr "Liste der geheimen SchlЭssel" -#: g10/g10.c:176 +#: g10/g10.c:178 msgid "generate a new key pair" msgstr "Ein neues SchlЭsselpaar erzeugen" -#: g10/g10.c:178 +#: g10/g10.c:180 msgid "remove key from the public keyring" msgstr "SchlЭssel entfernen" -#: g10/g10.c:180 +#: g10/g10.c:182 msgid "sign or edit a key" msgstr "Unterschreiben oder Bearbeiten eines SchlЭssels" -#: g10/g10.c:181 +#: g10/g10.c:183 msgid "generate a revocation certificate" msgstr "Ein SchlЭsselwiderruf-Zertifikat erzeugen" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "export keys" msgstr "SchlЭssel exportieren" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "import/merge keys" msgstr "SchlЭssel importieren/kombinieren" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "list only the sequence of packets" msgstr "Lediglich die Struktur der Datenpackete anzeigen" -#: g10/g10.c:190 +#: g10/g10.c:193 msgid "export the ownertrust values" msgstr "Exportieren der \"Owner trust\" Werte" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "import ownertrust values" msgstr "Importieren der \"Owner trust\" Werte" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "|[NAMES]|update the trust database" msgstr "|[NAMES]|дndern der \"Trust\"-Datenbank" -#: g10/g10.c:196 +#: g10/g10.c:199 msgid "|[NAMES]|check the trust database" msgstr "|[NAMES]|эberprЭfen der \"Trust\"-Datenbank" -#: g10/g10.c:197 +#: g10/g10.c:200 msgid "fix a corrupted trust database" msgstr "Reparieren einer beschДdigten \"Trust\"-Datenbank" -#: g10/g10.c:198 +#: g10/g10.c:201 msgid "De-Armor a file or stdin" msgstr "Datei oder stdin von der ASCII-HЭlle befreien" -#: g10/g10.c:199 +#: g10/g10.c:202 msgid "En-Armor a file or stdin" msgstr "Datei oder stdin in eine ASCII-HЭlle einpacken" -#: g10/g10.c:200 +#: g10/g10.c:203 msgid "|algo [files]|print message digests" msgstr "|algo [files]|Message-Digests fЭr die Dateien ausgeben" -#: g10/g10.c:201 +#: g10/g10.c:204 msgid "print all message digests" msgstr "Message-Digests fЭr die Eingabedaten ausgeben" -#: g10/g10.c:208 +#: g10/g10.c:211 msgid "" "@\n" "Options:\n" @@ -381,140 +382,140 @@ msgstr "" "Optionen:\n" " " -#: g10/g10.c:210 +#: g10/g10.c:213 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-HЭlle versehen" -#: g10/g10.c:212 +#: g10/g10.c:215 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:213 +#: g10/g10.c:216 msgid "use this user-id for encryption" msgstr "VerschlЭsseln fЭr diese User-ID" -#: g10/g10.c:214 +#: g10/g10.c:217 msgid "|N|set compress level N (0 disables)" msgstr "Kompressionsstufe auf N setzen (0 = keine Kompr.)" -#: g10/g10.c:216 +#: g10/g10.c:219 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:218 +#: g10/g10.c:221 msgid "use as output file" msgstr "Als Ausgabedatei benutzen" -#: g10/g10.c:219 +#: g10/g10.c:222 msgid "verbose" msgstr "Detaillierte Informationen" -#: g10/g10.c:220 +#: g10/g10.c:223 msgid "be somewhat more quiet" msgstr "Etwas weniger Infos" -#: g10/g10.c:221 +#: g10/g10.c:224 msgid "force v3 signatures" msgstr "v3 Signaturen erzwingen" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:223 +#: g10/g10.c:226 msgid "batch mode: never ask" msgstr "Stapelmodus: Keine Abfragen" -#: g10/g10.c:224 +#: g10/g10.c:227 msgid "assume yes on most questions" msgstr "\"Ja\" als Standardantwort annehmen" -#: g10/g10.c:225 +#: g10/g10.c:228 msgid "assume no on most questions" msgstr "\"Nein\" als Standardantwort annehmen" -#: g10/g10.c:226 +#: g10/g10.c:229 msgid "add this keyring to the list of keyrings" msgstr "Als Жffentlichen SchlЭsselbund mitbenutzen" -#: g10/g10.c:227 +#: g10/g10.c:230 msgid "add this secret keyring to the list" msgstr "Als geheimen SchlЭsselbund mitbenutzen" -#: g10/g10.c:228 +#: g10/g10.c:231 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|NAME als voreingestellten SchlЭssel benutzen" -#: g10/g10.c:229 +#: g10/g10.c:232 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|Terminalzeichensatz NAME benutzen" -#: g10/g10.c:230 +#: g10/g10.c:233 msgid "read options from file" msgstr "Optionen aus der Datei lesen" -#: g10/g10.c:232 +#: g10/g10.c:235 msgid "set debugging flags" msgstr "Debug-Flags einschalten" -#: g10/g10.c:233 +#: g10/g10.c:236 msgid "enable full debugging" msgstr "Alle Debug-Flags einschalten" -#: g10/g10.c:234 +#: g10/g10.c:237 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben" -#: g10/g10.c:235 +#: g10/g10.c:238 msgid "do not write comment packets" msgstr "Keine Kommentarpakete schreiben" -#: g10/g10.c:236 +#: g10/g10.c:239 msgid "(default is 1)" msgstr "BenЖtigte Vollvertrauen (Voreinstellung 1)" -#: g10/g10.c:237 +#: g10/g10.c:240 msgid "(default is 3)" msgstr "BenЖtigte Teilvertrauen (Voreinstellung 3)" -#: g10/g10.c:239 +#: g10/g10.c:242 msgid "|KEYID|ulimately trust this key" msgstr "|KEYID|Diesem SchlЭssel uneingeschrДnkt vertrauen" -#: g10/g10.c:240 +#: g10/g10.c:243 msgid "|FILE|load extension module FILE" msgstr "|FILE|Erweiterungsmodul DATEI laden" -#: g10/g10.c:241 +#: g10/g10.c:244 msgid "emulate the mode described in RFC1991" msgstr "Den in RFC1991 beschriebenen Modus nachahmen" -#: g10/g10.c:242 +#: g10/g10.c:245 msgid "|N|use passphrase mode N" msgstr "|N|Verwenden des Mantra-Modus N" -#: g10/g10.c:244 +#: g10/g10.c:247 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|Das Hashverfahren NAME fЭr Mantras benutzen" -#: g10/g10.c:246 +#: g10/g10.c:249 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|Das VerschlЭ.verfahren NAME fЭr Mantras benutzen" -#: g10/g10.c:248 +#: g10/g10.c:251 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|Das VerschlЭ.verfahren NAME benutzen" -#: g10/g10.c:249 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|Das Hashverfahren NAME benutzen" -#: g10/g10.c:250 +#: g10/g10.c:253 msgid "|N|use compress algorithm N" msgstr "|N|Die Komprimierverfahren N benutzen" -#: g10/g10.c:251 +#: g10/g10.c:254 msgid "throw keyid field of encrypted packets" msgstr "entferne die AbsenderI-ID verschlЭsselter Pakete" -#: g10/g10.c:259 +#: g10/g10.c:262 msgid "" "@\n" "Examples:\n" @@ -534,19 +535,19 @@ msgstr "" " --list-keys [Namen] SchlЭssel anzeigen\n" " --fingerprint [Namen] \"FingerabdrЭcke\" anzeigen\n" -#: g10/g10.c:337 +#: g10/g10.c:341 msgid "Please report bugs to .\n" msgstr "Berichte Эber Wanzen (Programmfehler) bitte an .\n" -#: g10/g10.c:342 +#: g10/g10.c:346 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Syntax: gpgm [Optionen] [Dateien] (-h fЭr Hilfe)" -#: g10/g10.c:344 +#: g10/g10.c:348 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h fЭr Hilfe)" -#: g10/g10.c:349 +#: g10/g10.c:353 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -554,7 +555,7 @@ msgstr "" "Syntax: gpgm [options] [files]\n" "GnuPG Wartungs-Hilfsprogramm\n" -#: g10/g10.c:352 +#: g10/g10.c:356 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -564,7 +565,7 @@ msgstr "" "Signieren, prЭfen, verschlЭsseln, entschlЭsseln\n" "Die voreingestellte Operation ist abhДngig von den Eingabedaten\n" -#: g10/g10.c:358 +#: g10/g10.c:362 msgid "" "\n" "Supported algorithms:\n" @@ -572,161 +573,153 @@ msgstr "" "\n" "UnterstЭtzte Verfahren:\n" -#: g10/g10.c:433 +#: g10/g10.c:437 msgid "usage: gpgm [options] " msgstr "Aufruf: gpgm [Optionen] " -#: g10/g10.c:435 +#: g10/g10.c:439 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:476 +#: g10/g10.c:480 msgid "conflicting commands\n" msgstr "WidersprЭchliche Kommandos\n" -#: g10/g10.c:614 +#: g10/g10.c:618 #, c-format msgid "NOTE: no default option file '%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:618 +#: g10/g10.c:622 #, c-format msgid "option file '%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:625 +#: g10/g10.c:629 #, c-format msgid "reading options from '%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:773 +#: g10/g10.c:782 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gЭltiger Zeichensatz.\n" -#: g10/g10.c:807 g10/g10.c:819 +#: g10/g10.c:817 g10/g10.c:829 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewДhlte VerschlЭsslungsverfahren ist ungЭltig\n" -#: g10/g10.c:813 g10/g10.c:825 +#: g10/g10.c:823 g10/g10.c:835 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewДhlte Hashverfahren ist ungЭltig\n" -#: g10/g10.c:828 +#: g10/g10.c:838 #, 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:830 +#: g10/g10.c:840 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed mЭssen grЖъer als 0 sein\n" -#: g10/g10.c:832 +#: g10/g10.c:842 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed mЭssen grЖъer als 1 sein\n" -#: g10/g10.c:834 +#: g10/g10.c:844 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:837 +#: g10/g10.c:847 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:841 +#: g10/g10.c:851 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:924 +#: g10/g10.c:934 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:930 +#: g10/g10.c:940 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:938 +#: g10/g10.c:948 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:946 +#: g10/g10.c:956 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:959 +#: g10/g10.c:969 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:972 +#: g10/g10.c:982 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:986 +#: g10/g10.c:996 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:998 +#: g10/g10.c:1008 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:1007 +#: g10/g10.c:1017 msgid "--edit-key username [commands]" msgstr "--edit-key Username [Befehle]" -#: g10/g10.c:1023 +#: g10/g10.c:1033 msgid "--delete-secret-key username" msgstr "--delete-secret-key Username" -#: g10/g10.c:1026 +#: g10/g10.c:1036 msgid "--delete-key username" msgstr "--delete-key Benutzername" -#: g10/encode.c:216 g10/g10.c:1049 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "'%s' kann nicht geЖffnet werden: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1070 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [Benutzername] [Keyring]" -#: g10/g10.c:1116 +#: g10/g10.c:1127 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-HЭlle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1124 +#: g10/g10.c:1135 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-HЭlle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1190 +#: g10/g10.c:1201 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "UngЭltiges Hashverfahren '%s'\n" -#: g10/g10.c:1269 +#: g10/g10.c:1280 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:1273 +#: g10/g10.c:1284 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/decrypt.c:59 g10/g10.c:1276 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "'%s' kann nicht geЖffnet werden\n" -#: g10/g10.c:1325 -msgid "" -"RSA keys are deprecated; please consider creating a new key and use this key " -"in the future\n" -msgstr "" -"RSA SchlЭssel sind nicht erwЭnscht; bitte denken Sie darЭber nach, einen\n" -"neuen SchlЭssel zu erzeugen und diesen in Zukunft zu benutzen\n" - #: g10/armor.c:344 g10/armor.c:391 msgid "armor header: " msgstr "ASCII-HЭlle: " @@ -786,7 +779,7 @@ msgstr "Fehler in der Nachsatzzeile\n" msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "Keine gЭltigen RFC1991- oder OpenPGP-Daten gefunden.\n" -#: g10/pkclist.c:121 +#: g10/pkclist.c:138 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -795,7 +788,7 @@ msgstr "" "Es ist kein \"Owner trust\" fЭr %lu definiert:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:131 +#: g10/pkclist.c:148 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -818,25 +811,30 @@ msgstr "" " 4 = Ich vertraue ihm vollstДndig\n" " s = Bitte weitere Information anzeigen\n" -#: g10/pkclist.c:140 +#: g10/pkclist.c:157 msgid " m = back to the main menu\n" msgstr " m = ZurЭck zum MenЭ\n" +#: g10/pkclist.c:159 +msgid " q = quit\n" +msgstr " q = Beenden\n" + # valid user replies (not including 1..4) #. a string with valid answers -#: g10/pkclist.c:145 -msgid "sSmM" -msgstr "sSmM" +#: g10/pkclist.c:164 +#, fuzzy +msgid "sSmMqQ" +msgstr "sSmMqQ" -#: g10/pkclist.c:149 +#: g10/pkclist.c:168 msgid "Your decision? " msgstr "Ihre Auswahl? " -#: g10/pkclist.c:169 +#: g10/pkclist.c:188 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Zertifikate fЭhren zu einem letztlich vertrauenswЭrdigen SchlЭssel:\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:221 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" @@ -847,7 +845,7 @@ msgstr "" "ermitteln kЖnnen.\n" "\n" -#: g10/pkclist.c:219 +#: g10/pkclist.c:251 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -855,7 +853,7 @@ msgstr "" "Kein Pfad fЭhrt zu einen unserer SchlЭsseln.\n" "\n" -#: g10/pkclist.c:221 +#: g10/pkclist.c:253 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -863,7 +861,7 @@ msgstr "" "Keine Zertifikate mit undefinierten Vertrauen gefunden.\n" "\n" -#: g10/pkclist.c:223 +#: g10/pkclist.c:255 msgid "" "No trust values changed.\n" "\n" @@ -871,33 +869,33 @@ msgstr "" "Keine \"trust\" Werte geДndert.\n" "\n" -#: g10/pkclist.c:238 +#: g10/pkclist.c:270 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "SchlЭssel %08lX: SchlЭssel wurde widerrufen\n" -#: g10/pkclist.c:244 g10/pkclist.c:335 +#: g10/pkclist.c:276 g10/pkclist.c:369 msgid "Use this key anyway? " msgstr "Diesen SchlЭssel trotzdem benutzen?" -#: g10/pkclist.c:266 +#: g10/pkclist.c:298 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: SchlЭssel ist verfallen!\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:304 #, 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:288 +#: g10/pkclist.c:322 #, 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:294 +#: g10/pkclist.c:328 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -906,19 +904,19 @@ msgstr "" "%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:300 +#: g10/pkclist.c:334 msgid "This key probably belongs to the owner\n" msgstr "" "Dieser SchlЭssel gehЖrt uns (alldieweil wir den geheimen SchlЭssel dazu " "haben)\n" -#: g10/pkclist.c:305 +#: g10/pkclist.c:339 msgid "This key belongs to us\n" msgstr "" "Dieser SchlЭssel gehЖrt uns (alldieweil wir den geheimen SchlЭssel dazu " "haben)\n" -#: g10/pkclist.c:330 +#: g10/pkclist.c:364 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" @@ -929,55 +927,55 @@ msgstr "" "Wenn Sie *wirklich* wissen, was Sie tun, kЖnnen Sie die nДchste\n" "Frage mit ja beantworten\n" -#: g10/pkclist.c:339 +#: g10/pkclist.c:373 msgid "WARNING: Using untrusted key!\n" msgstr "WARNUNG: Ein SchlЭssel ohne gesichertes Vertrauen wird benutzt!\n" -#: g10/pkclist.c:375 +#: g10/pkclist.c:409 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:376 +#: g10/pkclist.c:410 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:397 +#: g10/pkclist.c:431 msgid "Note: This key has expired!\n" msgstr "Hinweis: Dieser SchlЭssel ist verfallen!\n" -#: g10/pkclist.c:404 +#: g10/pkclist.c:438 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:406 +#: g10/pkclist.c:440 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:421 +#: g10/pkclist.c:456 msgid "WARNING: We do NOT trust this key!\n" msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem SchlЭssel!\n" -#: g10/pkclist.c:422 +#: g10/pkclist.c:457 msgid " The signature is probably a FORGERY.\n" msgstr " Die Signatur ist wahrscheinlich eine FдLSCHUNG.\n" -#: g10/pkclist.c:429 +#: g10/pkclist.c:464 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:432 +#: g10/pkclist.c:467 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:477 +#: g10/pkclist.c:512 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -985,25 +983,25 @@ msgstr "" "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n" "\n" -#: g10/pkclist.c:482 +#: g10/pkclist.c:517 msgid "Enter the user ID: " msgstr "Geben Sie die User-ID ein: " -#: g10/pkclist.c:493 +#: g10/pkclist.c:528 msgid "No such user ID.\n" msgstr "Keine solche User-ID vorhanden.\n" -#: g10/pkclist.c:527 g10/pkclist.c:554 +#: g10/pkclist.c:562 g10/pkclist.c:589 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: Эbersprungen: %s\n" -#: g10/pkclist.c:535 +#: g10/pkclist.c:570 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: Fehler beim PrЭfen des SchlЭssels: %s\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:596 msgid "no valid addressees\n" msgstr "Keine gЭltigen Adressaten\n" @@ -1026,8 +1024,8 @@ msgstr " (%d) DSA und ElGamal (voreingestellt)\n" #: g10/keygen.c:391 #, c-format -msgid " (%d) ElGamal (sign and encrypt)\n" -msgstr " (%d) ElGamal (signieren/beglaubigen und verschlЭsseln)\n" +msgid " (%d) DSA (sign only)\n" +msgstr " (%d) DSA (nur signieren/beglaubigen)\n" #: g10/keygen.c:393 #, c-format @@ -1036,23 +1034,28 @@ msgstr " (%d) ElGamal (nur verschl #: g10/keygen.c:394 #, c-format -msgid " (%d) DSA (sign only)\n" -msgstr " (%d) DSA (nur signieren/beglaubigen)\n" +msgid " (%d) ElGamal (sign and encrypt)\n" +msgstr " (%d) ElGamal (signieren/beglaubigen und verschlЭsseln)\n" -#: g10/keygen.c:395 +#: g10/keygen.c:396 #, c-format msgid " (%d) ElGamal in a v3 packet\n" msgstr " (%d) ElGamal in einem v3-Paket\n" -#: g10/keygen.c:399 +#: g10/keygen.c:401 msgid "Your selection? " msgstr "Ihre Auswahl? " -#: g10/keygen.c:425 +#: g10/keygen.c:411 +#, fuzzy +msgid "Do you really want to create a sign and encrypt key? " +msgstr "MЖchten Sie die ausgewДhlten SchlЭssel wirklich entfernen? " + +#: g10/keygen.c:432 msgid "Invalid selection.\n" msgstr "UngЭltige Auswahl.\n" -#: g10/keygen.c:437 +#: g10/keygen.c:444 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1065,19 +1068,19 @@ msgstr "" " standard SchlЭssellДnge ist 1024 Bit\n" " grЖъte sinnvolle SchlЭssellДnge ist 2048 Bit\n" -#: g10/keygen.c:444 +#: g10/keygen.c:451 msgid "What keysize do you want? (1024) " msgstr "Welche SchlЭssellДnge wЭnschen Sie? (1024) " -#: g10/keygen.c:449 +#: g10/keygen.c:456 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA erlaubt nur SchlЭssellДngen von 512 bis 1024\n" -#: g10/keygen.c:451 +#: g10/keygen.c:458 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "zu kurz; 768 ist die kleinste mЖgliche SchlЭssellДnge.\n" -#: g10/keygen.c:454 +#: g10/keygen.c:461 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1085,11 +1088,11 @@ msgstr "" "SchlЭssellДngen grЖъer als 2048 werden nicht empfohlen, da die\n" "Berechnungen dann WIRKLICH lange brauchen!\n" -#: g10/keygen.c:457 +#: g10/keygen.c:464 msgid "Are you sure that you want this keysize? " msgstr "Sind Sie sicher, daъ Sie diese SchlЭssellДnge wЭnschen? " -#: g10/keygen.c:458 +#: g10/keygen.c:465 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1097,21 +1100,21 @@ msgstr "" "Gut, aber bitte denken Sie auch daran, daъ Monitor und Tastatur Daten " "abstrahlen und diese leicht mitgelesen werden kЖnnen.\n" -#: g10/keygen.c:466 +#: g10/keygen.c:473 msgid "Do you really need such a large keysize? " msgstr "Brauchen Sie wirklich einen derartig langen SchlЭssel? " -#: g10/keygen.c:472 +#: g10/keygen.c:479 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Die verlangte SchlЭssellДnge betrДgt %u Bit\n" -#: g10/keygen.c:475 g10/keygen.c:479 +#: g10/keygen.c:482 g10/keygen.c:486 #, c-format msgid "rounded up to %u bits\n" msgstr "aufgerundet auf %u Bit\n" -#: g10/keygen.c:492 +#: g10/keygen.c:499 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1127,29 +1130,29 @@ msgstr "" " m = SchlЭssel verfДllt nach n Monaten\n" " y = SchlЭssel verfДllt nach n Jahren\n" -#: g10/keygen.c:507 +#: g10/keygen.c:514 msgid "Key is valid for? (0) " msgstr "Der SchlЭssel bleibt wie lange gЭltig? (0) " -#: g10/keygen.c:518 +#: g10/keygen.c:525 msgid "invalid value\n" msgstr "UngЭltiger Wert.\n" -#: g10/keygen.c:523 +#: g10/keygen.c:530 msgid "Key does not expire at all\n" msgstr "Der SchlЭssel verfДllt nie.\n" #. print the date when the key expires -#: g10/keygen.c:529 +#: g10/keygen.c:536 #, c-format msgid "Key expires at %s\n" msgstr "Der SchlЭssel verfДllt am %s\n" -#: g10/keygen.c:535 +#: g10/keygen.c:542 msgid "Is this correct (y/n)? " msgstr "Ist dies richtig? (j/n) " -#: g10/keygen.c:577 +#: g10/keygen.c:584 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1165,39 +1168,39 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:588 +#: g10/keygen.c:595 msgid "Real name: " msgstr "Ihr Name (\"Vorname Nachname\"): " -#: g10/keygen.c:592 +#: g10/keygen.c:599 msgid "Invalid character in name\n" msgstr "UngЭltiges Zeichen im Namen\n" -#: g10/keygen.c:594 +#: g10/keygen.c:601 msgid "Name may not start with a digit\n" msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n" -#: g10/keygen.c:596 +#: g10/keygen.c:603 msgid "Name must be at least 5 characters long\n" msgstr "Der Name muъ min. 5 Zeichen lang sein.\n" -#: g10/keygen.c:604 +#: g10/keygen.c:611 msgid "Email address: " msgstr "E-Mail-Adresse: " -#: g10/keygen.c:616 +#: g10/keygen.c:623 msgid "Not a valid email address\n" msgstr "Diese E-Mail-Adresse ist ungЭltig\n" -#: g10/keygen.c:624 +#: g10/keygen.c:631 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:630 +#: g10/keygen.c:637 msgid "Invalid character in comment\n" msgstr "UngЭltiges Zeichen im Kommentar.\n" -#: g10/keygen.c:650 +#: g10/keygen.c:657 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1208,15 +1211,15 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:653 +#: g10/keygen.c:660 msgid "NnCcEeOoQq" msgstr "NnKkEeFfBb" -#: g10/keygen.c:663 +#: g10/keygen.c:670 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "дndern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? " -#: g10/keygen.c:715 +#: g10/keygen.c:722 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1224,11 +1227,11 @@ msgstr "" "Sie benЖtigen ein Mantra, um den geheimen SchlЭssel zu schЭtzen.\n" "\n" -#: g10/keyedit.c:389 g10/keygen.c:723 +#: g10/keyedit.c:389 g10/keygen.c:730 msgid "passphrase not correctly repeated; try again.\n" msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n" -#: g10/keygen.c:729 +#: g10/keygen.c:736 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -1241,7 +1244,7 @@ msgstr "" "aufrufen.\n" "\n" -#: g10/keygen.c:750 +#: g10/keygen.c:757 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (work in another window, move the mouse, utilize the\n" @@ -1252,34 +1255,34 @@ msgstr "" "unterstЭtzen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n" "tippen oder irgendwelche anderen Programme benutzen.\n" -#: g10/keygen.c:820 +#: g10/keygen.c:827 msgid "Key generation can only be used in interactive mode\n" msgstr "" "Die SchlЭsselerzeugung kann nur im interaktiven Modus benutzt werden.\n" -#: g10/keygen.c:828 +#: g10/keygen.c:835 msgid "DSA keypair will have 1024 bits.\n" msgstr "Der DSA SchlЭssel wird 1024 Bits haben.\n" -#: g10/keygen.c:834 +#: g10/keygen.c:841 msgid "Key generation cancelled.\n" msgstr "SchlЭsselerzeugung abgebrochen.\n" -#: g10/keygen.c:844 +#: g10/keygen.c:851 #, c-format msgid "writing public certificate to '%s'\n" msgstr "schreiben des Жffentlichen SchlЭssels nach '%s'\n" -#: g10/keygen.c:845 +#: g10/keygen.c:852 #, c-format msgid "writing secret certificate to '%s'\n" msgstr "schreiben des geheimen SchlЭssels nach '%s'\n" -#: g10/keygen.c:922 +#: g10/keygen.c:929 msgid "public and secret key created and signed.\n" msgstr "жffentlichen und geheimen SchlЭssel erzeugt und signiert.\n" -#: g10/keygen.c:924 +#: g10/keygen.c:931 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--add-key\" to generate a secondary key for this purpose.\n" @@ -1288,12 +1291,12 @@ msgstr "" "werden kann. Sie kЖnnen aber mit dem Kommando \"--add-key\" einen\n" "ZweitschlЭssel zu diesem SchlЭssel hinzufЭgen.\n" -#: g10/keygen.c:938 g10/keygen.c:1023 +#: g10/keygen.c:945 g10/keygen.c:1030 #, c-format msgid "Key generation failed: %s\n" msgstr "SchlЭsselerzeugung fehlgeschlagen: %s\n" -#: g10/keygen.c:1001 +#: g10/keygen.c:1008 msgid "Really create? " msgstr "Wirklich erzeugen? " @@ -1319,11 +1322,28 @@ msgid "reading from '%s'\n" msgstr "Lesen von '%s'\n" #: g10/encode.c:397 -#, c-format -msgid "%s encrypted for: %s\n" +#, fuzzy, c-format +msgid "%s/%s encrypted for: %s\n" msgstr "%s verschlЭsselt fЭr: %s\n" -#: g10/export.c:162 +#: g10/export.c:114 +#, fuzzy, c-format +msgid "%s: user not found: %s\n" +msgstr "%s: Benutzer nicht gefunden\n" + +#: g10/export.c:123 +#, fuzzy, c-format +msgid "certificate read problem: %s\n" +msgstr "User '%s' Leseproblem: %s\n" + +#: g10/export.c:132 +#, fuzzy, c-format +msgid "key %08lX: not a rfc2440 key - skipped\n" +msgstr "" +"SchlЭssel %08lX: kein Жffentlicher SchЭssel fЭr vertrauenswЭrdigen SchlЭssel " +"- Эbersprungen\n" + +#: g10/export.c:174 msgid "WARNING: nothing exported\n" msgstr "WARNUNG: Nichts exportiert\n" @@ -1341,7 +1361,7 @@ msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "der ZweitschlЭssel %08lX wird anstelle des HauptschlЭssels %08lX verwendet\n" -#: g10/import.c:129 g10/trustdb.c:1166 +#: g10/import.c:129 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "Kann die Datei nicht Жffnen: %s\n" @@ -1351,12 +1371,12 @@ msgstr "Kann die Datei nicht msgid "skipping block of type %d\n" msgstr "Эberspringe den Block vom Typ %d\n" -#: g10/import.c:152 g10/trustdb.c:1425 g10/trustdb.c:1494 +#: g10/import.c:152 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu SchlЭssel bislang bearbeitet\n" -#: g10/import.c:157 g10/trustdb.c:1242 +#: g10/import.c:157 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "Lesefehler: %s\n" @@ -1439,7 +1459,7 @@ msgstr "Schl msgid "no default public keyring\n" msgstr "Kein voreingestellter Жffentlicher SchlЭsselbund\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:563 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #, c-format msgid "writing to '%s'\n" msgstr "Schreiben nach '%s'\n" @@ -1468,12 +1488,14 @@ msgstr "Schl #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "" -"SchlЭssel %08lX: der lokale originale SchlЭsselblocks wurde nicht gefunden: %s\n" +"SchlЭssel %08lX: der lokale originale SchlЭsselblocks wurde nicht gefunden: " +"%s\n" #: g10/import.c:403 g10/import.c:601 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" -msgstr "SchlЭssel %08lX: Lesefehler im lokalen originalen SchlЭsselblocks: %s\n" +msgstr "" +"SchlЭssel %08lX: Lesefehler im lokalen originalen SchlЭsselblocks: %s\n" #: g10/import.c:420 g10/import.c:532 g10/import.c:636 msgid "writing keyblock\n" @@ -2066,11 +2088,32 @@ msgstr "core-dump-Erzeugung kann nicht abgeschaltet werden: %s\n" msgid "WARNING: Program may create a core file!\n" msgstr "WARNUNG: Programm kЖnnte einen core-dump schreiben!\n" +#: g10/misc.c:198 +msgid "Experimental algorithms should not be used!\n" +msgstr "" + +#: g10/misc.c:212 +msgid "" +"RSA keys are deprecated; please consider creating a new key and use this key " +"in the future\n" +msgstr "" +"RSA SchlЭssel sind nicht erwЭnscht; bitte denken Sie darЭber nach, einen\n" +"neuen SchlЭssel zu erzeugen und diesen in Zukunft zu benutzen\n" + +#: g10/misc.c:233 +msgid "This cipher algorithm is depreciated; please use a more standard one!\n" +msgstr "" + #: g10/parse-packet.c:109 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n" +#: g10/parse-packet.c:801 +#, c-format +msgid "subpacket of type %d has critical bit set\n" +msgstr "" + #: g10/passphrase.c:141 msgid "" "\n" @@ -2094,20 +2137,20 @@ msgstr "Geben Sie das Mantra ein: " msgid "Repeat passphrase: " msgstr "Geben Sie das Mantra nochmal ein: " -#: g10/plaintext.c:102 +#: g10/plaintext.c:103 msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "Daten wurden nicht gespeichert; verwenden Sie dafЭr die Option \"--output\"\n" -#: g10/plaintext.c:215 +#: g10/plaintext.c:216 msgid "Please enter name of data file: " msgstr "Bitte geben Sie den Namen der Datendatei ein: " -#: g10/plaintext.c:236 +#: g10/plaintext.c:237 msgid "reading stdin ...\n" msgstr "lese stdin ...\n" -#: g10/plaintext.c:299 +#: g10/plaintext.c:300 #, c-format msgid "can't open signed data '%s'\n" msgstr "kann signierte Datei '%s' nicht Жffnen.\n" @@ -2139,7 +2182,7 @@ msgstr "Schutzverfahren %d wird nicht unterst msgid "Invalid passphrase; please try again ...\n" msgstr "UngЭltiges Mantra; versuchen Sie's doch noch einmal ...\n" -#: g10/seckey-cert.c:215 +#: g10/seckey-cert.c:216 msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "" "WARNUNG: Unsicherer SchlЭssel entdeckt -\n" @@ -2163,12 +2206,16 @@ msgstr "" msgid "NOTE: signature key expired %s\n" msgstr "Hinweis: SchlЭssel der Signatur ist verfallen am %s.\n" +#: g10/sig-check.c:226 +msgid "assuming bad signature due to an unknown critical bit\n" +msgstr "" + #: g10/sign.c:69 #, c-format msgid "%s signature from: %s\n" msgstr "%s Unterschrift von: %s\n" -#: g10/sign.c:200 g10/sign.c:558 +#: g10/sign.c:200 g10/sign.c:587 #, c-format msgid "can't create %s: %s\n" msgstr "%s kann nicht erzeugt werden: %s\n" @@ -2307,167 +2354,171 @@ msgstr "%s: konnte einen Satz nicht Nullen: %s\n" msgid "%s: failed to append a record: %s\n" msgstr "%s: konnte Satz nicht anhДngen: %s\n" -#: g10/trustdb.c:134 +#: g10/trustdb.c:142 msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n" msgstr "" "Die \"Trust\"-Datenbank ist beschДdigt; verwenden Sie \"gpgm " "--fix-trustdb\".\n" -#: g10/trustdb.c:147 +#: g10/trustdb.c:155 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" msgstr "trust record %lu, req type %d: read failed: %s\n" -#: g10/trustdb.c:162 +#: g10/trustdb.c:170 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" msgstr "trust record %lu, type %d: write failed: %s\n" -#: g10/trustdb.c:176 +#: g10/trustdb.c:184 #, c-format msgid "trust record %lu: delete failed: %s\n" msgstr "Vertrauenssatz %lu: lЖschen fehlgeschlagen: %s\n" -#: g10/trustdb.c:190 +#: g10/trustdb.c:198 #, c-format msgid "trust db: sync failed: %s\n" msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n" -#: g10/trustdb.c:319 +#: g10/trustdb.c:327 #, c-format msgid "error reading dir record for LID %lu: %s\n" msgstr "Fehler beim Lesen des Dir-Satzes fЭr LID %lu: %s\n" -#: g10/trustdb.c:326 +#: g10/trustdb.c:334 #, c-format msgid "lid %lu: expected dir record, got type %d\n" msgstr "lid %lu: Dir-Satz erwartet, aber es kam Typ %d\n" -#: g10/trustdb.c:331 +#: g10/trustdb.c:339 #, c-format msgid "no primary key for LID %lu\n" msgstr "Kein HauptschlЭssel fЭr LID %lu\n" -#: g10/trustdb.c:336 +#: g10/trustdb.c:344 #, c-format msgid "error reading primary key for LID %lu: %s\n" msgstr "Fehler beim Lesen den HauptschlЭssels der LID %lu: %s\n" -#: g10/trustdb.c:412 +#: g10/trustdb.c:420 #, c-format msgid "chained sigrec %lu has a wrong owner\n" msgstr "Verketteter Signatursatz %lu hat einen falschen Besitzer\n" -#: g10/trustdb.c:455 +#: g10/trustdb.c:463 #, c-format msgid "'%s' is not a valid long keyID\n" msgstr "'%s' ist keine gЭltige lange SchlЭssel-ID\n" -#: g10/trustdb.c:490 +#: g10/trustdb.c:498 #, c-format msgid "key %08lX: no public key for trusted key - skipped\n" -msgstr "SchlЭssel %08lX: kein Жffentlicher SchЭssel fЭr vertrauenswЭrdigen SchlЭssel - Эbersprungen\n" +msgstr "" +"SchlЭssel %08lX: kein Жffentlicher SchЭssel fЭr vertrauenswЭrdigen SchlЭssel " +"- Эbersprungen\n" -#: g10/trustdb.c:499 g10/trustdb.c:557 +#: g10/trustdb.c:507 g10/trustdb.c:565 #, c-format msgid "key %08lX: can't put it into the trustdb\n" msgstr "SchlЭssel %08lX kann nicht in die \"trustdb\" eingefЭgt werden\n" -#: g10/trustdb.c:504 g10/trustdb.c:563 +#: g10/trustdb.c:512 g10/trustdb.c:571 #, c-format msgid "key %08lX: query record failed\n" msgstr "SchlЭssel %08lX: Satzabfrage fehlgeschlagen\n" -#: g10/trustdb.c:509 g10/trustdb.c:572 +#: g10/trustdb.c:517 g10/trustdb.c:580 #, c-format msgid "key %08lX: already in trusted key table\n" msgstr "SchlЭssel %08lX: Ist bereits in geheimer SchlЭsseltabelle\n" -#: g10/trustdb.c:512 g10/trustdb.c:575 +#: g10/trustdb.c:520 g10/trustdb.c:583 #, c-format msgid "key %08lX: accepted as trusted key.\n" msgstr "SchlЭssel %08lX: Akzeptiert als vertrauenswЭrdiger SchlЭssel.\n" -#: g10/trustdb.c:528 +#: g10/trustdb.c:536 #, c-format msgid "NOTE: secret key %08lX is NOT protected.\n" msgstr "HINWEIS: Geheimer SchlЭssel %08lX ist NICHT geschЭtzt.\n" -#: g10/trustdb.c:540 +#: g10/trustdb.c:548 #, c-format msgid "key %08lX: secret key without public key - skipped\n" -msgstr "SchlЭssel %08lX: geheimer SchlЭssel, aber ohne Жffentlichen SchlЭssel - Эbersprungen\n" +msgstr "" +"SchlЭssel %08lX: geheimer SchlЭssel, aber ohne Жffentlichen SchlЭssel - " +"Эbersprungen\n" -#: g10/trustdb.c:547 +#: g10/trustdb.c:555 #, c-format msgid "key %08lX: secret and public key don't match\n" msgstr "" "SchlЭssel %08lX: geheimer und Жffentlicher SchlЭssel passen nicht zusammen.\n" -#: g10/trustdb.c:583 +#: g10/trustdb.c:591 #, c-format msgid "enumerate secret keys failed: %s\n" msgstr "enum_secret_keys fehlgeschlagen: %s\n" -#: g10/trustdb.c:766 +#: g10/trustdb.c:774 #, c-format msgid "lid %lu: read dir record failed: %s\n" msgstr "lid %lu: Lesen des Verz.Satzes fehlgeschlagen: %s\n" -#: g10/trustdb.c:775 +#: g10/trustdb.c:783 #, c-format msgid "lid %lu: read key record failed: %s\n" msgstr "lid %lu: Lesen des Schl..Satzes fehlgeschlagen: %s\n" -#: g10/trustdb.c:785 +#: g10/trustdb.c:793 #, c-format msgid "lid %lu: read uid record failed: %s\n" msgstr "lid %lu: Lesen des UserID-Satzes fehlgeschlagen: %s\n" -#: g10/trustdb.c:794 +#: g10/trustdb.c:802 #, c-format msgid "lid %lu: read pref record failed: %s\n" msgstr "lid %lu: Lesen des Pref.Satzes fehlgeschlagen: %s\n" -#: g10/trustdb.c:804 +#: g10/trustdb.c:812 #, c-format msgid "lid %lu: read sig record failed: %s\n" msgstr "lid %lu: Lesen des Sig.Satzes fehlgeschlagen: %s\n" -#: g10/trustdb.c:999 +#: g10/trustdb.c:1013 msgid "Ooops, no keys\n" msgstr "Huch, keine SchlЭssel\n" -#: g10/trustdb.c:1003 +#: g10/trustdb.c:1017 msgid "Ooops, no user ids\n" msgstr "Huch, keine User-IDs\n" -#: g10/trustdb.c:1074 g10/trustdb.c:1092 +#: g10/trustdb.c:1088 g10/trustdb.c:1106 #, c-format msgid "user '%s' read problem: %s\n" msgstr "User '%s' Leseproblem: %s\n" -#: g10/trustdb.c:1077 g10/trustdb.c:1095 +#: g10/trustdb.c:1091 g10/trustdb.c:1109 #, c-format msgid "user '%s' list problem: %s\n" msgstr "User '%s' Listenproblem: %s\n" -#: g10/trustdb.c:1085 g10/trustdb.c:1300 +#: g10/trustdb.c:1099 g10/trustdb.c:1346 #, c-format msgid "user '%s' not found: %s\n" msgstr "Benutzer '%s' nicht gefunden: %s\n" -#: g10/trustdb.c:1087 g10/trustdb.c:1302 +#: g10/trustdb.c:1101 g10/trustdb.c:1348 #, c-format msgid "problem finding '%s' in trustdb: %s\n" msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n" -#: g10/trustdb.c:1090 +#: g10/trustdb.c:1104 #, c-format msgid "user '%s' not in trustdb\n" msgstr "User '%s' ist nicht in der trustdb\n" -#: g10/trustdb.c:1125 +#: g10/trustdb.c:1139 #, c-format msgid "" "# List of assigned trustvalues, created %s\n" @@ -2476,361 +2527,365 @@ msgstr "" "# Liste der zugewisenen \"trustvalues\", erzeugt am %s\n" "# (Verwenden Sie \"gpgm --import-ownertrust\" um sie wieder einzuspielen)\n" -#: g10/trustdb.c:1131 +#: g10/trustdb.c:1145 msgid "directory record w/o primary key\n" msgstr "Verzeichnis-Satz ohne HauptschlЭssel\n" -#: g10/trustdb.c:1138 +#: g10/trustdb.c:1152 #, c-format msgid "error reading key record: %s\n" msgstr "Fehler beim Lesen des Schl.Satzes: %s\n" -#: g10/trustdb.c:1178 +#: g10/trustdb.c:1192 msgid "line too long\n" msgstr "Zeile zu lang\n" -#: g10/trustdb.c:1186 +#: g10/trustdb.c:1200 msgid "error: missing colon\n" msgstr "Fehler: Fehlender Doppelpunkt\n" -#: g10/trustdb.c:1191 +#: g10/trustdb.c:1205 msgid "error: invalid fingerprint\n" msgstr "Fehler: ungЭltiger Fingerabdruck\n" -#: g10/trustdb.c:1195 +#: g10/trustdb.c:1209 msgid "error: no ownertrust value\n" msgstr "Fehler: Keine \"Owner trust\" Werte\n" -#: g10/trustdb.c:1209 +#: g10/trustdb.c:1223 #, c-format msgid "LID %lu: changing trust from %u to %u\n" msgstr "LID %lu: дndern des 'Trusts' von %u auf %u\n" -#: g10/trustdb.c:1212 +#: g10/trustdb.c:1226 #, c-format msgid "LID %lu: setting trust to %u\n" msgstr "LID %lu: Setze 'Trust' auf %u\n" -#: g10/trustdb.c:1220 +#: g10/trustdb.c:1234 msgid "key not in trustdb, searching ring.\n" msgstr "SchlЭssel ist nicht in der trustdb, Schl.bund wird durchsucht.\n" -#: g10/trustdb.c:1223 +#: g10/trustdb.c:1237 #, c-format msgid "key not in ring: %s\n" msgstr "SchlЭssel ist nicht im SchlЭsselbund: %s\n" -#: g10/trustdb.c:1227 +#: g10/trustdb.c:1241 msgid "Oops: key is now in trustdb???\n" msgstr "Huch: SchlЭssel ist ja gar nicht in der Trust-DB?\n" #. update the ownertrust -#: g10/trustdb.c:1232 +#: g10/trustdb.c:1246 #, c-format msgid "insert trust record failed: %s\n" msgstr "'trust record' einfЭgen fehlgeschlagen: %s\n" #. error -#: g10/trustdb.c:1238 +#: g10/trustdb.c:1252 #, c-format msgid "error finding dir record: %s\n" msgstr "Fehler beim Auffinden des Verz.Satzes: %s\n" -#: g10/trustdb.c:1305 +#: g10/trustdb.c:1351 #, c-format msgid "user '%s' not in trustdb - inserting\n" msgstr "User '%s' ist nich in der 'Trust'-Datenbank - wird eingefЭgt\n" -#: g10/trustdb.c:1308 +#: g10/trustdb.c:1354 #, c-format msgid "failed to put '%s' into trustdb: %s\n" msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n" -#: g10/trustdb.c:1355 +#: g10/trustdb.c:1404 #, c-format msgid "%s: keyblock read problem: %s\n" msgstr "%s: SchlЭsselblock Leseproblem: %s\n" -#: g10/trustdb.c:1369 +#: g10/trustdb.c:1418 #, c-format msgid "%s: update failed: %s\n" msgstr "%s: дnderung fehlgeschlagen: %s\n" -#: g10/trustdb.c:1372 +#: g10/trustdb.c:1421 #, c-format msgid "%s: updated\n" msgstr "%s: geДndert\n" -#: g10/trustdb.c:1374 +#: g10/trustdb.c:1423 #, c-format msgid "%s: okay\n" msgstr "%s: In Ordnung\n" -#: g10/trustdb.c:1389 +#: g10/trustdb.c:1438 #, c-format msgid "lid %lu: dir record w/o key - skipped\n" msgstr "lid %lu: Dir-Satz ohne SchlЭssel - Эbergangen\n" -#: g10/trustdb.c:1402 +#: g10/trustdb.c:1451 #, c-format msgid "lid %lu: keyblock not found: %s\n" msgstr "lid %lu: SchlЭsselblock nicht gefunden: %s\n" -#: g10/trustdb.c:1411 g10/trustdb.c:1480 +#: g10/trustdb.c:1460 g10/trustdb.c:1529 #, c-format msgid "lid %lu: update failed: %s\n" msgstr "lid %lu: дnderung fehlgeschlagen: %s\n" -#: g10/trustdb.c:1417 g10/trustdb.c:1486 +#: g10/trustdb.c:1466 g10/trustdb.c:1535 #, c-format msgid "lid %lu: updated\n" msgstr "lid %lu: geДndert\n" -#: g10/trustdb.c:1421 g10/trustdb.c:1490 +#: g10/trustdb.c:1470 g10/trustdb.c:1539 #, c-format msgid "lid %lu: okay\n" msgstr "lid %lu: In Ordnung\n" -#: g10/trustdb.c:1428 g10/trustdb.c:1496 +#: g10/trustdb.c:1477 g10/trustdb.c:1545 #, c-format msgid "%lu keys processed\n" msgstr "%lu SchlЭssel bearbeitet\n" -#: g10/trustdb.c:1430 +#: g10/trustdb.c:1479 #, c-format msgid "\t%lu keys skipped\n" msgstr "\t%lu SchlЭssel Эbersprungen\n" -#: g10/trustdb.c:1432 g10/trustdb.c:1498 +#: g10/trustdb.c:1481 g10/trustdb.c:1547 #, c-format msgid "\t%lu keys with errors\n" msgstr "\t%lu SchlЭssel mit Fehlern\n" -#: g10/trustdb.c:1434 g10/trustdb.c:1500 +#: g10/trustdb.c:1483 g10/trustdb.c:1549 #, c-format msgid "\t%lu keys updated\n" msgstr "\t%lu SchlЭssel geДndert\n" -#: g10/trustdb.c:1464 +#: g10/trustdb.c:1513 #, c-format msgid "lid ?: insert failed: %s\n" msgstr "lid ?: EinfЭgen fehlgeschlagen: %s\n" -#: g10/trustdb.c:1469 +#: g10/trustdb.c:1518 #, c-format msgid "lid %lu: insert failed: %s\n" msgstr "lid %lu: EinfЭgen fehlgeschlagen: %s\n" -#: g10/trustdb.c:1475 +#: g10/trustdb.c:1524 #, c-format msgid "lid %lu: inserted\n" msgstr "lid %lu: eingefЭgt\n" -#: g10/trustdb.c:1502 +#: g10/trustdb.c:1551 #, c-format msgid "\t%lu keys inserted\n" msgstr "\t%lu SchlЭssel eingefЭgt\n" -#: g10/trustdb.c:1505 +#: g10/trustdb.c:1554 #, c-format msgid "enumerate keyblocks failed: %s\n" msgstr "enumerate SchlЭsselblock fehlgeschlagen: %s\n" -#: g10/trustdb.c:1550 +#: g10/trustdb.c:1599 #, c-format msgid "check_trust: search dir record failed: %s\n" msgstr "check_trust: Suche nach Dir-Satz fehlgeschlagen: %s\n" -#: g10/trustdb.c:1557 +#: g10/trustdb.c:1606 #, c-format msgid "key %08lX: insert trust record failed: %s\n" msgstr "SchlЭssel %08lX: 'trust record' einfЭgen fehlgeschlagen: %s\n" -#: g10/trustdb.c:1561 +#: g10/trustdb.c:1610 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" msgstr "SchlЭssel %08lX.%lu: in \"trustdb\" eingefЭgt\n" -#: g10/trustdb.c:1569 +#: g10/trustdb.c:1618 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "" "SchlЭssel %08lX.%lu: wurde in der Zukunft erzeugt (Zeitreise oder Uhren " "stimmen nicht Эberein)\n" -#: g10/trustdb.c:1576 +#: g10/trustdb.c:1625 #, c-format msgid "key %08lX.%lu: expired at %s\n" msgstr "SchlЭssel %08lX.%lu: verfallen am %s\n" -#: g10/trustdb.c:1584 +#: g10/trustdb.c:1633 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" msgstr "SchlЭssel %08lX.%lu: VertrauensprЭfung fehlgeschlagen: %s\n" -#: g10/trustdb.c:1753 g10/trustdb.c:1782 g10/trustdb.c:2521 +#: g10/trustdb.c:1820 g10/trustdb.c:1849 g10/trustdb.c:2588 msgid "WARNING: can't yet handle long pref records\n" msgstr "WARNUNG: Lange 'Pref'-Records kЖnnen noch nicht benutzt werden\n" -#: g10/trustdb.c:1804 +#: g10/trustdb.c:1871 #, c-format msgid "get_dir_record: search_record failed: %s\n" msgstr "get_dir_record: search_record fehlgeschlagen: %s\n" -#: g10/trustdb.c:1867 +#: g10/trustdb.c:1934 #, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" msgstr "Hinweis: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" -#: g10/trustdb.c:1871 +#: g10/trustdb.c:1938 #, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n" msgstr "Hinweis: sig rec %lu[%d] in hintlist of %lu but not marked\n" #. we need the dir record -#: g10/trustdb.c:1878 +#: g10/trustdb.c:1945 #, c-format msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n" msgstr "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n" -#: g10/trustdb.c:1884 +#: g10/trustdb.c:1951 #, c-format msgid "lid %lu: no primary key\n" msgstr "lid %lu: kein HauptschlЭssel\n" -#: g10/trustdb.c:1917 +#: g10/trustdb.c:1984 #, c-format msgid "lid %lu: user id not found in keyblock\n" msgstr "lid %lu: User-ID im SchlЭsselblock nicht gefunden\n" -#: g10/trustdb.c:1921 +#: g10/trustdb.c:1988 #, c-format msgid "lid %lu: user id without signature\n" msgstr "lid %lu: User-ID ohne Signatur\n" -#: g10/trustdb.c:1928 +#: g10/trustdb.c:1995 #, c-format msgid "lid %lu: self-signature in hintlist\n" msgstr "lid %lu: Eigenbeglaubigung in 'hintlist'\n" -#: g10/trustdb.c:1939 g10/trustdb.c:2658 g10/trustdb.c:2742 +#: g10/trustdb.c:2006 g10/trustdb.c:2725 g10/trustdb.c:2809 msgid "Valid certificate revocation" msgstr "GЭltiger Zerifikat-Widerruf" -#: g10/trustdb.c:1940 g10/trustdb.c:2659 g10/trustdb.c:2743 +#: g10/trustdb.c:2007 g10/trustdb.c:2726 g10/trustdb.c:2810 msgid "Good certificate" msgstr "Korrektes Zertifikat" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:2016 msgid "very strange: no public key\n" msgstr "sehr seltsam: kein Жffentlicher SchlЭssel\n" -#: g10/trustdb.c:1997 +#: g10/trustdb.c:2064 #, c-format msgid "hintlist %lu[%d] of %lu does not point to a dir record\n" msgstr "hintlist %lu[%d] of %lu zeigt nicht auf einen 'dir record'\n" -#: g10/trustdb.c:2003 +#: g10/trustdb.c:2070 #, c-format msgid "lid %lu does not have a key\n" msgstr "lid %lu hat keinen SchlЭssel\n" -#: g10/trustdb.c:2013 +#: g10/trustdb.c:2080 #, c-format msgid "lid %lu: can't get keyblock: %s\n" msgstr "lid %lu: SchlЭsselblock nicht verfЭgbar: %s\n" -#: g10/trustdb.c:2070 g10/trustdb.c:2984 +#: g10/trustdb.c:2137 g10/trustdb.c:3051 #, c-format msgid "tdbio_search_dir failed: %s\n" msgstr "tdbio_search_dir fehlgeschlagen: %s\n" -#: g10/trustdb.c:2223 +#: g10/trustdb.c:2290 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" msgstr "SchlЭssel %08lX.%lu: Korrekte UnterschlЭssel-Anbindung\n" -#: g10/trustdb.c:2229 g10/trustdb.c:2271 +#: g10/trustdb.c:2296 g10/trustdb.c:2338 #, c-format msgid "key %08lX.%lu: Invalid subkey binding: %s\n" msgstr "SchlЭssel %08lX.%lu: UngЭltige UnterschlЭssel-Anbindung\n" -#: g10/trustdb.c:2244 +#: g10/trustdb.c:2311 #, c-format msgid "key %08lX.%lu: Valid key revocation\n" msgstr "SchlЭssel %08lX.%lu: GЭltiger SchlЭsselwiderruf\n" -#: g10/trustdb.c:2250 +#: g10/trustdb.c:2317 #, c-format msgid "key %08lX.%lu: Invalid key revocation: %s\n" msgstr "SchlЭssel %08lX.%lu: UngЭltiger SchlЭsselwiderruf: %s\n" -#: g10/trustdb.c:2265 +#: g10/trustdb.c:2332 #, c-format msgid "key %08lX.%lu: Valid subkey revocation\n" msgstr "SchlЭssel %08lX.%lu: GЭltiger UnterschlЭsselwiderruf\n" -#: g10/trustdb.c:2365 +#: g10/trustdb.c:2432 msgid "Good self-signature" msgstr "Korrekte Eigenbeglaubigung" -#: g10/trustdb.c:2376 +#: g10/trustdb.c:2443 msgid "Invalid self-signature" msgstr "UngЭltige Eigenbeglaubigung" -#: g10/trustdb.c:2386 +#: g10/trustdb.c:2453 msgid "Valid user ID revocation skipped due to a newer self signature\n" -msgstr "GЭltiger User-ID-Widerruf ignoriert, da eine neuere Eigenbeglaubigung vorliegt\n" +msgstr "" +"GЭltiger User-ID-Widerruf ignoriert, da eine neuere Eigenbeglaubigung " +"vorliegt\n" -#: g10/trustdb.c:2393 +#: g10/trustdb.c:2460 msgid "Valid user ID revocation\n" msgstr "GЭltiger User-ID-Widerruf\n" -#: g10/trustdb.c:2400 +#: g10/trustdb.c:2467 msgid "Invalid user ID revocation" msgstr "UngЭltiger User-ID-Widerruf" -#: g10/trustdb.c:2484 +#: g10/trustdb.c:2551 msgid "Too many preferences" msgstr "Zu viele Einstellungen" -#: g10/trustdb.c:2498 +#: g10/trustdb.c:2565 msgid "Too many preference items" msgstr "Zu viele Angaben zur Bevorzugung" -#: g10/trustdb.c:2637 +#: g10/trustdb.c:2704 msgid "Duplicated certificate - deleted" msgstr "Doppelte Zertifikate - entfernt" -#: g10/trustdb.c:2670 +#: g10/trustdb.c:2737 msgid "Hmmm, public key lost?" msgstr "Hmmm, Жffentlicher SchЭssel verloren?" -#: g10/trustdb.c:2680 g10/trustdb.c:2763 +#: g10/trustdb.c:2747 g10/trustdb.c:2830 msgid "Invalid certificate revocation" msgstr "UngЭltiger Zertifikatswiderruf" -#: g10/trustdb.c:2681 g10/trustdb.c:2764 +#: g10/trustdb.c:2748 g10/trustdb.c:2831 msgid "Invalid certificate" msgstr "UngЭltiges Zertifikat" -#: g10/trustdb.c:2696 +#: g10/trustdb.c:2763 #, c-format msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" -msgstr "uid %08lX.%lu/%02X%02X: hat \"shadow-dir\" %lu, aber ist noch nicht markiert.\n" +msgstr "" +"uid %08lX.%lu/%02X%02X: hat \"shadow-dir\" %lu, aber ist noch nicht " +"markiert.\n" -#: g10/trustdb.c:2710 +#: g10/trustdb.c:2777 #, c-format msgid "sig record %lu[%d] points to wrong record.\n" msgstr "Signatursatz %lu[%d] zeigt auf falschen Satz.\n" #. that should never happen -#: g10/trustdb.c:2954 +#: g10/trustdb.c:3021 #, c-format msgid "insert_trust_record: keyblock not found: %s\n" msgstr "insert_trust_record: SchlЭsselblock nicht gefunden: %s\n" -#: g10/trustdb.c:2972 +#: g10/trustdb.c:3039 msgid "did not use primary key for insert_trust_record()\n" msgstr "FЭr insert_trust_record() wurde nicht der HauptschlЭssel benutzt\n" @@ -2927,38 +2982,40 @@ msgstr "" "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren SchlЭssels fЭr " "sym.VerschlЭsselung nicht vermieden werden!\n" +# "It's up to you to assign a value here; this value will never be exported\n" +# "to any 3rd party. We need it to implement the web-of-trust; it has nothing\n" +# "to do with the (implicitly created) web-of-certificates." #. begin of list -#: g10/helptext.c:45 -#"It's up to you to assign a value here; this value will never be exported\n" -#"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n" -#"to do with the (implicitly created) web-of-certificates." +#: g10/helptext.c:48 msgid "edit_ownertrust.value" msgstr "" -"SIE mЭssen hier einen Wert eingeben. Dieser Wert wird niemals an eine Dritte\n" +"SIE mЭssen hier einen Wert eingeben. Dieser Wert wird niemals an eine " +"Dritte\n" "weitergegeben (exportiert) werden. Wir brauchen ihn zum Aufbau des\n" "\"web-of-trust\", Er hat nichts mit dem (stillschweigend aufgebautem)\n" "\"web-of-certificates\" zu tun." -#: g10/helptext.c:51 -#"If you want to use this revoked key anyway, answer \"yes\"." +# "If you want to use this revoked key anyway, answer \"yes\"." +#: g10/helptext.c:54 msgid "revoked_key.override" msgstr "" "Wenn Sie diesen widerrufenen SchlЭssel trotzdem benutzen wollen,\n" "so antworten Sie mit \"ja\" oder schweigen fЭr immer." -#: g10/helptext.c:55 -#"If you want to use this untrusted key anyway, answer \"yes\"." +# "If you want to use this untrusted key anyway, answer \"yes\"." +#: g10/helptext.c:58 msgid "untrusted_key.override" msgstr "" "Wenn Sie diesen nichtvertruenswЭrdigen SchlЭssel trotzdem benutzen wollen,\n" "so antworten Sie mit \"ja\" oder schweigen Sie fЭr immer." -#: g10/helptext.c:59 -#"Enter the user id of the addresse to whom you want to send the message." +# "Enter the user id of the addresse to whom you want to send the message." +#: g10/helptext.c:62 msgid "pklist.user_id.enter" -msgstr "Geben Sie die User-ID dessen ein, an den Sie die Botschaft senden wollen." +msgstr "" +"Geben Sie die User-ID dessen ein, an den Sie die Botschaft senden wollen." -#: g10/helptext.c:63 +#: g10/helptext.c:66 msgid "keygen.algo" msgstr "" "WДhlen Sie die zu verwendende Methode aus.\n" @@ -2988,8 +3045,39 @@ msgstr "" "SchlЭssel ist nicht mit anderen Programmen nach der OpenPGP-Spezifikation\n" "vertrДglich." -#: g10/helptext.c:80 -#"Enter the size of the key" +#: g10/helptext.c:82 +#, fuzzy +msgid "keygen.algo.elg_se" +msgstr "" +"WДhlen Sie die zu verwendende Methode aus.\n" +"DSA (alias DSS) bedeutet \"digital signature algorithm\" (Digitales\n" +" Unterschrift-Verfahren). Es kann nur zum Unterschreiben und Beglaubigen\n" +" benutzt werden. Dies ist das empfohlene Verfahren, da dessen эberprЭfung\n" +" wesentlich schneller ablДuft, als die von \"ElGamal\".\n" +"\n" +"ElGamal ist ein Verfahren fЭr Unterschrift, Beglaubigung und " +"VerschlЭsselung\n" +" OpenPGP unterscheidet zwischen zwei Arten von ElGamal: eines nur zum\n" +" Unterschreiben/Beglaubigen und eines zusДtzlich zum VerschlЭsseln.\n" +" Eigentlich sind diese Arten identisch; allerdings mЭssen einige Parameter\n" +" auf eine besondere Art gewДhlt werden, um einen sicheren SchlЭssel fЭr\n" +" Unterschriften zu erzeugen. Dieses Programm macht dies zwar so, aber " +"andere\n" +" Programme sind nach OpenPGP-Spezifikation nicht verpflichtet die zweite " +"Art\n" +" (die mit zusДtzlichem VerschlЭsseln) zu verstehen.\n" +"\n" +"Der HauptschlЭssel (\"primary Key\") muъ auf jeden Fall zum Unterschreiben " +"fДhig\n" +"sein. Deshalb kann ein Nur-VerschlЭssel-ElGamal-SchlЭssel dafЭr nicht\n" +"verwendet werden.\n" +"Auch sollte man \"ElGamal in einem v3-Paket\" nicht verwenden, denn solch " +"ein\n" +"SchlЭssel ist nicht mit anderen Programmen nach der OpenPGP-Spezifikation\n" +"vertrДglich." + +# "Enter the size of the key" +#: g10/helptext.c:89 msgid "keygen.size" msgstr "" "WДhlen Sie die gewЭnschte SchlЭssellДnge.\n" @@ -3003,45 +3091,46 @@ msgstr "" "Atlanta, Georgia, USA fЭr eine Limonandenfabrik arbeiten, und das Rezept\n" "speichern wollen (\"SCHLEMMER!\"), so wДren 2048 Bit kein schlechter Wert." -#: g10/helptext.c:84 -#"Answer \"yes\" or \"no\"" +# "Answer \"yes\" or \"no\"" +#: g10/helptext.c:93 msgid "keygen.size.huge.okay" msgstr "Geben Sie \"Ja\" oder \"Nein\" ein" -#: g10/helptext.c:89 +#: g10/helptext.c:98 msgid "keygen.size.large.okay" msgstr "Geben Sie \"Ja\" oder \"Nein\" ein" -#: g10/helptext.c:94 +#: g10/helptext.c:103 msgid "keygen.valid" msgstr "Geben Sie den erforderlichen Wert ein" -#: g10/helptext.c:98 +#: g10/helptext.c:107 msgid "keygen.valid.okay" msgstr "Geben Sie \"Ja\" oder \"Nein\" ein" -#: g10/helptext.c:103 # "Enter the name of the key holder" +#: g10/helptext.c:112 msgid "keygen.name" msgstr "Geben Sie den Namen des SchlЭsselinhabers ein" -#: g10/helptext.c:108 -#"please enter an optional but highly suggested email address" +# "please enter an optional but highly suggested email address" +#: g10/helptext.c:117 msgid "keygen.email" -msgstr "Geben Sie eine E-Mail-Adresse ein. Dies ist zwar nicht notwendig,\n" +msgstr "" +"Geben Sie eine E-Mail-Adresse ein. Dies ist zwar nicht notwendig,\n" "aber empfehlenswert." -#: g10/helptext.c:112 # "Please enter an optional comment" +#: g10/helptext.c:121 msgid "keygen.comment" msgstr "Geben Sie (bei Bedarf) einen Kommentar ein" -#: g10/helptext.c:117 -#"N to change the name.\n" -#"C to change the comment.\n" -#"E to change the email address.\n" -#"O to continue with key generation.\n" -#"Q to to quit the key generation." +# "N to change the name.\n" +# "C to change the comment.\n" +# "E to change the email address.\n" +# "O to continue with key generation.\n" +# "Q to to quit the key generation." +#: g10/helptext.c:126 msgid "keygen.userid.cmd" msgstr "" "N um den Namen zu Дndern.\n" @@ -3050,90 +3139,96 @@ msgstr "" "F um mit der SchlЭsselerzeugung fortzusetzen.\n" "B um die SchlЭsselerzeugung abbrechen." -#: g10/helptext.c:126 # "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." +#: g10/helptext.c:135 msgid "keygen.sub.okay" -msgstr "Geben Sie \"Ja\" (oder nur \"j\") ein, um den UnterschlЭssel zu erzeugen." +msgstr "" +"Geben Sie \"Ja\" (oder nur \"j\") ein, um den UnterschlЭssel zu erzeugen." -#: g10/helptext.c:130 # "Answer \"yes\" or \"no\"" +#: g10/helptext.c:139 msgid "sign_uid.okay" msgstr "Geben Sie \"Ja\" oder \"Nein\" ein" -#: g10/helptext.c:135 # "Answer \"yes\" or \"no\"" +#: g10/helptext.c:144 msgid "change_passwd.empty.okay" msgstr "Geben Sie \"Ja\" oder \"Nein\" ein" -#: g10/helptext.c:140 # "Please enter \"help\" to see the list of commands." +#: g10/helptext.c:149 msgid "keyedit.cmd" msgstr "Geben Sie \"help\" ein, um die Liste der Befehle einzusehen." -#: g10/helptext.c:144 # "Answer \"yes\" or \"no\"" +#: g10/helptext.c:153 msgid "keyedit.save.okay" msgstr "Geben Sie \"Ja\" oder \"Nein\" ein" -#: g10/helptext.c:149 +#: g10/helptext.c:158 msgid "keyedit.cancel.okay" msgstr "Geben Sie \"Ja\" oder \"Nein\" ein" -#: g10/helptext.c:153 # "Answer \"yes\" is you want to sign ALL the user IDs" +#: g10/helptext.c:162 msgid "keyedit.sign_all.okay" msgstr "Geben Sie \"Ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen" -#: g10/helptext.c:157 # "Answer \"yes\" if you really want to delete this user ID.\n" # "All ceritifcates are then also lost!" +#: g10/helptext.c:166 msgid "keyedit.remove.uid.okay" -msgstr "Geben Sie \"Ja\" (oder nur \"j\") ein, um diese User-ID zu LжSCHEN.\n" +msgstr "" +"Geben Sie \"Ja\" (oder nur \"j\") ein, um diese User-ID zu LжSCHEN.\n" "Alle Zertifikate werden dann auch weg sein!" -#: g10/helptext.c:162 # "Answer \"yes\" if it is okay to delete the subkey" +#: g10/helptext.c:171 msgid "keyedit.remove.subkey.okay" -msgstr "Geben Sie \"Ja\" (oder nur \"j\") ein, um diesen UnterschlЭssel zu lЖschen" +msgstr "" +"Geben Sie \"Ja\" (oder nur \"j\") ein, um diesen UnterschlЭssel zu lЖschen" # ################################ # ####### Help msgids ############ # ################################ -#: g10/helptext.c:166 +#: g10/helptext.c:175 msgid "passphrase.enter" msgstr "" "Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz, der aus\n" -"beliebigen Zeichen bestehen kann. Was Sie eingegeben wird nicht angezeigt.\n\n" +"beliebigen Zeichen bestehen kann. Was Sie eingegeben wird nicht angezeigt.\n" +"\n" "Zur ihrer eigenen Sicherbeit benutzen Sie bitte einen Satz, den sie sich\n" "gut merken kЖnne, der aber nicht leicht zu erraten ist; Zitate und andere\n" "bekannte Texte sind eine SCHLECHTE Wahl, da diese mit Sicherheit online\n" "verfЭgbar sind und durch entsprechende Programme zum Raten des Mantras\n" "benutzt werden. SДtze mit persЖnlicher Bedeutung, die auch noch durch\n" -"falsche Groъ-/Kleinschreibung und eingestreute Sonderzeichen verДndert werden,\n" +"falsche Groъ-/Kleinschreibung und eingestreute Sonderzeichen verДndert " +"werden,\n" "sind i.d.R. eine gute Wahl" -#: g10/helptext.c:173 +#: g10/helptext.c:182 msgid "passphrase.repeat" msgstr "" "Um sicher zu gehen, daъ Sie sich bei der Eingabe des Mantras nicht\n" "vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n" "Эbereinstimmen, wird das Mantra akzeptiert." -#: g10/helptext.c:177 # "Give the name fo the file to which the signature applies" +#: g10/helptext.c:186 msgid "detached_signature.filename" -msgstr "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift gehЖrt" +msgstr "" +"Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift gehЖrt" -#: g10/helptext.c:181 # "Answer \"yes\" if it is okay to overwrite the file" +#: g10/helptext.c:190 msgid "openfile.overwrite.okay" msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei Эberschreiben mЖchten" -#: g10/helptext.c:195 +#: g10/helptext.c:204 msgid "No help available" msgstr "Keine Hilfe vorhanden." -#: g10/helptext.c:207 +#: g10/helptext.c:216 #, c-format msgid "No help available for '%s'" msgstr "Keine Hilfe fЭr '%s' vorhanden." diff --git a/po/es_ES.po b/po/es_ES.po index d52e11c44..a7d8c279a 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ # I also got inspiration from it.po by Marco d'Itri msgid "" msgstr "" -"POT-Creation-Date: 1998-12-10 20:11+0100\n" +"POT-Creation-Date: 1998-12-17 18:30+0100\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-13 10:49:25+0100\n" "From: Urko Lusa \n" @@ -211,12 +211,12 @@ msgstr " msgid "you found a bug ... (%s:%d)\n" msgstr "Ha encontrado Vd. un bug... (%s:%d)\n" -#: cipher/random.c:412 +#: cipher/random.c:406 #, fuzzy msgid "WARNING: using insecure random number generator!!\n" msgstr "Aviso: ║se estА usando un generador de nЗmeros aleatorios inseguro!\n" -#: cipher/random.c:413 +#: cipher/random.c:407 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -230,7 +230,7 @@ msgstr "" "║NO USE NINGзN DATO GENERADO POR ESTE PROGRAMA!\n" "\n" -#: cipher/rndlinux.c:116 +#: cipher/rndlinux.c:118 #, c-format msgid "" "\n" @@ -242,7 +242,7 @@ msgstr "" "otro trabajo para que el sistema pueda recolectar mАs entropМa\n" "(se necesitan %d bytes mАs).\n" -#: g10/g10.c:159 +#: g10/g10.c:160 msgid "" "@Commands:\n" " " @@ -250,123 +250,123 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:162 +#: g10/g10.c:163 msgid "|[file]|make a signature" msgstr "|[file]|hace una firma" -#: g10/g10.c:163 +#: g10/g10.c:164 msgid "|[file]|make a clear text signature" msgstr "|[file]|hace una firma en texto claro" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "make a detached signature" msgstr "hace una firma separada" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encrypt data" msgstr "cifra datos" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "encryption only with symmetric cipher" msgstr "cifra sСlo con un cifrado simИtrico" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "store only" msgstr "sСlo almacenar" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "decrypt data (default)" msgstr "descifra datos (predefinido)" -#: g10/g10.c:169 +#: g10/g10.c:170 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys" msgstr "lista las claves" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "list keys and signatures" msgstr "lista las claves y firmas" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "check key signatures" msgstr "comprueba las firmas de las claves" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list keys and fingerprints" msgstr "lista las claves y huellas dactilares" -#: g10/g10.c:175 +#: g10/g10.c:176 msgid "list secret keys" msgstr "lista las claves secretas" -#: g10/g10.c:177 +#: g10/g10.c:178 msgid "generate a new key pair" msgstr "genera un nuevo par de claves" -#: g10/g10.c:179 +#: g10/g10.c:180 msgid "remove key from the public keyring" msgstr "elimina la clave del anillo pЗblico" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "sign or edit a key" msgstr "firma o modifica una clave" -#: g10/g10.c:182 +#: g10/g10.c:183 msgid "generate a revocation certificate" msgstr "genera un certificado de revocaciСn" -#: g10/g10.c:184 +#: g10/g10.c:185 msgid "export keys" msgstr "exporta las claves" -#: g10/g10.c:187 +#: g10/g10.c:188 msgid "import/merge keys" msgstr "importa/fusiona las claves" -#: g10/g10.c:189 +#: g10/g10.c:190 msgid "list only the sequence of packets" msgstr "lista sСlo la secuencia de paquetes" -#: g10/g10.c:192 +#: g10/g10.c:193 msgid "export the ownertrust values" msgstr "exporta los valores de confianza" -#: g10/g10.c:194 +#: g10/g10.c:195 msgid "import ownertrust values" msgstr "importa los valores de confianza" -#: g10/g10.c:196 +#: g10/g10.c:197 msgid "|[NAMES]|update the trust database" msgstr "|[NOMBRES]|actualiza la base de datos de confianza" -#: g10/g10.c:198 +#: g10/g10.c:199 msgid "|[NAMES]|check the trust database" msgstr "|[NOMBRES]|comprueba la base de datos de confianza" -#: g10/g10.c:199 +#: g10/g10.c:200 msgid "fix a corrupted trust database" msgstr "arregla una base de datos de confianza daЯada" -#: g10/g10.c:200 +#: g10/g10.c:201 msgid "De-Armor a file or stdin" msgstr "quita la armadura de un fichero o stdin" -#: g10/g10.c:201 +#: g10/g10.c:202 msgid "En-Armor a file or stdin" msgstr "crea la armadura a un fichero o stdin" -#: g10/g10.c:202 +#: g10/g10.c:203 msgid "|algo [files]|print message digests" msgstr "|algo [files]|imprime resЗmenes de mensaje" -#: g10/g10.c:203 +#: g10/g10.c:204 msgid "print all message digests" msgstr "imprime todos los resЗmenes de mensaje" -#: g10/g10.c:210 +#: g10/g10.c:211 msgid "" "@\n" "Options:\n" @@ -376,145 +376,145 @@ msgstr "" "Opciones:\n" " " -#: g10/g10.c:212 +#: g10/g10.c:213 msgid "create ascii armored output" msgstr "crea una salida ascii con armadura" -#: g10/g10.c:214 +#: g10/g10.c:215 msgid "use this user-id to sign or decrypt" msgstr "usa este usuario para firmar o descifrar" -#: g10/g10.c:215 +#: g10/g10.c:216 msgid "use this user-id for encryption" msgstr "usa este usuario para cifrar" -#: g10/g10.c:216 +#: g10/g10.c:217 msgid "|N|set compress level N (0 disables)" msgstr "|N|establece nivel de compresiСn N (0 no comprime)" -#: g10/g10.c:218 +#: g10/g10.c:219 msgid "use canonical text mode" msgstr "usa modo de texto canСnico" -#: g10/g10.c:220 +#: g10/g10.c:221 msgid "use as output file" msgstr "usa como fichero de salida" -#: g10/g10.c:221 +#: g10/g10.c:222 msgid "verbose" msgstr "prolijo" -#: g10/g10.c:222 +#: g10/g10.c:223 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:223 +#: g10/g10.c:224 msgid "force v3 signatures" msgstr "fuerza firmas v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:225 +#: g10/g10.c:226 msgid "batch mode: never ask" msgstr "proceso por lotes: nunca preguntar" -#: g10/g10.c:226 +#: g10/g10.c:227 msgid "assume yes on most questions" msgstr "asume \"sМ\" en casi todas las preguntas" -#: g10/g10.c:227 +#: g10/g10.c:228 msgid "assume no on most questions" msgstr "asume \"no\" en casi todas las preguntas" -#: g10/g10.c:228 +#: g10/g10.c:229 msgid "add this keyring to the list of keyrings" msgstr "aЯade este anillo a la lista de anillos" -#: g10/g10.c:229 +#: g10/g10.c:230 msgid "add this secret keyring to the list" msgstr "aЯade este anillo secreto a la lista" -#: g10/g10.c:230 +#: g10/g10.c:231 msgid "|NAME|use NAME as default secret key" msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" -#: g10/g10.c:231 +#: g10/g10.c:232 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE" -#: g10/g10.c:232 +#: g10/g10.c:233 msgid "read options from file" msgstr "lee opciones del fichero" -#: g10/g10.c:234 +#: g10/g10.c:235 msgid "set debugging flags" msgstr "establece los parАmetros de depuraciСn" -#: g10/g10.c:235 +#: g10/g10.c:236 msgid "enable full debugging" msgstr "habilita depuraciСn completa" -#: g10/g10.c:236 +#: g10/g10.c:237 msgid "|FD|write status info to this FD" msgstr "|DF|escribe informaciСn de estado en descriptor DF" -#: g10/g10.c:237 +#: g10/g10.c:238 msgid "do not write comment packets" msgstr "no escribe paquetes de comentario" -#: g10/g10.c:238 +#: g10/g10.c:239 msgid "(default is 1)" msgstr "(por defecto es 1)" -#: g10/g10.c:239 +#: g10/g10.c:240 msgid "(default is 3)" msgstr "(por defecto es 3)" -#: g10/g10.c:241 +#: g10/g10.c:242 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:242 +#: g10/g10.c:243 msgid "|FILE|load extension module FILE" msgstr "|FICHERO|carga mСdulo de extensiones FICHERO" -#: g10/g10.c:243 +#: g10/g10.c:244 msgid "emulate the mode described in RFC1991" msgstr "emula el modo descrito en la RFC1991" -#: g10/g10.c:244 +#: g10/g10.c:245 msgid "|N|use passphrase mode N" msgstr "|N|usa modo de contraseЯa N" -#: g10/g10.c:246 +#: g10/g10.c:247 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:248 +#: g10/g10.c:249 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n" "contraseЯas" -#: g10/g10.c:250 +#: g10/g10.c:251 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE" -#: g10/g10.c:251 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE" -#: g10/g10.c:252 +#: g10/g10.c:253 msgid "|N|use compress algorithm N" msgstr "|N|usa el algoritmo de compresiСn N" -#: g10/g10.c:253 +#: g10/g10.c:254 msgid "throw keyid field of encrypted packets" msgstr "elimina el campo keyid de los paquetes cifrados" -#: g10/g10.c:261 +#: g10/g10.c:262 msgid "" "@\n" "Examples:\n" @@ -534,19 +534,19 @@ msgstr "" " --list-keys [nombres] muestra las claves\n" " --fingerprint [nombres] muestra las huellas dactilares\n" -#: g10/g10.c:339 +#: g10/g10.c:341 msgid "Please report bugs to .\n" msgstr "Por favor, informe de posibles \"bugs\" a .\n" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:346 +#: g10/g10.c:348 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:351 +#: g10/g10.c:353 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -554,7 +554,7 @@ msgstr "" "Sintaxis: gpgm [opciones] [ficheros]\n" "Utilidad de mantenimiento de GnuPG\n" -#: g10/g10.c:354 +#: g10/g10.c:356 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -564,7 +564,7 @@ msgstr "" "firma, comprueba, cifra o descifra\n" "la operaciСn por defecto depende del tipo de datos de entrada\n" -#: g10/g10.c:360 +#: g10/g10.c:362 msgid "" "\n" "Supported algorithms:\n" @@ -572,151 +572,151 @@ msgstr "" "\n" "Algoritmos soportados:\n" -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpgm [options] " msgstr "uso: gpgm [opciones] " -#: g10/g10.c:437 +#: g10/g10.c:439 msgid "usage: gpg [options] " msgstr "uso: gpg [opciones] " -#: g10/g10.c:478 +#: g10/g10.c:480 msgid "conflicting commands\n" msgstr "comandos incompatibles\n" -#: g10/g10.c:616 +#: g10/g10.c:618 #, fuzzy, c-format msgid "NOTE: no default option file '%s'\n" msgstr "nota: no existe fichero de opciones predefinido '%s'\n" -#: g10/g10.c:620 +#: g10/g10.c:622 #, c-format msgid "option file '%s': %s\n" msgstr "fichero de opciones '%s': %s\n" -#: g10/g10.c:627 +#: g10/g10.c:629 #, c-format msgid "reading options from '%s'\n" msgstr "leyendo opciones desde '%s'\n" -#: g10/g10.c:776 +#: g10/g10.c:782 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "Caracter no vАlido en el comentario\n" -#: g10/g10.c:810 g10/g10.c:822 +#: g10/g10.c:817 g10/g10.c:829 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifra seleccionado no es vАlido\n" -#: g10/g10.c:816 g10/g10.c:828 +#: g10/g10.c:823 g10/g10.c:835 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no es vАlido\n" -#: g10/g10.c:831 +#: g10/g10.c:838 #, 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:833 +#: g10/g10.c:840 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:835 +#: g10/g10.c:842 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:837 +#: g10/g10.c:844 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:840 +#: g10/g10.c:847 #, fuzzy 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:844 +#: g10/g10.c:851 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:927 +#: g10/g10.c:934 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicializaciСn de la base de datos de confianza '%s' fallida\n" -#: g10/g10.c:933 +#: g10/g10.c:940 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:941 +#: g10/g10.c:948 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:949 +#: g10/g10.c:956 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:962 +#: g10/g10.c:969 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:975 +#: g10/g10.c:982 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:989 +#: g10/g10.c:996 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:1001 +#: g10/g10.c:1008 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:1010 +#: g10/g10.c:1017 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key nombre_usuario" -#: g10/g10.c:1026 +#: g10/g10.c:1033 msgid "--delete-secret-key username" msgstr "--delete-secret-key nombre_usuario" -#: g10/g10.c:1029 +#: g10/g10.c:1036 msgid "--delete-key username" msgstr "--delete-key nombre_usuario" -#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "no puede abrirse '%s': %s\n" -#: g10/g10.c:1063 +#: g10/g10.c:1070 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [id_usuario] [anillo]" -#: g10/g10.c:1120 +#: g10/g10.c:1127 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminaciСn de armadura fallida: %s\n" -#: g10/g10.c:1128 +#: g10/g10.c:1135 #, c-format msgid "enarmoring failed: %s\n" msgstr "creaciСn de armadura fallida: %s\n" -#: g10/g10.c:1194 +#: g10/g10.c:1201 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "algoritmo de distribuciСn no vАlido '%s'\n" -#: g10/g10.c:1273 +#: g10/g10.c:1280 msgid "[filename]" msgstr "[nombre_fichero]" -#: g10/g10.c:1277 +#: g10/g10.c:1284 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "no puede abrirse '%s'\n" @@ -780,7 +780,7 @@ msgstr "" msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "RFC1991 no vАlida o datos OpenPGP no encontrados\n" -#: g10/pkclist.c:121 +#: g10/pkclist.c:138 #, fuzzy, c-format msgid "" "No trust value assigned to %lu:\n" @@ -789,7 +789,7 @@ msgstr "" "No hay confianza definida para el propietario %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:131 +#: g10/pkclist.c:148 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -811,24 +811,29 @@ msgstr "" " 4 = Me fМo completamente\n" " i = Mostrar mАs informaciСn\n" -#: g10/pkclist.c:140 +#: g10/pkclist.c:157 msgid " m = back to the main menu\n" msgstr " m = volver al menЗ principal\n" -#. a string with valid answers -#: g10/pkclist.c:145 -msgid "sSmM" -msgstr "iImM" +#: g10/pkclist.c:159 +msgid " q = quit\n" +msgstr "" -#: g10/pkclist.c:149 +#. a string with valid answers +#: g10/pkclist.c:164 +#, fuzzy +msgid "sSmMqQ" +msgstr "iImMqQ" + +#: g10/pkclist.c:168 msgid "Your decision? " msgstr "Su decisiСn: " -#: g10/pkclist.c:169 +#: g10/pkclist.c:188 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:197 +#: g10/pkclist.c:221 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" @@ -838,19 +843,19 @@ msgstr "" "si es posible asignar algunos valores de confianza perdidos.\n" "\n" -#: g10/pkclist.c:219 +#: g10/pkclist.c:251 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" -#: g10/pkclist.c:221 +#: g10/pkclist.c:253 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "" -#: g10/pkclist.c:223 +#: g10/pkclist.c:255 #, fuzzy msgid "" "No trust values changed.\n" @@ -859,46 +864,46 @@ msgstr "" "No se cambiС ningЗn valor de confianza.\n" "\n" -#: g10/pkclist.c:238 +#: g10/pkclist.c:270 #, fuzzy, c-format msgid "key %08lX: key has been revoked!\n" msgstr "clave %08lX: aceptada como clave secreta.\n" -#: g10/pkclist.c:244 g10/pkclist.c:335 +#: g10/pkclist.c:276 g10/pkclist.c:369 msgid "Use this key anyway? " msgstr "©Usar esta clave de todas formas? " -#: g10/pkclist.c:266 +#: g10/pkclist.c:298 #, fuzzy, c-format msgid "%08lX: key has expired\n" msgstr "Nota: ║Esta clave estА caducada!\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:304 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" -#: g10/pkclist.c:288 +#: g10/pkclist.c:322 #, fuzzy, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "ATENCIсN: ║Esta firma NO es de confianza!\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:328 #, 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:300 +#: g10/pkclist.c:334 msgid "This key probably belongs to the owner\n" msgstr "" -#: g10/pkclist.c:305 +#: g10/pkclist.c:339 msgid "This key belongs to us\n" msgstr "" -#: g10/pkclist.c:330 +#: g10/pkclist.c:364 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" @@ -910,51 +915,51 @@ msgstr "" "\"sМ\" a la siguiente pregunta.\n" "\n" -#: g10/pkclist.c:339 +#: g10/pkclist.c:373 msgid "WARNING: Using untrusted key!\n" msgstr "ATENCIсN: ║Usando una clave no fiable!\n" -#: g10/pkclist.c:375 +#: g10/pkclist.c:409 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:376 +#: g10/pkclist.c:410 msgid " This could mean that the signature is forgery.\n" msgstr " Esto puede significar que la firma estА falsificada.\n" -#: g10/pkclist.c:397 +#: g10/pkclist.c:431 msgid "Note: This key has expired!\n" msgstr "Nota: ║Esta clave estА caducada!\n" -#: g10/pkclist.c:404 +#: g10/pkclist.c:438 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:406 +#: g10/pkclist.c:440 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:421 +#: g10/pkclist.c:456 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATENCIсN: ║Esta firma NO es de confianza!\n" -#: g10/pkclist.c:422 +#: g10/pkclist.c:457 msgid " The signature is probably a FORGERY.\n" msgstr " La firma es probablemente una FALSIFICACIсN.\n" -#: g10/pkclist.c:429 +#: g10/pkclist.c:464 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "AVISO: ║Esta clave no estА certificada con suficientes firmas de confianza!\n" -#: g10/pkclist.c:432 +#: g10/pkclist.c:467 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:477 +#: g10/pkclist.c:512 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -962,25 +967,25 @@ msgstr "" "No se ha especificado un ID de usuario (puede usar \"-r\")\n" "\n" -#: g10/pkclist.c:482 +#: g10/pkclist.c:517 msgid "Enter the user ID: " msgstr "Introduzca el ID de usuario: " -#: g10/pkclist.c:493 +#: g10/pkclist.c:528 msgid "No such user ID.\n" msgstr "ID de usuario inexistente.\n" -#: g10/pkclist.c:527 g10/pkclist.c:554 +#: g10/pkclist.c:562 g10/pkclist.c:589 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:535 +#: g10/pkclist.c:570 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: error comprobando la clave: %s\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:596 msgid "no valid addressees\n" msgstr "no hay direcciones vАlidas\n" @@ -1341,7 +1346,7 @@ msgstr "" msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n" -#: g10/import.c:129 g10/trustdb.c:1166 +#: g10/import.c:129 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "no puede abrirse el fichero: %s\n" @@ -1351,12 +1356,12 @@ msgstr "no puede abrirse el fichero: %s\n" msgid "skipping block of type %d\n" msgstr "ignorando bloque de tipo %d\n" -#: g10/import.c:152 g10/trustdb.c:1425 g10/trustdb.c:1494 +#: g10/import.c:152 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" msgstr "" -#: g10/import.c:157 g10/trustdb.c:1242 +#: g10/import.c:157 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "error de lectura: %s\n" @@ -1439,7 +1444,7 @@ msgstr "clave %08lX: clave p msgid "no default public keyring\n" msgstr "no hay anillo pЗblico por defecto\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:569 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #, c-format msgid "writing to '%s'\n" msgstr "escribiendo en '%s'\n" @@ -2089,6 +2094,11 @@ msgstr "" msgid "can't handle public key algorithm %d\n" msgstr "no puede bloquearse el anillo pЗblico: %s\n" +#: g10/parse-packet.c:801 +#, c-format +msgid "subpacket of type %d has critical bit set\n" +msgstr "" + #: g10/passphrase.c:141 msgid "" "\n" @@ -2114,19 +2124,19 @@ msgstr "Introduzca contrase msgid "Repeat passphrase: " msgstr "Repita contraseЯa: " -#: g10/plaintext.c:102 +#: g10/plaintext.c:103 msgid "data not saved; use option \"--output\" to save it\n" msgstr "datos no grabados; use la opciСn \"--output\" para grabarlos\n" -#: g10/plaintext.c:215 +#: g10/plaintext.c:216 msgid "Please enter name of data file: " msgstr "Introduzca el nombre del fichero de datos: " -#: g10/plaintext.c:236 +#: g10/plaintext.c:237 msgid "reading stdin ...\n" msgstr "" -#: g10/plaintext.c:299 +#: g10/plaintext.c:300 #, c-format msgid "can't open signed data '%s'\n" msgstr "imposible abrir datos firmados '%s'\n" @@ -2182,12 +2192,16 @@ msgstr "" msgid "NOTE: signature key expired %s\n" msgstr "atenciСn: firma de la clave caducada el %s\n" +#: g10/sig-check.c:226 +msgid "assuming bad signature due to an unknown critical bit\n" +msgstr "" + #: g10/sign.c:69 #, fuzzy, c-format msgid "%s signature from: %s\n" msgstr "Firma INCORRECTA de \"" -#: g10/sign.c:200 g10/sign.c:564 +#: g10/sign.c:200 g10/sign.c:587 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "no puede abrirse '%s': %s\n" @@ -2326,540 +2340,540 @@ msgstr "" msgid "%s: failed to append a record: %s\n" msgstr "" -#: g10/trustdb.c:134 +#: g10/trustdb.c:142 msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n" msgstr "" "La base de datos de confianza estА daЯada. Por favor, ejecute\n" "\"gpgm --fix-trust-db\".\n" -#: g10/trustdb.c:147 +#: g10/trustdb.c:155 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" msgstr "" -#: g10/trustdb.c:162 +#: g10/trustdb.c:170 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" msgstr "" -#: g10/trustdb.c:176 +#: g10/trustdb.c:184 #, fuzzy, c-format msgid "trust record %lu: delete failed: %s\n" msgstr "actualizaciСn de la clave secreta fallida: %s\n" -#: g10/trustdb.c:190 +#: g10/trustdb.c:198 #, fuzzy, c-format msgid "trust db: sync failed: %s\n" msgstr "actualizaciСn de confianza fallida: %s\n" -#: g10/trustdb.c:319 +#: g10/trustdb.c:327 #, c-format msgid "error reading dir record for LID %lu: %s\n" msgstr "" -#: g10/trustdb.c:326 +#: g10/trustdb.c:334 #, c-format msgid "lid %lu: expected dir record, got type %d\n" msgstr "" -#: g10/trustdb.c:331 +#: g10/trustdb.c:339 #, c-format msgid "no primary key for LID %lu\n" msgstr "" -#: g10/trustdb.c:336 +#: g10/trustdb.c:344 #, fuzzy, c-format msgid "error reading primary key for LID %lu: %s\n" msgstr "error creando contraseЯa: %s\n" -#: g10/trustdb.c:412 +#: g10/trustdb.c:420 #, c-format msgid "chained sigrec %lu has a wrong owner\n" msgstr "" -#: g10/trustdb.c:455 +#: g10/trustdb.c:463 #, fuzzy, c-format msgid "'%s' is not a valid long keyID\n" msgstr "Caracter no vАlido en el comentario\n" -#: g10/trustdb.c:490 +#: g10/trustdb.c:498 #, fuzzy, c-format msgid "key %08lX: no public key for trusted key - skipped\n" msgstr "clave %08lX: clave secreta sin clave pЗblica - ignorada\n" -#: g10/trustdb.c:499 g10/trustdb.c:557 +#: g10/trustdb.c:507 g10/trustdb.c:565 #, c-format msgid "key %08lX: can't put it into the trustdb\n" msgstr "clave %08lX: imposible incluirla en la base de datos de confianza\n" -#: g10/trustdb.c:504 g10/trustdb.c:563 +#: g10/trustdb.c:512 g10/trustdb.c:571 #, c-format msgid "key %08lX: query record failed\n" msgstr "clave %08lX: peticiСn de registro fallida\n" -#: g10/trustdb.c:509 g10/trustdb.c:572 +#: g10/trustdb.c:517 g10/trustdb.c:580 #, fuzzy, c-format msgid "key %08lX: already in trusted key table\n" msgstr "clave %08lX: ya estА en la tabla secreta\n" -#: g10/trustdb.c:512 g10/trustdb.c:575 +#: g10/trustdb.c:520 g10/trustdb.c:583 #, fuzzy, c-format msgid "key %08lX: accepted as trusted key.\n" msgstr "clave %08lX: aceptada como clave secreta.\n" -#: g10/trustdb.c:528 +#: g10/trustdb.c:536 #, fuzzy, c-format msgid "NOTE: secret key %08lX is NOT protected.\n" msgstr "Esta clave no estА protegida.\n" -#: g10/trustdb.c:540 +#: g10/trustdb.c:548 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "clave %08lX: clave secreta sin clave pЗblica - ignorada\n" -#: g10/trustdb.c:547 +#: g10/trustdb.c:555 #, c-format msgid "key %08lX: secret and public key don't match\n" msgstr "clave %08lX: las claves pЗblica y secreta no se corresponden\n" -#: g10/trustdb.c:583 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "enumerate secret keys failed: %s\n" msgstr "enum_secret_keys fallido: %s\n" -#: g10/trustdb.c:766 +#: g10/trustdb.c:774 #, fuzzy, c-format msgid "lid %lu: read dir record failed: %s\n" msgstr "clave %08lX: inserciСn del registro de confianza fallida: %s\n" -#: g10/trustdb.c:775 +#: g10/trustdb.c:783 #, fuzzy, c-format msgid "lid %lu: read key record failed: %s\n" msgstr "clave %08lX: inserciСn del registro de confianza fallida: %s\n" -#: g10/trustdb.c:785 +#: g10/trustdb.c:793 #, fuzzy, c-format msgid "lid %lu: read uid record failed: %s\n" msgstr "clave %08lX: inserciСn del registro de confianza fallida: %s\n" -#: g10/trustdb.c:794 +#: g10/trustdb.c:802 #, fuzzy, c-format msgid "lid %lu: read pref record failed: %s\n" msgstr "clave %08lX: inserciСn del registro de confianza fallida: %s\n" -#: g10/trustdb.c:804 +#: g10/trustdb.c:812 #, fuzzy, c-format msgid "lid %lu: read sig record failed: %s\n" msgstr "clave %08lX: inserciСn del registro de confianza fallida: %s\n" -#: g10/trustdb.c:999 +#: g10/trustdb.c:1013 msgid "Ooops, no keys\n" msgstr "" -#: g10/trustdb.c:1003 +#: g10/trustdb.c:1017 #, fuzzy msgid "Ooops, no user ids\n" msgstr "lista clave e identificativos de usuario" -#: g10/trustdb.c:1074 g10/trustdb.c:1092 +#: g10/trustdb.c:1088 g10/trustdb.c:1106 #, c-format msgid "user '%s' read problem: %s\n" msgstr "" -#: g10/trustdb.c:1077 g10/trustdb.c:1095 +#: g10/trustdb.c:1091 g10/trustdb.c:1109 #, c-format msgid "user '%s' list problem: %s\n" msgstr "" -#: g10/trustdb.c:1085 g10/trustdb.c:1300 +#: g10/trustdb.c:1099 g10/trustdb.c:1346 #, fuzzy, c-format msgid "user '%s' not found: %s\n" msgstr "%s: usuario no encontrado\n" -#: g10/trustdb.c:1087 g10/trustdb.c:1302 +#: g10/trustdb.c:1101 g10/trustdb.c:1348 #, c-format msgid "problem finding '%s' in trustdb: %s\n" msgstr "" -#: g10/trustdb.c:1090 +#: g10/trustdb.c:1104 #, c-format msgid "user '%s' not in trustdb\n" msgstr "" -#: g10/trustdb.c:1125 +#: g10/trustdb.c:1139 #, c-format msgid "" "# List of assigned trustvalues, created %s\n" "# (Use \"gpgm --import-ownertrust\" to restore them)\n" msgstr "" -#: g10/trustdb.c:1131 +#: g10/trustdb.c:1145 msgid "directory record w/o primary key\n" msgstr "" -#: g10/trustdb.c:1138 +#: g10/trustdb.c:1152 #, fuzzy, c-format msgid "error reading key record: %s\n" msgstr "%s: error comprobando la clave: %s\n" -#: g10/trustdb.c:1178 +#: g10/trustdb.c:1192 msgid "line too long\n" msgstr "" -#: g10/trustdb.c:1186 +#: g10/trustdb.c:1200 msgid "error: missing colon\n" msgstr "" -#: g10/trustdb.c:1191 +#: g10/trustdb.c:1205 #, fuzzy msgid "error: invalid fingerprint\n" msgstr "muestra huella digital" -#: g10/trustdb.c:1195 +#: g10/trustdb.c:1209 #, fuzzy msgid "error: no ownertrust value\n" msgstr "exporta los valores de confianza" -#: g10/trustdb.c:1209 +#: g10/trustdb.c:1223 #, c-format msgid "LID %lu: changing trust from %u to %u\n" msgstr "" -#: g10/trustdb.c:1212 +#: g10/trustdb.c:1226 #, c-format msgid "LID %lu: setting trust to %u\n" msgstr "" -#: g10/trustdb.c:1220 +#: g10/trustdb.c:1234 msgid "key not in trustdb, searching ring.\n" msgstr "" -#: g10/trustdb.c:1223 +#: g10/trustdb.c:1237 #, fuzzy, c-format msgid "key not in ring: %s\n" msgstr "no puede escribirse el anillo: %s\n" -#: g10/trustdb.c:1227 +#: g10/trustdb.c:1241 msgid "Oops: key is now in trustdb???\n" msgstr "" #. update the ownertrust -#: g10/trustdb.c:1232 +#: g10/trustdb.c:1246 #, fuzzy, c-format msgid "insert trust record failed: %s\n" msgstr "clave %08lX: inserciСn del registro de confianza fallida: %s\n" #. error -#: g10/trustdb.c:1238 +#: g10/trustdb.c:1252 #, fuzzy, c-format msgid "error finding dir record: %s\n" msgstr "eliminaciСn de armadura fallida: %s\n" -#: g10/trustdb.c:1305 +#: g10/trustdb.c:1351 #, c-format msgid "user '%s' not in trustdb - inserting\n" msgstr "" -#: g10/trustdb.c:1308 +#: g10/trustdb.c:1354 #, fuzzy, c-format msgid "failed to put '%s' into trustdb: %s\n" msgstr "inicializaciСn de la base de datos de confianza '%s' fallida\n" -#: g10/trustdb.c:1355 +#: g10/trustdb.c:1404 #, c-format msgid "%s: keyblock read problem: %s\n" msgstr "" -#: g10/trustdb.c:1369 +#: g10/trustdb.c:1418 #, fuzzy, c-format msgid "%s: update failed: %s\n" msgstr "actualizaciСn fallida: %s\n" -#: g10/trustdb.c:1372 +#: g10/trustdb.c:1421 #, c-format msgid "%s: updated\n" msgstr "" -#: g10/trustdb.c:1374 +#: g10/trustdb.c:1423 #, c-format msgid "%s: okay\n" msgstr "" -#: g10/trustdb.c:1389 +#: g10/trustdb.c:1438 #, c-format msgid "lid %lu: dir record w/o key - skipped\n" msgstr "" -#: g10/trustdb.c:1402 +#: g10/trustdb.c:1451 #, fuzzy, c-format msgid "lid %lu: keyblock not found: %s\n" msgstr "clave %08lX: clave pЗblica no encontrada: %s\n" -#: g10/trustdb.c:1411 g10/trustdb.c:1480 +#: g10/trustdb.c:1460 g10/trustdb.c:1529 #, fuzzy, c-format msgid "lid %lu: update failed: %s\n" msgstr "actualizaciСn fallida: %s\n" -#: g10/trustdb.c:1417 g10/trustdb.c:1486 +#: g10/trustdb.c:1466 g10/trustdb.c:1535 #, c-format msgid "lid %lu: updated\n" msgstr "" -#: g10/trustdb.c:1421 g10/trustdb.c:1490 +#: g10/trustdb.c:1470 g10/trustdb.c:1539 #, c-format msgid "lid %lu: okay\n" msgstr "" -#: g10/trustdb.c:1428 g10/trustdb.c:1496 +#: g10/trustdb.c:1477 g10/trustdb.c:1545 #, c-format msgid "%lu keys processed\n" msgstr "" -#: g10/trustdb.c:1430 +#: g10/trustdb.c:1479 #, fuzzy, c-format msgid "\t%lu keys skipped\n" msgstr "%s: ignorado: %s\n" -#: g10/trustdb.c:1432 g10/trustdb.c:1498 +#: g10/trustdb.c:1481 g10/trustdb.c:1547 #, fuzzy, c-format msgid "\t%lu keys with errors\n" msgstr "Error de escritura" -#: g10/trustdb.c:1434 g10/trustdb.c:1500 +#: g10/trustdb.c:1483 g10/trustdb.c:1549 #, c-format msgid "\t%lu keys updated\n" msgstr "" -#: g10/trustdb.c:1464 +#: g10/trustdb.c:1513 #, fuzzy, c-format msgid "lid ?: insert failed: %s\n" msgstr "actualizaciСn de la clave secreta fallida: %s\n" -#: g10/trustdb.c:1469 +#: g10/trustdb.c:1518 #, fuzzy, c-format msgid "lid %lu: insert failed: %s\n" msgstr "actualizaciСn de la clave secreta fallida: %s\n" -#: g10/trustdb.c:1475 +#: g10/trustdb.c:1524 #, c-format msgid "lid %lu: inserted\n" msgstr "" -#: g10/trustdb.c:1502 +#: g10/trustdb.c:1551 #, c-format msgid "\t%lu keys inserted\n" msgstr "" -#: g10/trustdb.c:1505 +#: g10/trustdb.c:1554 #, fuzzy, c-format msgid "enumerate keyblocks failed: %s\n" msgstr "enum_secret_keys fallido: %s\n" -#: g10/trustdb.c:1550 +#: g10/trustdb.c:1599 #, fuzzy, c-format msgid "check_trust: search dir record failed: %s\n" msgstr "clave %08lX: inserciСn del registro de confianza fallida: %s\n" -#: g10/trustdb.c:1557 +#: g10/trustdb.c:1606 #, c-format msgid "key %08lX: insert trust record failed: %s\n" msgstr "clave %08lX: inserciСn del registro de confianza fallida: %s\n" -#: g10/trustdb.c:1561 +#: g10/trustdb.c:1610 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" msgstr "clave %08lX.%lu: incluida en la base de datos de confianza\n" -#: g10/trustdb.c:1569 +#: g10/trustdb.c:1618 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "" "clave %08lX.%lu: creada en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/trustdb.c:1576 +#: g10/trustdb.c:1625 #, c-format msgid "key %08lX.%lu: expired at %s\n" msgstr "clave %08lX.%lu: caducada el %s\n" -#: g10/trustdb.c:1584 +#: g10/trustdb.c:1633 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" msgstr "clave %08lX.%lu: comprobaciСn de confianza fallida: %s\n" -#: g10/trustdb.c:1753 g10/trustdb.c:1782 g10/trustdb.c:2521 +#: g10/trustdb.c:1820 g10/trustdb.c:1849 g10/trustdb.c:2588 msgid "WARNING: can't yet handle long pref records\n" msgstr "" -#: g10/trustdb.c:1804 +#: g10/trustdb.c:1871 #, fuzzy, c-format msgid "get_dir_record: search_record failed: %s\n" msgstr "actualizaciСn de la clave secreta fallida: %s\n" -#: g10/trustdb.c:1867 +#: g10/trustdb.c:1934 #, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" msgstr "" -#: g10/trustdb.c:1871 +#: g10/trustdb.c:1938 #, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n" msgstr "" #. we need the dir record -#: g10/trustdb.c:1878 +#: g10/trustdb.c:1945 #, c-format msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n" msgstr "" -#: g10/trustdb.c:1884 +#: g10/trustdb.c:1951 #, c-format msgid "lid %lu: no primary key\n" msgstr "" -#: g10/trustdb.c:1917 +#: g10/trustdb.c:1984 #, c-format msgid "lid %lu: user id not found in keyblock\n" msgstr "" -#: g10/trustdb.c:1921 +#: g10/trustdb.c:1988 #, fuzzy, c-format msgid "lid %lu: user id without signature\n" msgstr "clave %08lX: no hay id de usuario para la firma\n" -#: g10/trustdb.c:1928 +#: g10/trustdb.c:1995 #, c-format msgid "lid %lu: self-signature in hintlist\n" msgstr "" -#: g10/trustdb.c:1939 g10/trustdb.c:2658 g10/trustdb.c:2742 +#: g10/trustdb.c:2006 g10/trustdb.c:2725 g10/trustdb.c:2809 #, fuzzy msgid "Valid certificate revocation" msgstr "Certificado incorrecto" -#: g10/trustdb.c:1940 g10/trustdb.c:2659 g10/trustdb.c:2743 +#: g10/trustdb.c:2007 g10/trustdb.c:2726 g10/trustdb.c:2810 #, fuzzy msgid "Good certificate" msgstr "Certificado incorrecto" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:2016 msgid "very strange: no public key\n" msgstr "" -#: g10/trustdb.c:1997 +#: g10/trustdb.c:2064 #, c-format msgid "hintlist %lu[%d] of %lu does not point to a dir record\n" msgstr "" -#: g10/trustdb.c:2003 +#: g10/trustdb.c:2070 #, c-format msgid "lid %lu does not have a key\n" msgstr "" -#: g10/trustdb.c:2013 +#: g10/trustdb.c:2080 #, c-format msgid "lid %lu: can't get keyblock: %s\n" msgstr "" -#: g10/trustdb.c:2070 g10/trustdb.c:2984 +#: g10/trustdb.c:2137 g10/trustdb.c:3051 #, fuzzy, c-format msgid "tdbio_search_dir failed: %s\n" msgstr "eliminaciСn de armadura fallida: %s\n" -#: g10/trustdb.c:2223 +#: g10/trustdb.c:2290 #, fuzzy, c-format msgid "key %08lX.%lu: Good subkey binding\n" msgstr "clave %08lX: no hay id de usuario\n" -#: g10/trustdb.c:2229 g10/trustdb.c:2271 +#: g10/trustdb.c:2296 g10/trustdb.c:2338 #, fuzzy, c-format msgid "key %08lX.%lu: Invalid subkey binding: %s\n" msgstr "clave %08lX: no hay ids de usuario vАlidos\n" -#: g10/trustdb.c:2244 +#: g10/trustdb.c:2311 #, fuzzy, c-format msgid "key %08lX.%lu: Valid key revocation\n" msgstr "clave %08lX.%lu: caducada el %s\n" -#: g10/trustdb.c:2250 +#: g10/trustdb.c:2317 #, fuzzy, c-format msgid "key %08lX.%lu: Invalid key revocation: %s\n" msgstr "clave %08lX: clave pЗblica no encontrada: %s\n" -#: g10/trustdb.c:2265 +#: g10/trustdb.c:2332 #, fuzzy, c-format msgid "key %08lX.%lu: Valid subkey revocation\n" msgstr "clave %08lX: no hay ids de usuario vАlidos\n" -#: g10/trustdb.c:2365 +#: g10/trustdb.c:2432 #, fuzzy msgid "Good self-signature" msgstr "[autofirma]" -#: g10/trustdb.c:2376 +#: g10/trustdb.c:2443 #, fuzzy msgid "Invalid self-signature" msgstr "clave %08lX: autofirma no vАlida\n" -#: g10/trustdb.c:2386 +#: g10/trustdb.c:2453 msgid "Valid user ID revocation skipped due to a newer self signature\n" msgstr "" -#: g10/trustdb.c:2393 +#: g10/trustdb.c:2460 #, fuzzy msgid "Valid user ID revocation\n" msgstr "ElecciСn no vАlida.\n" -#: g10/trustdb.c:2400 +#: g10/trustdb.c:2467 #, fuzzy msgid "Invalid user ID revocation" msgstr "ElecciСn no vАlida.\n" -#: g10/trustdb.c:2484 +#: g10/trustdb.c:2551 #, fuzzy msgid "Too many preferences" msgstr "muestra preferencias" -#: g10/trustdb.c:2498 +#: g10/trustdb.c:2565 msgid "Too many preference items" msgstr "" -#: g10/trustdb.c:2637 +#: g10/trustdb.c:2704 msgid "Duplicated certificate - deleted" msgstr "" -#: g10/trustdb.c:2670 +#: g10/trustdb.c:2737 #, fuzzy msgid "Hmmm, public key lost?" msgstr "Clave pЗblica incorrecta" -#: g10/trustdb.c:2680 g10/trustdb.c:2763 +#: g10/trustdb.c:2747 g10/trustdb.c:2830 #, fuzzy msgid "Invalid certificate revocation" msgstr "Certificado incorrecto" -#: g10/trustdb.c:2681 g10/trustdb.c:2764 +#: g10/trustdb.c:2748 g10/trustdb.c:2831 #, fuzzy msgid "Invalid certificate" msgstr "Certificado incorrecto" -#: g10/trustdb.c:2696 +#: g10/trustdb.c:2763 #, c-format msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" msgstr "" -#: g10/trustdb.c:2710 +#: g10/trustdb.c:2777 #, c-format msgid "sig record %lu[%d] points to wrong record.\n" msgstr "" #. that should never happen -#: g10/trustdb.c:2954 +#: g10/trustdb.c:3021 #, fuzzy, c-format msgid "insert_trust_record: keyblock not found: %s\n" msgstr "clave %08lX: clave secreta no encontrada: %s\n" -#: g10/trustdb.c:2972 +#: g10/trustdb.c:3039 msgid "did not use primary key for insert_trust_record()\n" msgstr "" @@ -2959,123 +2973,123 @@ msgstr "" "intentos!\n" #. begin of list -#: g10/helptext.c:45 +#: g10/helptext.c:48 msgid "edit_ownertrust.value" msgstr "" -#: g10/helptext.c:51 +#: g10/helptext.c:54 msgid "revoked_key.override" msgstr "" -#: g10/helptext.c:55 +#: g10/helptext.c:58 msgid "untrusted_key.override" msgstr "" -#: g10/helptext.c:59 +#: g10/helptext.c:62 msgid "pklist.user_id.enter" msgstr "" -#: g10/helptext.c:63 +#: g10/helptext.c:66 msgid "keygen.algo" msgstr "" -#: g10/helptext.c:79 +#: g10/helptext.c:82 msgid "keygen.algo.elg_se" msgstr "" -#: g10/helptext.c:86 +#: g10/helptext.c:89 msgid "keygen.size" msgstr "" -#: g10/helptext.c:90 +#: g10/helptext.c:93 msgid "keygen.size.huge.okay" msgstr "" -#: g10/helptext.c:95 +#: g10/helptext.c:98 msgid "keygen.size.large.okay" msgstr "" -#: g10/helptext.c:100 +#: g10/helptext.c:103 msgid "keygen.valid" msgstr "" -#: g10/helptext.c:104 +#: g10/helptext.c:107 msgid "keygen.valid.okay" msgstr "" -#: g10/helptext.c:109 +#: g10/helptext.c:112 msgid "keygen.name" msgstr "" -#: g10/helptext.c:114 +#: g10/helptext.c:117 msgid "keygen.email" msgstr "" -#: g10/helptext.c:118 +#: g10/helptext.c:121 msgid "keygen.comment" msgstr "" -#: g10/helptext.c:123 +#: g10/helptext.c:126 msgid "keygen.userid.cmd" msgstr "" -#: g10/helptext.c:132 +#: g10/helptext.c:135 msgid "keygen.sub.okay" msgstr "" -#: g10/helptext.c:136 +#: g10/helptext.c:139 msgid "sign_uid.okay" msgstr "" -#: g10/helptext.c:141 +#: g10/helptext.c:144 msgid "change_passwd.empty.okay" msgstr "" -#: g10/helptext.c:146 +#: g10/helptext.c:149 msgid "keyedit.cmd" msgstr "" -#: g10/helptext.c:150 +#: g10/helptext.c:153 msgid "keyedit.save.okay" msgstr "" -#: g10/helptext.c:155 +#: g10/helptext.c:158 msgid "keyedit.cancel.okay" msgstr "" -#: g10/helptext.c:159 +#: g10/helptext.c:162 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/helptext.c:163 +#: g10/helptext.c:166 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/helptext.c:168 +#: g10/helptext.c:171 msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/helptext.c:172 +#: g10/helptext.c:175 msgid "passphrase.enter" msgstr "" -#: g10/helptext.c:179 +#: g10/helptext.c:182 msgid "passphrase.repeat" msgstr "" -#: g10/helptext.c:183 +#: g10/helptext.c:186 msgid "detached_signature.filename" msgstr "" -#: g10/helptext.c:187 +#: g10/helptext.c:190 msgid "openfile.overwrite.okay" msgstr "" -#: g10/helptext.c:201 +#: g10/helptext.c:204 msgid "No help available" msgstr "Ayuda no disponible" -#: g10/helptext.c:213 +#: g10/helptext.c:216 #, c-format msgid "No help available for '%s'" msgstr "Ayuda no disponible para '%s'" diff --git a/po/fr.po b/po/fr.po index dbc8e415b..22914c203 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 0.4.5a\n" -"POT-Creation-Date: 1998-12-15 00:29+0100\n" +"POT-Creation-Date: 1998-12-17 18:30+0100\n" "PO-Revision-Date: 1998-12-15 00:35+01:00\n" "Last-Translator: GaКl QuИri \n" "Language-Team: French \n" @@ -237,7 +237,7 @@ msgstr "" "Il n'y a pas assez d'octets alИatoires disponibles. Faites autre chose\n" "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n" -#: g10/g10.c:159 +#: g10/g10.c:160 msgid "" "@Commands:\n" " " @@ -245,124 +245,124 @@ msgstr "" "@Commandes:\n" " " -#: g10/g10.c:162 +#: g10/g10.c:163 msgid "|[file]|make a signature" msgstr "|[fichier]|faire une signature" -#: g10/g10.c:163 +#: g10/g10.c:164 msgid "|[file]|make a clear text signature" msgstr "|[fichier]|faire une signature en texte clair" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "make a detached signature" msgstr "faire une signature dИtachИe" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encrypt data" msgstr "chiffrer les donnИes" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "encryption only with symmetric cipher" msgstr "chiffrement symИtrique seulement" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "store only" msgstr "pas d'action" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "decrypt data (default)" msgstr "dИchiffrer les donnИes (dИfaut)" -#: g10/g10.c:169 +#: g10/g10.c:170 msgid "verify a signature" msgstr "vИrifier une signature" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys" msgstr "lister les clИs" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "list keys and signatures" msgstr "lister les clИs et les signatures" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "check key signatures" msgstr "vИrifier les signatures des clИs" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list keys and fingerprints" msgstr "lister les clИs et les empreintes" -#: g10/g10.c:175 +#: g10/g10.c:176 msgid "list secret keys" msgstr "lister les clИs secrХtes" -#: g10/g10.c:177 +#: g10/g10.c:178 msgid "generate a new key pair" msgstr "gИnИrer une nouvelle paire de clИs" -#: g10/g10.c:179 +#: g10/g10.c:180 msgid "remove key from the public keyring" msgstr "enlever la clИ du porte-clИs public" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "sign or edit a key" msgstr "signer ou Иditer une clИ" -#: g10/g10.c:182 +#: g10/g10.c:183 msgid "generate a revocation certificate" msgstr "gИnИrer un certificat de rИvocation" -#: g10/g10.c:184 +#: g10/g10.c:185 msgid "export keys" msgstr "exporter les clИs" -#: g10/g10.c:187 +#: g10/g10.c:188 msgid "import/merge keys" msgstr "importer/fusionner les clИs" -#: g10/g10.c:189 +#: g10/g10.c:190 msgid "list only the sequence of packets" msgstr "ne lister que les paquets" -#: g10/g10.c:192 +#: g10/g10.c:193 msgid "export the ownertrust values" msgstr "exporter les indices de confiance" -#: g10/g10.c:194 +#: g10/g10.c:195 msgid "import ownertrust values" msgstr "importer les indices de confiance" # -#: g10/g10.c:196 +#: g10/g10.c:197 msgid "|[NAMES]|update the trust database" msgstr "|[NOMS]|mettre la base de confiance Ю jour" -#: g10/g10.c:198 +#: g10/g10.c:199 msgid "|[NAMES]|check the trust database" msgstr "|[NOMS]|vИrifier la base de confiance" -#: g10/g10.c:199 +#: g10/g10.c:200 msgid "fix a corrupted trust database" msgstr "rИparer une base de confiance corrompue" -#: g10/g10.c:200 +#: g10/g10.c:201 msgid "De-Armor a file or stdin" msgstr "Enlever l'armure d'un fichier ou de stdin" -#: g10/g10.c:201 +#: g10/g10.c:202 msgid "En-Armor a file or stdin" msgstr "Mettre une armure Ю un fichier ou Ю stdin" -#: g10/g10.c:202 +#: g10/g10.c:203 msgid "|algo [files]|print message digests" msgstr "|alg. [fich.]|indiquer les fonctions de hachage" -#: g10/g10.c:203 +#: g10/g10.c:204 msgid "print all message digests" msgstr "Иcrire toutes les fonctions de hachage" -#: g10/g10.c:210 +#: g10/g10.c:211 msgid "" "@\n" "Options:\n" @@ -372,142 +372,142 @@ msgstr "" "Options:\n" " " -#: g10/g10.c:212 +#: g10/g10.c:213 msgid "create ascii armored output" msgstr "crИer une sortie ascii armurИe" -#: g10/g10.c:214 +#: g10/g10.c:215 msgid "use this user-id to sign or decrypt" msgstr "utiliser ce nom pour signer ou dИchiffrer" -#: g10/g10.c:215 +#: g10/g10.c:216 msgid "use this user-id for encryption" msgstr "utiliser ce nom d'utilisateur pour chiffrer" -#: g10/g10.c:216 +#: g10/g10.c:217 msgid "|N|set compress level N (0 disables)" msgstr "|N|niveau de compression N (0 dИsactive)" -#: g10/g10.c:218 +#: g10/g10.c:219 msgid "use canonical text mode" msgstr "utiliser le mode de texte canonique" -#: g10/g10.c:220 +#: g10/g10.c:221 msgid "use as output file" msgstr "utiliser comme fichier de sortie" -#: g10/g10.c:221 +#: g10/g10.c:222 msgid "verbose" msgstr "bavard" -#: g10/g10.c:222 +#: g10/g10.c:223 msgid "be somewhat more quiet" msgstr "devenir beaucoup plus silencieux" # -#: g10/g10.c:223 +#: g10/g10.c:224 msgid "force v3 signatures" msgstr "forcer les signatures en v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:225 +#: g10/g10.c:226 msgid "batch mode: never ask" msgstr "mode automatique : ne jamais rien demander" -#: g10/g10.c:226 +#: g10/g10.c:227 msgid "assume yes on most questions" msgstr "rИpondre oui Ю la plupart des questions" -#: g10/g10.c:227 +#: g10/g10.c:228 msgid "assume no on most questions" msgstr "rИpondre non Ю la plupart des questions" -#: g10/g10.c:228 +#: g10/g10.c:229 msgid "add this keyring to the list of keyrings" msgstr "ajouter ce porte-clИs Ю la liste des porte-clИs" -#: g10/g10.c:229 +#: g10/g10.c:230 msgid "add this secret keyring to the list" msgstr "ajouter ce porte-clИs secret Ю la liste" -#: g10/g10.c:230 +#: g10/g10.c:231 msgid "|NAME|use NAME as default secret key" msgstr "|NOM|utiliser NOM comme clИ secrХte par dИfaut" -#: g10/g10.c:231 +#: g10/g10.c:232 msgid "|NAME|set terminal charset to NAME" msgstr "|NOM|le terminal utilise la table de caractХres NOM" -#: g10/g10.c:232 +#: g10/g10.c:233 msgid "read options from file" msgstr "lire les options du fichier" -#: g10/g10.c:234 +#: g10/g10.c:235 msgid "set debugging flags" msgstr "choisir les attributs de dИboguage" -#: g10/g10.c:235 +#: g10/g10.c:236 msgid "enable full debugging" msgstr "permettre un dИboguage complet" -#: g10/g10.c:236 +#: g10/g10.c:237 msgid "|FD|write status info to this FD" msgstr "|FD|Иcrire l'Иtat sur ce descripteur" -#: g10/g10.c:237 +#: g10/g10.c:238 msgid "do not write comment packets" msgstr "ne pas Иcrire de paquets de commentaire" -#: g10/g10.c:238 +#: g10/g10.c:239 msgid "(default is 1)" msgstr "(1 par dИfaut)" -#: g10/g10.c:239 +#: g10/g10.c:240 msgid "(default is 3)" msgstr "(3 par dИfaut)" -#: g10/g10.c:241 +#: g10/g10.c:242 msgid "|KEYID|ulimately trust this key" msgstr "|IDCLE|donner une confiance totale Ю cette clИ" -#: g10/g10.c:242 +#: g10/g10.c:243 msgid "|FILE|load extension module FILE" msgstr "|FICH|charger le module d'extension FICH" -#: g10/g10.c:243 +#: g10/g10.c:244 msgid "emulate the mode described in RFC1991" msgstr "imiter le mode dИcrit dans la RFC1991" # FIXMOI : faudra trouver mieux ... -#: g10/g10.c:244 +#: g10/g10.c:245 msgid "|N|use passphrase mode N" msgstr "|N|utiliser le mode de mots de passe N" -#: g10/g10.c:246 +#: g10/g10.c:247 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NOM|utiliser le hachage NOM pour les mots de passe" -#: g10/g10.c:248 +#: g10/g10.c:249 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NOM|utiliser le chiffrement NOM pour les mots de passe" -#: g10/g10.c:250 +#: g10/g10.c:251 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOM|utiliser l'algorithme de chiffrement NOM" -#: g10/g10.c:251 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOM|utiliser la fonction de hachage NOM" -#: g10/g10.c:252 +#: g10/g10.c:253 msgid "|N|use compress algorithm N" msgstr "|N|utiliser l'algorithme de compression N" -#: g10/g10.c:253 +#: g10/g10.c:254 msgid "throw keyid field of encrypted packets" msgstr "supprimer l'identification des paquets chiffrИs" -#: g10/g10.c:261 +#: g10/g10.c:262 msgid "" "@\n" "Examples:\n" @@ -527,20 +527,20 @@ msgstr "" " --list-keys [utilisateur] montrer les clИs\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:339 +#: g10/g10.c:341 msgid "Please report bugs to .\n" msgstr "Rapporter toutes anomalies Ю .\n" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Utilisation: gpgm [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:346 +#: g10/g10.c:348 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" # -#: g10/g10.c:351 +#: g10/g10.c:353 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -548,7 +548,7 @@ msgstr "" "Syntaxe: gpgm [options] [fichiers]\n" "utilitaire de maitenance de GnuPG\n" -#: g10/g10.c:354 +#: g10/g10.c:356 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -558,7 +558,7 @@ msgstr "" "signer, vИrifier, crypter ou dИcrypter\n" "l'opИration par dИfaut dИpend des donnИes entrИes\n" -#: g10/g10.c:360 +#: g10/g10.c:362 msgid "" "\n" "Supported algorithms:\n" @@ -566,149 +566,149 @@ msgstr "" "\n" "Algorithmes supportИs:\n" -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpgm [options] " msgstr "utilisation: gpgm [options] " -#: g10/g10.c:437 +#: g10/g10.c:439 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:478 +#: g10/g10.c:480 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:616 +#: g10/g10.c:618 #, 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:620 +#: g10/g10.c:622 #, c-format msgid "option file '%s': %s\n" msgstr "fichier d'options '%s' : %s\n" -#: g10/g10.c:627 +#: g10/g10.c:629 #, c-format msgid "reading options from '%s'\n" msgstr "lire les options de '%s'\n" -#: g10/g10.c:776 +#: g10/g10.c:782 #, c-format msgid "%s is not a valid character set\n" msgstr "%s n'est pas une table de caractХres valide\n" -#: g10/g10.c:810 g10/g10.c:822 +#: g10/g10.c:817 g10/g10.c:829 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sИlectionnИ est invalide\n" -#: g10/g10.c:816 g10/g10.c:828 +#: g10/g10.c:823 g10/g10.c:835 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sИlectionnИe est invalide\n" -#: g10/g10.c:831 +#: g10/g10.c:838 #, 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:833 +#: g10/g10.c:840 msgid "completes-needed must be greater than 0\n" msgstr "╚ completes-needed ╩ doit Йtre supИrieur Ю 0\n" -#: g10/g10.c:835 +#: g10/g10.c:842 msgid "marginals-needed must be greater than 1\n" msgstr "╚ marginals-needed ╩ doit Йtre supИrieur Ю 1\n" -#: g10/g10.c:837 +#: g10/g10.c:844 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:840 +#: g10/g10.c:847 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:844 +#: g10/g10.c:851 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:927 +#: g10/g10.c:934 #, 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:933 +#: g10/g10.c:940 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:941 +#: g10/g10.c:948 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:949 +#: g10/g10.c:956 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:962 +#: g10/g10.c:969 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:975 +#: g10/g10.c:982 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:989 +#: g10/g10.c:996 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:1001 +#: g10/g10.c:1008 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:1010 +#: g10/g10.c:1017 msgid "--edit-key username [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:1026 +#: g10/g10.c:1033 msgid "--delete-secret-key username" msgstr "--delete-secret-key utilisateur" -#: g10/g10.c:1029 +#: g10/g10.c:1036 msgid "--delete-key username" msgstr "--delete-key utilisateur" -#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "ne peut ouvrir %s: %s\n" -#: g10/g10.c:1063 +#: g10/g10.c:1070 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clИs]" -#: g10/g10.c:1120 +#: g10/g10.c:1127 #, c-format msgid "dearmoring failed: %s\n" msgstr "suppression d'armure non rИussie : %s\n" -#: g10/g10.c:1128 +#: g10/g10.c:1135 #, c-format msgid "enarmoring failed: %s\n" msgstr "construction d'armure non rИussie : %s \n" -#: g10/g10.c:1194 +#: g10/g10.c:1201 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "algorithme de hachage '%s' invalide\n" -#: g10/g10.c:1273 +#: g10/g10.c:1280 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:1277 +#: g10/g10.c:1284 msgid "Go ahead and type your message ...\n" msgstr "Continuez et tapez votre message...\n" -#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "ne peut ouvrir '%s'\n" @@ -772,7 +772,7 @@ msgstr "erreur dans la ligne de remorque\n" msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "pas de donnИe RFC1991 ou OpenPGP valide trouvИe.\n" -#: g10/pkclist.c:121 +#: g10/pkclist.c:138 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -781,7 +781,7 @@ msgstr "" "Pas de confiance dИfinie pour %lu :\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:131 +#: g10/pkclist.c:148 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -803,24 +803,29 @@ msgstr "" " 4 = je le crois totalement\n" " s = montrez moi plus d'informations\n" -#: g10/pkclist.c:140 +#: g10/pkclist.c:157 msgid " m = back to the main menu\n" msgstr " m = retour au menu principal\n" -#. a string with valid answers -#: g10/pkclist.c:145 -msgid "sSmM" -msgstr "sSmM" +#: g10/pkclist.c:159 +msgid " q = quit\n" +msgstr "" -#: g10/pkclist.c:149 +#. a string with valid answers +#: g10/pkclist.c:164 +#, fuzzy +msgid "sSmMqQ" +msgstr "sSmMqQ" + +#: g10/pkclist.c:168 msgid "Your decision? " msgstr "Votre dИcision ? " -#: g10/pkclist.c:169 +#: g10/pkclist.c:188 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificats conduisant vers une clИ Ю confiance ultime :\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:221 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" @@ -829,7 +834,7 @@ msgstr "" "N'a pas pu trouver un chemin de confiance valide jusqu'Ю la clИ. Voyons si\n" "nous ne pouvons pas assigner quelques indices de confiance manquants.\n" -#: g10/pkclist.c:219 +#: g10/pkclist.c:251 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -837,7 +842,7 @@ msgstr "" "Aucun chemin menant vers une de nos clИs n'a ИtИ trouvИ.\n" "\n" -#: g10/pkclist.c:221 +#: g10/pkclist.c:253 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -845,7 +850,7 @@ msgstr "" "Aucun certificat Ю confiance indИfinie n'a ИtИ trouvИ.\n" "\n" -#: g10/pkclist.c:223 +#: g10/pkclist.c:255 msgid "" "No trust values changed.\n" "\n" @@ -853,31 +858,31 @@ msgstr "" "Pas d'indice de confiance changИ.\n" "\n" -#: g10/pkclist.c:238 +#: g10/pkclist.c:270 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "clИ %08lX : la clИ a ИtИ rИvoquИe !\n" -#: g10/pkclist.c:244 g10/pkclist.c:335 +#: g10/pkclist.c:276 g10/pkclist.c:369 msgid "Use this key anyway? " msgstr "Utiliser cette clИ quand-mЙme ? " -#: g10/pkclist.c:266 +#: g10/pkclist.c:298 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX : la clИ a expirИ\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:304 #, 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:288 +#: g10/pkclist.c:322 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX : Nous ne faisons PAS confiance Ю cette clИ\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:328 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -887,15 +892,15 @@ msgstr "" "propriИtaire\n" "mais elle est quand mЙme acceptИe\n" -#: g10/pkclist.c:300 +#: g10/pkclist.c:334 msgid "This key probably belongs to the owner\n" msgstr "Cette clИ appartient probablement Ю son propriИtaire\n" -#: g10/pkclist.c:305 +#: g10/pkclist.c:339 msgid "This key belongs to us\n" msgstr "Cette clИ nous appartient\n" -#: g10/pkclist.c:330 +#: g10/pkclist.c:364 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" @@ -907,53 +912,53 @@ msgstr "" "oui Ю la prochaine question\n" "\n" -#: g10/pkclist.c:339 +#: g10/pkclist.c:373 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENTION : Utilisation d'une clИ sans confiance !\n" -#: g10/pkclist.c:375 +#: g10/pkclist.c:409 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:376 +#: g10/pkclist.c:410 msgid " This could mean that the signature is forgery.\n" msgstr " Cela pourrait signifier que la signature est fausse.\n" -#: g10/pkclist.c:397 +#: g10/pkclist.c:431 msgid "Note: This key has expired!\n" msgstr "Note : Cette clИ a expirИ !\n" -#: g10/pkclist.c:404 +#: g10/pkclist.c:438 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:406 +#: g10/pkclist.c:440 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:421 +#: g10/pkclist.c:456 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENTION : Nous ne faisons PAS confiance Ю cette clИ !\n" -#: g10/pkclist.c:422 +#: g10/pkclist.c:457 msgid " The signature is probably a FORGERY.\n" msgstr " La signature est certainement FAUSSE.\n" -#: g10/pkclist.c:429 +#: g10/pkclist.c:464 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:432 +#: g10/pkclist.c:467 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:477 +#: g10/pkclist.c:512 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -962,25 +967,25 @@ msgstr "" "\"-r\")\n" "\n" -#: g10/pkclist.c:482 +#: g10/pkclist.c:517 msgid "Enter the user ID: " msgstr "Entrez le nom d'utilisateur : " -#: g10/pkclist.c:493 +#: g10/pkclist.c:528 msgid "No such user ID.\n" msgstr "Pas de tel utilisateur.\n" -#: g10/pkclist.c:527 g10/pkclist.c:554 +#: g10/pkclist.c:562 g10/pkclist.c:589 #, c-format msgid "%s: skipped: %s\n" msgstr "%s : ignorИ : %s\n" -#: g10/pkclist.c:535 +#: g10/pkclist.c:570 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s : erreur pendant la vИrification de la clИ : %s\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:596 msgid "no valid addressees\n" msgstr "pas de destinataire valide\n" @@ -1341,7 +1346,7 @@ msgstr "" "utilisation de la clИ secondaire %08lX Ю la place de la clИ\n" "principale %08lX\n" -#: g10/import.c:129 g10/trustdb.c:1166 +#: g10/import.c:129 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "ne peut ouvrir le fichier : %s\n" @@ -1351,12 +1356,12 @@ msgstr "ne peut ouvrir le fichier : %s\n" msgid "skipping block of type %d\n" msgstr "ne prend pas en compte le bloc de type %d\n" -#: g10/import.c:152 g10/trustdb.c:1425 g10/trustdb.c:1494 +#: g10/import.c:152 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu clИs traitИes jusqu'ici\n" -#: g10/import.c:157 g10/trustdb.c:1242 +#: g10/import.c:157 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "erreur de lecture : %s\n" @@ -1439,7 +1444,7 @@ msgstr "cl msgid "no default public keyring\n" msgstr "pas de porte-clИs public par dИfaut\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:569 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #, c-format msgid "writing to '%s'\n" msgstr "Иcriture de '%s'\n" @@ -2116,21 +2121,21 @@ msgstr "Entrez le mot de passe : " msgid "Repeat passphrase: " msgstr "RИpИtez le mot de passe : " -#: g10/plaintext.c:102 +#: g10/plaintext.c:103 msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "donnИes non enregistrИes ; utilisez l'option \"--output\" pour\n" "les enregistrer\n" -#: g10/plaintext.c:215 +#: g10/plaintext.c:216 msgid "Please enter name of data file: " msgstr "Entrez le nom d'un fichier de donnИes : " -#: g10/plaintext.c:236 +#: g10/plaintext.c:237 msgid "reading stdin ...\n" msgstr "lecture de l'entrИe standard...\n" -#: g10/plaintext.c:299 +#: g10/plaintext.c:300 #, c-format msgid "can't open signed data '%s'\n" msgstr "ne peut ouvir les donnИes signИes '%s'\n" @@ -2197,7 +2202,7 @@ msgstr "" msgid "%s signature from: %s\n" msgstr "Signature %s de : %s\n" -#: g10/sign.c:200 g10/sign.c:564 +#: g10/sign.c:200 g10/sign.c:587 #, c-format msgid "can't create %s: %s\n" msgstr "ne peut crИer %s : %s\n" @@ -2341,169 +2346,169 @@ msgstr "%s : n'a pu mettre un enregistrement msgid "%s: failed to append a record: %s\n" msgstr "%s : n'a pas pu ajouter un enregistrement : %s\n" -#: g10/trustdb.c:134 +#: g10/trustdb.c:142 msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n" msgstr "" "La base de confiance est corrompue ; exИcutez ╚ gpgm --fix-trust-db ╩.\n" -#: g10/trustdb.c:147 +#: g10/trustdb.c:155 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" msgstr "" "enregistrement de confiance %lu, type de requЙte %d : la lecture a ИchouИ : " "%s\n" -#: g10/trustdb.c:162 +#: g10/trustdb.c:170 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" msgstr "enregistrement de confiance %lu, type %d : l'Иcriture a ИchouИ : %s\n" -#: g10/trustdb.c:176 +#: g10/trustdb.c:184 #, c-format msgid "trust record %lu: delete failed: %s\n" msgstr "enregistrement de confiance %lu : la suppression a ИchouИ : %s\n" -#: g10/trustdb.c:190 +#: g10/trustdb.c:198 #, c-format msgid "trust db: sync failed: %s\n" msgstr "base de confiance a ИchouИ : la synchronisation a ИchouИ : %s\n" -#: g10/trustdb.c:319 +#: g10/trustdb.c:327 #, c-format msgid "error reading dir record for LID %lu: %s\n" msgstr "" "erreur pendant la lecture de l'enregistrement de rИpertoire pour\n" "le LID %lu : %s\n" -#: g10/trustdb.c:326 +#: g10/trustdb.c:334 #, c-format msgid "lid %lu: expected dir record, got type %d\n" msgstr "lid %lu : enregistrement de rИpertoire attendu, a reГu le type %d\n" -#: g10/trustdb.c:331 +#: g10/trustdb.c:339 #, c-format msgid "no primary key for LID %lu\n" msgstr "pas de clИ principale pour le LID %lu\n" -#: g10/trustdb.c:336 +#: g10/trustdb.c:344 #, c-format msgid "error reading primary key for LID %lu: %s\n" msgstr "erreur pendant la lecture de la clИ principale pour le LID %lu : %s\n" -#: g10/trustdb.c:412 +#: g10/trustdb.c:420 #, c-format msgid "chained sigrec %lu has a wrong owner\n" msgstr "l'enregistrement de signature %lu a un mauvais propriИtaire\n" -#: g10/trustdb.c:455 +#: g10/trustdb.c:463 #, c-format msgid "'%s' is not a valid long keyID\n" msgstr "'%s' n'est pas une identification longue de clИ valide\n" -#: g10/trustdb.c:490 +#: g10/trustdb.c:498 #, c-format msgid "key %08lX: no public key for trusted key - skipped\n" msgstr "clИ %08lX : pas de clИ publique pour la clИ certifiИe - ignorИe\n" -#: g10/trustdb.c:499 g10/trustdb.c:557 +#: g10/trustdb.c:507 g10/trustdb.c:565 #, c-format msgid "key %08lX: can't put it into the trustdb\n" msgstr "clИ %08lX : ne peut Йtre mise dans la base de confiance\n" -#: g10/trustdb.c:504 g10/trustdb.c:563 +#: g10/trustdb.c:512 g10/trustdb.c:571 #, c-format msgid "key %08lX: query record failed\n" msgstr "clИ %08lX : l'enregistrement de requЙte a ИchouИ\n" -#: g10/trustdb.c:509 g10/trustdb.c:572 +#: g10/trustdb.c:517 g10/trustdb.c:580 #, c-format msgid "key %08lX: already in trusted key table\n" msgstr "clИ %08lX : dИjЮ dans la table des clИs certifiИes\n" -#: g10/trustdb.c:512 g10/trustdb.c:575 +#: g10/trustdb.c:520 g10/trustdb.c:583 #, c-format msgid "key %08lX: accepted as trusted key.\n" msgstr "clИ %08lX : acceptИe comme clИ certifiИe.\n" -#: g10/trustdb.c:528 +#: g10/trustdb.c:536 #, c-format msgid "NOTE: secret key %08lX is NOT protected.\n" msgstr "NOTE : la clИ secrХte %08lX n'est PAS protИgИe.\n" -#: g10/trustdb.c:540 +#: g10/trustdb.c:548 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "clИ %08lX : clИ secrХte sans clИ publique - non prise en compte\n" -#: g10/trustdb.c:547 +#: g10/trustdb.c:555 #, c-format msgid "key %08lX: secret and public key don't match\n" msgstr "clИ %08lX : les clИs secrХte et publique ne correspondent pas\n" -#: g10/trustdb.c:583 +#: g10/trustdb.c:591 #, c-format msgid "enumerate secret keys failed: %s\n" msgstr "l'ИnumИration des clИs secrХtes a ИchouИ : %s\n" -#: g10/trustdb.c:766 +#: g10/trustdb.c:774 #, c-format msgid "lid %lu: read dir record failed: %s\n" msgstr "lid %lu : la lecture d'enregistrement de rИpertoire a ИchouИ : %s\n" -#: g10/trustdb.c:775 +#: g10/trustdb.c:783 #, c-format msgid "lid %lu: read key record failed: %s\n" msgstr "lid %lu : la lecture de l''enregistrement de clИ a ИchouИ : %s\n" -#: g10/trustdb.c:785 +#: g10/trustdb.c:793 #, c-format msgid "lid %lu: read uid record failed: %s\n" msgstr "lid %lu : la lecture d'enregistrement d'uid a ИchouИ : %s\n" -#: g10/trustdb.c:794 +#: g10/trustdb.c:802 #, c-format msgid "lid %lu: read pref record failed: %s\n" msgstr "lid %lu : la lecture d'enregistrement de prИfИrences a ИchouИ : %s\n" -#: g10/trustdb.c:804 +#: g10/trustdb.c:812 #, c-format msgid "lid %lu: read sig record failed: %s\n" msgstr "lid %lu : la lecture d'enregistrement de signature a ИchouИ : %s\n" -#: g10/trustdb.c:999 +#: g10/trustdb.c:1013 msgid "Ooops, no keys\n" msgstr "Ooops, pas de clИ\n" -#: g10/trustdb.c:1003 +#: g10/trustdb.c:1017 msgid "Ooops, no user ids\n" msgstr "Ooops, pas de nom d'utilisateur\n" -#: g10/trustdb.c:1074 g10/trustdb.c:1092 +#: g10/trustdb.c:1088 g10/trustdb.c:1106 #, c-format msgid "user '%s' read problem: %s\n" msgstr "problХme de lecture de l'utilisateur '%s' : %s\n" -#: g10/trustdb.c:1077 g10/trustdb.c:1095 +#: g10/trustdb.c:1091 g10/trustdb.c:1109 #, c-format msgid "user '%s' list problem: %s\n" msgstr "problХme de liste Ю l'utilisateur '%s' : %s\n" -#: g10/trustdb.c:1085 g10/trustdb.c:1300 +#: g10/trustdb.c:1099 g10/trustdb.c:1346 #, c-format msgid "user '%s' not found: %s\n" msgstr "l'utilisateur '%s' n'a pas ИtИ trouvИ : %s\n" -#: g10/trustdb.c:1087 g10/trustdb.c:1302 +#: g10/trustdb.c:1101 g10/trustdb.c:1348 #, c-format msgid "problem finding '%s' in trustdb: %s\n" msgstr "problХme de recherche de '%s' dans la base de confiance : %s\n" -#: g10/trustdb.c:1090 +#: g10/trustdb.c:1104 #, c-format msgid "user '%s' not in trustdb\n" msgstr "l'utilisateur '%s' n'est pas dans la base de confiance\n" -#: g10/trustdb.c:1125 +#: g10/trustdb.c:1139 #, c-format msgid "" "# List of assigned trustvalues, created %s\n" @@ -2512,218 +2517,218 @@ msgstr "" "# Liste des indices de confiance assignИs, crИИe le %s\n" "# (Utiliser ╚ gpgm --import-ownertrust ╩ pour les restaurer)\n" -#: g10/trustdb.c:1131 +#: g10/trustdb.c:1145 msgid "directory record w/o primary key\n" msgstr "enregistrement de rИpertoire sans clИ principale\n" -#: g10/trustdb.c:1138 +#: g10/trustdb.c:1152 #, c-format msgid "error reading key record: %s\n" msgstr "erreur pendant la lecture de l'enregistrement de clИ : %s\n" -#: g10/trustdb.c:1178 +#: g10/trustdb.c:1192 msgid "line too long\n" msgstr "ligne trop longue\n" -#: g10/trustdb.c:1186 +#: g10/trustdb.c:1200 msgid "error: missing colon\n" msgstr "erreur : deux-points manquant\n" -#: g10/trustdb.c:1191 +#: g10/trustdb.c:1205 msgid "error: invalid fingerprint\n" msgstr "erreur : empreinte digitale invalide\n" -#: g10/trustdb.c:1195 +#: g10/trustdb.c:1209 msgid "error: no ownertrust value\n" msgstr "erreur : pas d'indice de confiance\n" -#: g10/trustdb.c:1209 +#: g10/trustdb.c:1223 #, c-format msgid "LID %lu: changing trust from %u to %u\n" msgstr "LID %lu : changement de la confiance de %u vers %u\n" -#: g10/trustdb.c:1212 +#: g10/trustdb.c:1226 #, c-format msgid "LID %lu: setting trust to %u\n" msgstr "LID %lu : la confiance est maintenant %u\n" -#: g10/trustdb.c:1220 +#: g10/trustdb.c:1234 msgid "key not in trustdb, searching ring.\n" msgstr "la clИ n'est pas dans la base de confiance, recherche du porte-clИs.\n" -#: g10/trustdb.c:1223 +#: g10/trustdb.c:1237 #, c-format msgid "key not in ring: %s\n" msgstr "clИ absente du porte-clИs : %s\n" -#: g10/trustdb.c:1227 +#: g10/trustdb.c:1241 msgid "Oops: key is now in trustdb???\n" msgstr "Oops : la clИ est maintenant dans la base de confiance ???\n" #. update the ownertrust -#: g10/trustdb.c:1232 +#: g10/trustdb.c:1246 #, c-format msgid "insert trust record failed: %s\n" msgstr "l'insertion d'enregistrement de confiance a ИchouИ : %s\n" #. error -#: g10/trustdb.c:1238 +#: g10/trustdb.c:1252 #, c-format msgid "error finding dir record: %s\n" msgstr "erreur pendant la recherche de l'enregistrement de rИpertoire : %s\n" -#: g10/trustdb.c:1305 +#: g10/trustdb.c:1351 #, c-format msgid "user '%s' not in trustdb - inserting\n" msgstr "l'utilisateur '%s' n'est pas dans la base de confiance - insertion\n" -#: g10/trustdb.c:1308 +#: g10/trustdb.c:1354 #, c-format msgid "failed to put '%s' into trustdb: %s\n" msgstr "n'a pas pu insИrer '%s' dans la base de confiance : %s\n" -#: g10/trustdb.c:1355 +#: g10/trustdb.c:1404 #, c-format msgid "%s: keyblock read problem: %s\n" msgstr "%s : problХme de lecture du bloc de clИs : %s\n" -#: g10/trustdb.c:1369 +#: g10/trustdb.c:1418 #, c-format msgid "%s: update failed: %s\n" msgstr "%s : la mise Ю jour a ИchouИ : %s\n" -#: g10/trustdb.c:1372 +#: g10/trustdb.c:1421 #, c-format msgid "%s: updated\n" msgstr "%s : mis Ю jour\n" -#: g10/trustdb.c:1374 +#: g10/trustdb.c:1423 #, c-format msgid "%s: okay\n" msgstr "%s : OK\n" -#: g10/trustdb.c:1389 +#: g10/trustdb.c:1438 #, c-format msgid "lid %lu: dir record w/o key - skipped\n" msgstr "lid %lu : enregistrement de rИpertoire sans clИ - ignorИ\n" -#: g10/trustdb.c:1402 +#: g10/trustdb.c:1451 #, c-format msgid "lid %lu: keyblock not found: %s\n" msgstr "lid %lu : le bloc de clИs n'a pas ИtИ trouvИ : %s\n" -#: g10/trustdb.c:1411 g10/trustdb.c:1480 +#: g10/trustdb.c:1460 g10/trustdb.c:1529 #, c-format msgid "lid %lu: update failed: %s\n" msgstr "lid %lu : la mise Ю jour a ИchouИ: %s\n" -#: g10/trustdb.c:1417 g10/trustdb.c:1486 +#: g10/trustdb.c:1466 g10/trustdb.c:1535 #, c-format msgid "lid %lu: updated\n" msgstr "lid %lu : mis Ю jour\n" -#: g10/trustdb.c:1421 g10/trustdb.c:1490 +#: g10/trustdb.c:1470 g10/trustdb.c:1539 #, c-format msgid "lid %lu: okay\n" msgstr "lid %lu : OK\n" -#: g10/trustdb.c:1428 g10/trustdb.c:1496 +#: g10/trustdb.c:1477 g10/trustdb.c:1545 #, c-format msgid "%lu keys processed\n" msgstr "%lu clИs traitИes\n" -#: g10/trustdb.c:1430 +#: g10/trustdb.c:1479 #, c-format msgid "\t%lu keys skipped\n" msgstr "\t%lu clИs ignorИes\n" -#: g10/trustdb.c:1432 g10/trustdb.c:1498 +#: g10/trustdb.c:1481 g10/trustdb.c:1547 #, c-format msgid "\t%lu keys with errors\n" msgstr "\t%lu clИs avec erreurs\n" -#: g10/trustdb.c:1434 g10/trustdb.c:1500 +#: g10/trustdb.c:1483 g10/trustdb.c:1549 #, c-format msgid "\t%lu keys updated\n" msgstr "\t%lu clИs mises Ю jour\n" -#: g10/trustdb.c:1464 +#: g10/trustdb.c:1513 #, c-format msgid "lid ?: insert failed: %s\n" msgstr "lid ? : l'insertion a ИchouИ : %s\n" -#: g10/trustdb.c:1469 +#: g10/trustdb.c:1518 #, c-format msgid "lid %lu: insert failed: %s\n" msgstr "lid %lu : l'insertion a ИchouИ : %s\n" -#: g10/trustdb.c:1475 +#: g10/trustdb.c:1524 #, c-format msgid "lid %lu: inserted\n" msgstr "lid %lu : insИrИ\n" -#: g10/trustdb.c:1502 +#: g10/trustdb.c:1551 #, c-format msgid "\t%lu keys inserted\n" msgstr "\t%lu clИs insИrИes\n" -#: g10/trustdb.c:1505 +#: g10/trustdb.c:1554 #, c-format msgid "enumerate keyblocks failed: %s\n" msgstr "l'ИnumИration des blocs de clИs a ИchouИ : %s\n" -#: g10/trustdb.c:1550 +#: g10/trustdb.c:1599 #, c-format msgid "check_trust: search dir record failed: %s\n" msgstr "" "check_trust : la recherche d'enregistrement de rИpertoire a ИchouИ : %s\n" -#: g10/trustdb.c:1557 +#: g10/trustdb.c:1606 #, c-format msgid "key %08lX: insert trust record failed: %s\n" msgstr "clИ %08lX : l'insertion d'enregistrement de confiance a ИchouИ : %s\n" -#: g10/trustdb.c:1561 +#: g10/trustdb.c:1610 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" msgstr "clИ %08lX.%lu : insИrИe dans la base de confiance\n" -#: g10/trustdb.c:1569 +#: g10/trustdb.c:1618 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "" "clИ %08lX.%lu : crИИe dans le futur (voyage temporel ou\n" "problХme d'horloge)\n" -#: g10/trustdb.c:1576 +#: g10/trustdb.c:1625 #, c-format msgid "key %08lX.%lu: expired at %s\n" msgstr "clИ %08lX.%lu : a expirИ le %s\n" -#: g10/trustdb.c:1584 +#: g10/trustdb.c:1633 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" msgstr "clИ %08lX.%lu : la vИrification de confiance a ИchouИ: %s\n" -#: g10/trustdb.c:1753 g10/trustdb.c:1782 g10/trustdb.c:2521 +#: g10/trustdb.c:1820 g10/trustdb.c:1849 g10/trustdb.c:2588 msgid "WARNING: can't yet handle long pref records\n" msgstr "" "ATTENTION : les enregistrements de prИfИrences longs ne sont pas encore\n" "supportИs\n" -#: g10/trustdb.c:1804 +#: g10/trustdb.c:1871 #, c-format msgid "get_dir_record: search_record failed: %s\n" msgstr "get_dir_record : search_record a ИchouИ : %s\n" -#: g10/trustdb.c:1867 +#: g10/trustdb.c:1934 #, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" msgstr "" "NOTE : l'enregistrement de signature %lu[%d] est dans la liste d'aide\n" "de %lu mais marquИ comme vИrifiИ\n" -#: g10/trustdb.c:1871 +#: g10/trustdb.c:1938 #, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n" msgstr "" @@ -2731,146 +2736,146 @@ msgstr "" "de %lu mais n'est pas marquИ\n" #. we need the dir record -#: g10/trustdb.c:1878 +#: g10/trustdb.c:1945 #, c-format msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n" msgstr "" "l'enregistrement de signature %lu[%d] dans la liste d'aide de %lu\n" "ne pointe pas vers un enregistrement de rИpertoire\n" -#: g10/trustdb.c:1884 +#: g10/trustdb.c:1951 #, c-format msgid "lid %lu: no primary key\n" msgstr "lid %lu : pas de clИ primaire\n" -#: g10/trustdb.c:1917 +#: g10/trustdb.c:1984 #, c-format msgid "lid %lu: user id not found in keyblock\n" msgstr "lid %lu : utilisateur non trouvИ dans le bloc de clИs\n" -#: g10/trustdb.c:1921 +#: g10/trustdb.c:1988 #, c-format msgid "lid %lu: user id without signature\n" msgstr "lid %lu : utilisateur sans signature\n" -#: g10/trustdb.c:1928 +#: g10/trustdb.c:1995 #, c-format msgid "lid %lu: self-signature in hintlist\n" msgstr "lid %lu : auto-signature dans la liste d'aide\n" -#: g10/trustdb.c:1939 g10/trustdb.c:2658 g10/trustdb.c:2742 +#: g10/trustdb.c:2006 g10/trustdb.c:2725 g10/trustdb.c:2809 msgid "Valid certificate revocation" msgstr "Certificat de rИvocation valide" -#: g10/trustdb.c:1940 g10/trustdb.c:2659 g10/trustdb.c:2743 +#: g10/trustdb.c:2007 g10/trustdb.c:2726 g10/trustdb.c:2810 msgid "Good certificate" msgstr "Bon certificat" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:2016 msgid "very strange: no public key\n" msgstr "trХs Иtrange : pas de clИ publique\n" -#: g10/trustdb.c:1997 +#: g10/trustdb.c:2064 #, c-format msgid "hintlist %lu[%d] of %lu does not point to a dir record\n" msgstr "" "la liste d'aide de %lu[%d] de %lu ne pointe pas vers un enregistrement\n" "de rИpertoire\n" -#: g10/trustdb.c:2003 +#: g10/trustdb.c:2070 #, c-format msgid "lid %lu does not have a key\n" msgstr "la lid %lu n'a pas de clИ\n" -#: g10/trustdb.c:2013 +#: g10/trustdb.c:2080 #, c-format msgid "lid %lu: can't get keyblock: %s\n" msgstr "lid %lu: ne peut obtenir le bloc de clИs: %s\n" -#: g10/trustdb.c:2070 g10/trustdb.c:2984 +#: g10/trustdb.c:2137 g10/trustdb.c:3051 #, c-format msgid "tdbio_search_dir failed: %s\n" msgstr "tdbio_search_dir a ИchouИ : %s\n" -#: g10/trustdb.c:2223 +#: g10/trustdb.c:2290 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" msgstr "clИ %08lX.%lu : bonne liaison avec la sous-clИ\n" -#: g10/trustdb.c:2229 g10/trustdb.c:2271 +#: g10/trustdb.c:2296 g10/trustdb.c:2338 #, c-format msgid "key %08lX.%lu: Invalid subkey binding: %s\n" msgstr "clИ %08lX.%lu : liaison avec la sous-clИ invalide : %s\n" -#: g10/trustdb.c:2244 +#: g10/trustdb.c:2311 #, c-format msgid "key %08lX.%lu: Valid key revocation\n" msgstr "clИ %08lX.%lu : rИvocation de clИ valide\n" -#: g10/trustdb.c:2250 +#: g10/trustdb.c:2317 #, c-format msgid "key %08lX.%lu: Invalid key revocation: %s\n" msgstr "clИ %08lX.%lu : rИvocation de sous-clИ invalide : %s\n" -#: g10/trustdb.c:2265 +#: g10/trustdb.c:2332 #, c-format msgid "key %08lX.%lu: Valid subkey revocation\n" msgstr "clИ %08lX.%lu : rИvocation de sous-clИ valide\n" -#: g10/trustdb.c:2365 +#: g10/trustdb.c:2432 msgid "Good self-signature" msgstr "Bonne auto-signature" -#: g10/trustdb.c:2376 +#: g10/trustdb.c:2443 msgid "Invalid self-signature" msgstr "Auto-signature invalide" -#: g10/trustdb.c:2386 +#: g10/trustdb.c:2453 msgid "Valid user ID revocation skipped due to a newer self signature\n" msgstr "" "La rИvocation valide de nom d'utilisateur a ИtИ ignorИe car l'auto-\n" "signature est plus rИcente\n" -#: g10/trustdb.c:2393 +#: g10/trustdb.c:2460 msgid "Valid user ID revocation\n" msgstr "RИvocation de nom d'utilisateur valide\n" -#: g10/trustdb.c:2400 +#: g10/trustdb.c:2467 msgid "Invalid user ID revocation" msgstr "RИvocation de nom d'utilisateur invalide" -#: g10/trustdb.c:2484 +#: g10/trustdb.c:2551 msgid "Too many preferences" msgstr "Trop de prИfИrences" -#: g10/trustdb.c:2498 +#: g10/trustdb.c:2565 msgid "Too many preference items" msgstr "Trop d'items de prИfИrence" -#: g10/trustdb.c:2637 +#: g10/trustdb.c:2704 msgid "Duplicated certificate - deleted" msgstr "Certificat dupliquИ - enlevИ" -#: g10/trustdb.c:2670 +#: g10/trustdb.c:2737 msgid "Hmmm, public key lost?" msgstr "Hmmm, clИ publique perdue ?" -#: g10/trustdb.c:2680 g10/trustdb.c:2763 +#: g10/trustdb.c:2747 g10/trustdb.c:2830 msgid "Invalid certificate revocation" msgstr "RИvocation de certificat invalide" -#: g10/trustdb.c:2681 g10/trustdb.c:2764 +#: g10/trustdb.c:2748 g10/trustdb.c:2831 msgid "Invalid certificate" msgstr "Certificat invalide" -#: g10/trustdb.c:2696 +#: g10/trustdb.c:2763 #, c-format msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" msgstr "" "uid %08lX.%lu/%02X%02X : possХde une ombre %lu mais n'est pas encore\n" "marquИ.\n" -#: g10/trustdb.c:2710 +#: g10/trustdb.c:2777 #, c-format msgid "sig record %lu[%d] points to wrong record.\n" msgstr "" @@ -2878,12 +2883,12 @@ msgstr "" "enregistrement de rИpertoire\n" #. that should never happen -#: g10/trustdb.c:2954 +#: g10/trustdb.c:3021 #, c-format msgid "insert_trust_record: keyblock not found: %s\n" msgstr "insert_trust_record : bloc de clИs non trouvИ : %s\n" -#: g10/trustdb.c:2972 +#: g10/trustdb.c:3039 msgid "did not use primary key for insert_trust_record()\n" msgstr "n'a pas utilisИ la clИ principale pour ╚ insert_trust_record() ╩\n" @@ -3120,4 +3125,3 @@ msgstr "Pas d'aide disponible" #, c-format msgid "No help available for '%s'" msgstr "Pas d'aide disponible pour '%s'" - diff --git a/po/it.po b/po/it.po index 752a31a7f..147b1e0a8 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.4.3\n" -"POT-Creation-Date: 1998-12-10 20:11+0100\n" +"POT-Creation-Date: 1998-12-17 18:30+0100\n" "PO-Revision-Date: 1998-11-09 16:19+01:00\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -207,13 +207,13 @@ msgstr "... questo msgid "you found a bug ... (%s:%d)\n" msgstr "Hai trovato un bug... (%s:%d)\n" -#: cipher/random.c:412 +#: cipher/random.c:406 #, fuzzy msgid "WARNING: using insecure random number generator!!\n" msgstr "" "Attenzione: si sta usando un generatore di numeri casuali non sicuro!!\n" -#: cipher/random.c:413 +#: cipher/random.c:407 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -224,7 +224,7 @@ msgstr "" "Il generatore di numeri casuali Х solo un ripiego per fare\n" "compilare il programma - non Х assolutamente un RNG forte!\n" -#: cipher/rndlinux.c:116 +#: cipher/rndlinux.c:118 #, c-format msgid "" "\n" @@ -236,7 +236,7 @@ msgstr "" "altra cosa per dare all'OS la possibilitЮ di raccogliere altra entropia!\n" "(Servono ancora %d altri byte)\n" -#: g10/g10.c:159 +#: g10/g10.c:160 msgid "" "@Commands:\n" " " @@ -244,123 +244,123 @@ msgstr "" "@Comandi:\n" " " -#: g10/g10.c:162 +#: g10/g10.c:163 msgid "|[file]|make a signature" msgstr "|[file]|fai una firma" -#: g10/g10.c:163 +#: g10/g10.c:164 msgid "|[file]|make a clear text signature" msgstr "|[file]|fai una firma mantenendo il testo in chiaro" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "make a detached signature" msgstr "fai una firma separata" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encrypt data" msgstr "cifra dati" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "encryption only with symmetric cipher" msgstr "cifra solo con un cifrario simmetrico" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "store only" msgstr "immagazzina soltanto" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "decrypt data (default)" msgstr "decifra dati (predefinito)" -#: g10/g10.c:169 +#: g10/g10.c:170 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys" msgstr "elenca le chiavi" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "list keys and signatures" msgstr "elenca le chiavi e le firme" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "check key signatures" msgstr "controlla le firme delle chiavi" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list keys and fingerprints" msgstr "elenca le chiavi e le impronte digitali" -#: g10/g10.c:175 +#: g10/g10.c:176 msgid "list secret keys" msgstr "elenca le chiavi segrete" -#: g10/g10.c:177 +#: g10/g10.c:178 msgid "generate a new key pair" msgstr "genera una nuova coppia di chiavi" -#: g10/g10.c:179 +#: g10/g10.c:180 msgid "remove key from the public keyring" msgstr "rimuove una chiave dal portachiavi pubblico" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "sign or edit a key" msgstr "firma o modifica una chiave" -#: g10/g10.c:182 +#: g10/g10.c:183 msgid "generate a revocation certificate" msgstr "genera un certificato di revoca" -#: g10/g10.c:184 +#: g10/g10.c:185 msgid "export keys" msgstr "esporta delle chiavi" -#: g10/g10.c:187 +#: g10/g10.c:188 msgid "import/merge keys" msgstr "importa/aggiungi delle chiavi" -#: g10/g10.c:189 +#: g10/g10.c:190 msgid "list only the sequence of packets" msgstr "elenca solo la sequenza dei pacchetti" -#: g10/g10.c:192 +#: g10/g10.c:193 msgid "export the ownertrust values" msgstr "esporta i valori di fiducia" -#: g10/g10.c:194 +#: g10/g10.c:195 msgid "import ownertrust values" msgstr "importa i valori di fiducia" -#: g10/g10.c:196 +#: g10/g10.c:197 msgid "|[NAMES]|update the trust database" msgstr "|[NAMES]|controlla il database della fiducia" -#: g10/g10.c:198 +#: g10/g10.c:199 msgid "|[NAMES]|check the trust database" msgstr "|[NAMES]|controlla il database della fiducia" -#: g10/g10.c:199 +#: g10/g10.c:200 msgid "fix a corrupted trust database" msgstr "ripara un database della fiducia rovinato" -#: g10/g10.c:200 +#: g10/g10.c:201 msgid "De-Armor a file or stdin" msgstr "rimuovi l'armatura a un file o a stdin" -#: g10/g10.c:201 +#: g10/g10.c:202 msgid "En-Armor a file or stdin" msgstr "crea l'armatura a un file o a stdin" -#: g10/g10.c:202 +#: g10/g10.c:203 msgid "|algo [files]|print message digests" msgstr "|algo [files]|stampa tutti i message digests" -#: g10/g10.c:203 +#: g10/g10.c:204 msgid "print all message digests" msgstr "stampa tutti i message digests" -#: g10/g10.c:210 +#: g10/g10.c:211 msgid "" "@\n" "Options:\n" @@ -370,141 +370,141 @@ msgstr "" "Opzioni:\n" " " -#: g10/g10.c:212 +#: g10/g10.c:213 msgid "create ascii armored output" msgstr "crea un output ascii con armatura" -#: g10/g10.c:214 +#: g10/g10.c:215 msgid "use this user-id to sign or decrypt" msgstr "usa questo user-id per firmare o decifrare" -#: g10/g10.c:215 +#: g10/g10.c:216 msgid "use this user-id for encryption" msgstr "usa questo user-id per cifrare" -#: g10/g10.c:216 +#: g10/g10.c:217 msgid "|N|set compress level N (0 disables)" msgstr "|N|imposta il livello di compressione (0 disabilita)" -#: g10/g10.c:218 +#: g10/g10.c:219 msgid "use canonical text mode" msgstr "usa il modo testo canonico" -#: g10/g10.c:220 +#: g10/g10.c:221 msgid "use as output file" msgstr "usa come file di output" -#: g10/g10.c:221 +#: g10/g10.c:222 msgid "verbose" msgstr "prolisso" -#: g10/g10.c:222 +#: g10/g10.c:223 msgid "be somewhat more quiet" msgstr "meno prolisso" -#: g10/g10.c:223 +#: g10/g10.c:224 msgid "force v3 signatures" msgstr "forza l'uso di firme v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:225 +#: g10/g10.c:226 msgid "batch mode: never ask" msgstr "modo batch: non fare domande" -#: g10/g10.c:226 +#: g10/g10.c:227 msgid "assume yes on most questions" msgstr "assumi \"sЛ\" a quasi tutte le domande" -#: g10/g10.c:227 +#: g10/g10.c:228 msgid "assume no on most questions" msgstr "assumi \"no\" a quasi tutte le domande" -#: g10/g10.c:228 +#: g10/g10.c:229 msgid "add this keyring to the list of keyrings" msgstr "aggiungi questo portachiavi alla lista" -#: g10/g10.c:229 +#: g10/g10.c:230 msgid "add this secret keyring to the list" msgstr "aggiungi questo portachiavi segreto alla lista" -#: g10/g10.c:230 +#: g10/g10.c:231 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|usa NAME come chiave segreta predefinita" -#: g10/g10.c:231 +#: g10/g10.c:232 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:232 +#: g10/g10.c:233 msgid "read options from file" msgstr "leggi le opzioni dal file" -#: g10/g10.c:234 +#: g10/g10.c:235 msgid "set debugging flags" msgstr "imposta i flag di debugging" -#: g10/g10.c:235 +#: g10/g10.c:236 msgid "enable full debugging" msgstr "abilita il debugging completo" -#: g10/g10.c:236 +#: g10/g10.c:237 msgid "|FD|write status info to this FD" msgstr "|FD|scrivi le informazioni di stato su questo fd" -#: g10/g10.c:237 +#: g10/g10.c:238 msgid "do not write comment packets" msgstr "non scrivere pacchetti di commento" -#: g10/g10.c:238 +#: g10/g10.c:239 msgid "(default is 1)" msgstr "(predefinito Х 1)" -#: g10/g10.c:239 +#: g10/g10.c:240 msgid "(default is 3)" msgstr "(predefinito Х 3)" -#: g10/g10.c:241 +#: g10/g10.c:242 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:242 +#: g10/g10.c:243 msgid "|FILE|load extension module FILE" msgstr "|FILE|carica il modulo di estensione FILE" -#: g10/g10.c:243 +#: g10/g10.c:244 msgid "emulate the mode described in RFC1991" msgstr "emula il modo descritto nel RFC1991" -#: g10/g10.c:244 +#: g10/g10.c:245 msgid "|N|use passphrase mode N" msgstr "|N|usa il modo N per la passphrase" -#: g10/g10.c:246 +#: g10/g10.c:247 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:248 +#: g10/g10.c:249 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase" -#: g10/g10.c:250 +#: g10/g10.c:251 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:251 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:252 +#: g10/g10.c:253 msgid "|N|use compress algorithm N" msgstr "|N|usa l'algoritmo di compressione N" -#: g10/g10.c:253 +#: g10/g10.c:254 msgid "throw keyid field of encrypted packets" msgstr "elimina il campo keyid dei pacchetti crittografati" -#: g10/g10.c:261 +#: g10/g10.c:262 msgid "" "@\n" "Examples:\n" @@ -524,19 +524,19 @@ msgstr "" " --list-keys [nomi] mostra le chiavi\n" " --fingerprint [nomi] mostra le impronte digitali\n" -#: g10/g10.c:339 +#: g10/g10.c:341 msgid "Please report bugs to .\n" msgstr "Per favore segnala i bug a .\n" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Uso: gpgm [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:346 +#: g10/g10.c:348 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:351 +#: g10/g10.c:353 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -544,7 +544,7 @@ msgstr "" "Sintassi: gpgm [opzioni] [file]\n" "Utility di manutenzione di GnuPG\n" -#: g10/g10.c:354 +#: g10/g10.c:356 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -554,7 +554,7 @@ msgstr "" "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:360 +#: g10/g10.c:362 msgid "" "\n" "Supported algorithms:\n" @@ -562,151 +562,151 @@ msgstr "" "\n" "Algoritmi gestiti:\n" -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpgm [options] " msgstr "uso: gpgm [options] " -#: g10/g10.c:437 +#: g10/g10.c:439 msgid "usage: gpg [options] " msgstr "uso: gpg [options] " -#: g10/g10.c:478 +#: g10/g10.c:480 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:616 +#: g10/g10.c:618 #, fuzzy, c-format msgid "NOTE: no default option file '%s'\n" msgstr "nota: nessun file con opzioni predefinite '%s'\n" -#: g10/g10.c:620 +#: g10/g10.c:622 #, c-format msgid "option file '%s': %s\n" msgstr "file con opzioni predefinite '%s': %s\n" -#: g10/g10.c:627 +#: g10/g10.c:629 #, c-format msgid "reading options from '%s'\n" msgstr "lettura delle opzioni da '%s'\n" -#: g10/g10.c:776 +#: g10/g10.c:782 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "Carattere non valido nel commento\n" -#: g10/g10.c:810 g10/g10.c:822 +#: g10/g10.c:817 g10/g10.c:829 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non Х valido\n" -#: g10/g10.c:816 g10/g10.c:828 +#: g10/g10.c:823 g10/g10.c:835 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non Х valido\n" -#: g10/g10.c:831 +#: g10/g10.c:838 #, 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:833 +#: g10/g10.c:840 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:835 +#: g10/g10.c:842 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:837 +#: g10/g10.c:844 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:840 +#: g10/g10.c:847 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "nota: il modo S2K semplice (0) Х fortemente scoraggiato\n" -#: g10/g10.c:844 +#: g10/g10.c:851 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:927 +#: g10/g10.c:934 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:933 +#: g10/g10.c:940 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:941 +#: g10/g10.c:948 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:949 +#: g10/g10.c:956 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:962 +#: g10/g10.c:969 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:975 +#: g10/g10.c:982 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:989 +#: g10/g10.c:996 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:1001 +#: g10/g10.c:1008 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:1010 +#: g10/g10.c:1017 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key nomeutente" -#: g10/g10.c:1026 +#: g10/g10.c:1033 msgid "--delete-secret-key username" msgstr "--delete-secret-key nomeutente" -#: g10/g10.c:1029 +#: g10/g10.c:1036 msgid "--delete-key username" msgstr "--delete-key nomeutente" -#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire '%s': %s\n" -#: g10/g10.c:1063 +#: g10/g10.c:1070 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [userid] [portachiavi]" -#: g10/g10.c:1120 +#: g10/g10.c:1127 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:1128 +#: g10/g10.c:1135 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:1194 +#: g10/g10.c:1201 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "algoritmo di hash non valido '%s'\n" -#: g10/g10.c:1273 +#: g10/g10.c:1280 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:1277 +#: g10/g10.c:1284 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "impossibile aprire '%s'\n" @@ -770,7 +770,7 @@ msgstr "errore nella riga della coda\n" msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n" -#: g10/pkclist.c:121 +#: g10/pkclist.c:138 #, fuzzy, c-format msgid "" "No trust value assigned to %lu:\n" @@ -779,7 +779,7 @@ msgstr "" "Nessun valore di fiducia del proprietario definito per %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:131 +#: g10/pkclist.c:148 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -801,26 +801,31 @@ msgstr "" " 4 = Mi fido completamente\n" " s = mostrami ulteriori informazioni\n" -#: g10/pkclist.c:140 +#: g10/pkclist.c:157 msgid " m = back to the main menu\n" msgstr " m = ritorna al menЫ principale\n" +#: g10/pkclist.c:159 +msgid " q = quit\n" +msgstr "" + # 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:145 -msgid "sSmM" -msgstr "sSmM" +#: g10/pkclist.c:164 +#, fuzzy +msgid "sSmMqQ" +msgstr "sSmMqQ" -#: g10/pkclist.c:149 +#: g10/pkclist.c:168 msgid "Your decision? " msgstr "Cosa hai deciso? " -#: g10/pkclist.c:169 +#: g10/pkclist.c:188 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:197 +#: g10/pkclist.c:221 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" @@ -830,19 +835,19 @@ msgstr "" "se possiamo assegnare qualche valore di fiducia del proprietario mancante.\n" "\n" -#: g10/pkclist.c:219 +#: g10/pkclist.c:251 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" -#: g10/pkclist.c:221 +#: g10/pkclist.c:253 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "" -#: g10/pkclist.c:223 +#: g10/pkclist.c:255 #, fuzzy msgid "" "No trust values changed.\n" @@ -851,46 +856,46 @@ msgstr "" "Nessun valore di fiducia del proprietario modificato.\n" "\n" -#: g10/pkclist.c:238 +#: g10/pkclist.c:270 #, fuzzy, c-format msgid "key %08lX: key has been revoked!\n" msgstr "chiave %08lX: accettata come chiave segreta\n" -#: g10/pkclist.c:244 g10/pkclist.c:335 +#: g10/pkclist.c:276 g10/pkclist.c:369 msgid "Use this key anyway? " msgstr "Uso lo stesso questa chiave? " -#: g10/pkclist.c:266 +#: g10/pkclist.c:298 #, fuzzy, c-format msgid "%08lX: key has expired\n" msgstr "Nota: questa chiave Х scaduta!\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:304 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" -#: g10/pkclist.c:288 +#: g10/pkclist.c:322 #, fuzzy, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:328 #, 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:300 +#: g10/pkclist.c:334 msgid "This key probably belongs to the owner\n" msgstr "" -#: g10/pkclist.c:305 +#: g10/pkclist.c:339 msgid "This key belongs to us\n" msgstr "" -#: g10/pkclist.c:330 +#: g10/pkclist.c:364 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" @@ -902,51 +907,51 @@ msgstr "" "prossima domanda.\n" "\n" -#: g10/pkclist.c:339 +#: g10/pkclist.c:373 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENZIONE: uso di una chiave non fidata!\n" -#: g10/pkclist.c:375 +#: g10/pkclist.c:409 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATTENZIONE: questa chiave Х stata revocata dal suo proprietario!\n" -#: g10/pkclist.c:376 +#: g10/pkclist.c:410 msgid " This could mean that the signature is forgery.\n" msgstr " Questo puР significare che la firma Х stata falsificata.\n" -#: g10/pkclist.c:397 +#: g10/pkclist.c:431 msgid "Note: This key has expired!\n" msgstr "Nota: questa chiave Х scaduta!\n" -#: g10/pkclist.c:404 +#: g10/pkclist.c:438 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:406 +#: g10/pkclist.c:440 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:421 +#: g10/pkclist.c:456 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n" -#: g10/pkclist.c:422 +#: g10/pkclist.c:457 msgid " The signature is probably a FORGERY.\n" msgstr " La firma Х probabilmente un FALSO.\n" -#: g10/pkclist.c:429 +#: g10/pkclist.c:464 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:432 +#: g10/pkclist.c:467 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:477 +#: g10/pkclist.c:512 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -954,25 +959,25 @@ msgstr "" "Non hai specificato un user ID. (puoi usare \"-r\")\n" "\n" -#: g10/pkclist.c:482 +#: g10/pkclist.c:517 msgid "Enter the user ID: " msgstr "Inserisci l'user ID: " -#: g10/pkclist.c:493 +#: g10/pkclist.c:528 msgid "No such user ID.\n" msgstr "User ID inesistente.\n" -#: g10/pkclist.c:527 g10/pkclist.c:554 +#: g10/pkclist.c:562 g10/pkclist.c:589 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: saltata: %s\n" -#: g10/pkclist.c:535 +#: g10/pkclist.c:570 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: errore nel controllare la chiave: %s\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:596 msgid "no valid addressees\n" msgstr "nessun indirizzo valido\n" @@ -1330,7 +1335,7 @@ msgstr "" msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n" -#: g10/import.c:129 g10/trustdb.c:1166 +#: g10/import.c:129 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "impossibile aprire il file: %s\n" @@ -1340,12 +1345,12 @@ msgstr "impossibile aprire il file: %s\n" msgid "skipping block of type %d\n" msgstr "salto un blocco di tipo %d\n" -#: g10/import.c:152 g10/trustdb.c:1425 g10/trustdb.c:1494 +#: g10/import.c:152 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" msgstr "Per ora sono state esaminate %lu chiavi\n" -#: g10/import.c:157 g10/trustdb.c:1242 +#: g10/import.c:157 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "errore di lettura: %s\n" @@ -1428,7 +1433,7 @@ msgstr "chiave %08lX: chiave pubblica non trovata: %s\n" msgid "no default public keyring\n" msgstr "nessun portachiavi pubblico predefinito\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:569 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #, c-format msgid "writing to '%s'\n" msgstr "scrittura in '%s'\n" @@ -2077,6 +2082,11 @@ msgstr "" msgid "can't handle public key algorithm %d\n" msgstr "impossibile bloccare il portachiavi pubblico: %s\n" +#: g10/parse-packet.c:801 +#, c-format +msgid "subpacket of type %d has critical bit set\n" +msgstr "" + #: g10/passphrase.c:141 msgid "" "\n" @@ -2102,20 +2112,20 @@ msgstr "Inserisci la passphrase: " msgid "Repeat passphrase: " msgstr "Ripeti la passphrase: " -#: g10/plaintext.c:102 +#: g10/plaintext.c:103 msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n" -#: g10/plaintext.c:215 +#: g10/plaintext.c:216 msgid "Please enter name of data file: " msgstr "Inserisci il nome del file di dati: " -#: g10/plaintext.c:236 +#: g10/plaintext.c:237 msgid "reading stdin ...\n" msgstr "" -#: g10/plaintext.c:299 +#: g10/plaintext.c:300 #, c-format msgid "can't open signed data '%s'\n" msgstr "impossibile aprire i dati firmati '%s'\n" @@ -2172,12 +2182,16 @@ msgstr "" msgid "NOTE: signature key expired %s\n" msgstr "attenzione: firma della chiave scaduta il %s\n" +#: g10/sig-check.c:226 +msgid "assuming bad signature due to an unknown critical bit\n" +msgstr "" + #: g10/sign.c:69 #, fuzzy, c-format msgid "%s signature from: %s\n" msgstr "Firma NON corretta da \"" -#: g10/sign.c:200 g10/sign.c:564 +#: g10/sign.c:200 g10/sign.c:587 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "%s: impossibile creare: %s\n" @@ -2317,531 +2331,531 @@ msgstr "" msgid "%s: failed to append a record: %s\n" msgstr "" -#: g10/trustdb.c:134 +#: g10/trustdb.c:142 msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n" msgstr "Il trustdb Х rovinato; per favore esegui \"gpgm --fix-trust-db\".\n" -#: g10/trustdb.c:147 +#: g10/trustdb.c:155 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" msgstr "" -#: g10/trustdb.c:162 +#: g10/trustdb.c:170 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" msgstr "" -#: g10/trustdb.c:176 +#: g10/trustdb.c:184 #, fuzzy, c-format msgid "trust record %lu: delete failed: %s\n" msgstr "aggiornamento della chiave segreta fallito: %s\n" -#: g10/trustdb.c:190 +#: g10/trustdb.c:198 #, fuzzy, c-format msgid "trust db: sync failed: %s\n" msgstr "aggiornamento del trustdb fallito: %s\n" -#: g10/trustdb.c:319 +#: g10/trustdb.c:327 #, c-format msgid "error reading dir record for LID %lu: %s\n" msgstr "" -#: g10/trustdb.c:326 +#: g10/trustdb.c:334 #, c-format msgid "lid %lu: expected dir record, got type %d\n" msgstr "" -#: g10/trustdb.c:331 +#: g10/trustdb.c:339 #, c-format msgid "no primary key for LID %lu\n" msgstr "" -#: g10/trustdb.c:336 +#: g10/trustdb.c:344 #, fuzzy, c-format msgid "error reading primary key for LID %lu: %s\n" msgstr "errore nella creazione della passhprase: %s\n" -#: g10/trustdb.c:412 +#: g10/trustdb.c:420 #, c-format msgid "chained sigrec %lu has a wrong owner\n" msgstr "la chained sigrec %lu ha il proprietario sbagliato\n" -#: g10/trustdb.c:455 +#: g10/trustdb.c:463 #, fuzzy, c-format msgid "'%s' is not a valid long keyID\n" msgstr "Carattere non valido nel commento\n" -#: g10/trustdb.c:490 +#: g10/trustdb.c:498 #, fuzzy, c-format msgid "key %08lX: no public key for trusted key - skipped\n" msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" -#: g10/trustdb.c:499 g10/trustdb.c:557 +#: g10/trustdb.c:507 g10/trustdb.c:565 #, c-format msgid "key %08lX: can't put it into the trustdb\n" msgstr "chiave %08lX: impossibile metterla nel trustdb\n" -#: g10/trustdb.c:504 g10/trustdb.c:563 +#: g10/trustdb.c:512 g10/trustdb.c:571 #, c-format msgid "key %08lX: query record failed\n" msgstr "chiave %08lX: richiesta del record fallita\n" -#: g10/trustdb.c:509 g10/trustdb.c:572 +#: g10/trustdb.c:517 g10/trustdb.c:580 #, fuzzy, c-format msgid "key %08lX: already in trusted key table\n" msgstr "chiave %08lX: giЮ nella tabella delle chiavi segrete\n" -#: g10/trustdb.c:512 g10/trustdb.c:575 +#: g10/trustdb.c:520 g10/trustdb.c:583 #, fuzzy, c-format msgid "key %08lX: accepted as trusted key.\n" msgstr "chiave %08lX: accettata come chiave segreta\n" -#: g10/trustdb.c:528 +#: g10/trustdb.c:536 #, fuzzy, c-format msgid "NOTE: secret key %08lX is NOT protected.\n" msgstr "Questa chiave non Х protetta.\n" -#: g10/trustdb.c:540 +#: g10/trustdb.c:548 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" -#: g10/trustdb.c:547 +#: g10/trustdb.c:555 #, c-format msgid "key %08lX: secret and public key don't match\n" msgstr "chiave %08lX: le chiavi segreta e pubblica non corrispondono\n" -#: g10/trustdb.c:583 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "enumerate secret keys failed: %s\n" msgstr "enum_secret_keys fallito: %s\n" -#: g10/trustdb.c:766 +#: g10/trustdb.c:774 #, fuzzy, c-format msgid "lid %lu: read dir record failed: %s\n" msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" -#: g10/trustdb.c:775 +#: g10/trustdb.c:783 #, fuzzy, c-format msgid "lid %lu: read key record failed: %s\n" msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" -#: g10/trustdb.c:785 +#: g10/trustdb.c:793 #, fuzzy, c-format msgid "lid %lu: read uid record failed: %s\n" msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" -#: g10/trustdb.c:794 +#: g10/trustdb.c:802 #, fuzzy, c-format msgid "lid %lu: read pref record failed: %s\n" msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" -#: g10/trustdb.c:804 +#: g10/trustdb.c:812 #, fuzzy, c-format msgid "lid %lu: read sig record failed: %s\n" msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" -#: g10/trustdb.c:999 +#: g10/trustdb.c:1013 msgid "Ooops, no keys\n" msgstr "" -#: g10/trustdb.c:1003 +#: g10/trustdb.c:1017 #, fuzzy msgid "Ooops, no user ids\n" msgstr "elenca le chiavi e gli user id" -#: g10/trustdb.c:1074 g10/trustdb.c:1092 +#: g10/trustdb.c:1088 g10/trustdb.c:1106 #, c-format msgid "user '%s' read problem: %s\n" msgstr "" -#: g10/trustdb.c:1077 g10/trustdb.c:1095 +#: g10/trustdb.c:1091 g10/trustdb.c:1109 #, c-format msgid "user '%s' list problem: %s\n" msgstr "" -#: g10/trustdb.c:1085 g10/trustdb.c:1300 +#: g10/trustdb.c:1099 g10/trustdb.c:1346 #, fuzzy, c-format msgid "user '%s' not found: %s\n" msgstr "%s: utente non trovato\n" -#: g10/trustdb.c:1087 g10/trustdb.c:1302 +#: g10/trustdb.c:1101 g10/trustdb.c:1348 #, c-format msgid "problem finding '%s' in trustdb: %s\n" msgstr "" -#: g10/trustdb.c:1090 +#: g10/trustdb.c:1104 #, c-format msgid "user '%s' not in trustdb\n" msgstr "" -#: g10/trustdb.c:1125 +#: g10/trustdb.c:1139 #, c-format msgid "" "# List of assigned trustvalues, created %s\n" "# (Use \"gpgm --import-ownertrust\" to restore them)\n" msgstr "" -#: g10/trustdb.c:1131 +#: g10/trustdb.c:1145 msgid "directory record w/o primary key\n" msgstr "" -#: g10/trustdb.c:1138 +#: g10/trustdb.c:1152 #, fuzzy, c-format msgid "error reading key record: %s\n" msgstr "%s: errore nel controllare la chiave: %s\n" -#: g10/trustdb.c:1178 +#: g10/trustdb.c:1192 msgid "line too long\n" msgstr "" -#: g10/trustdb.c:1186 +#: g10/trustdb.c:1200 msgid "error: missing colon\n" msgstr "" -#: g10/trustdb.c:1191 +#: g10/trustdb.c:1205 #, fuzzy msgid "error: invalid fingerprint\n" msgstr "errore nella riga della coda\n" -#: g10/trustdb.c:1195 +#: g10/trustdb.c:1209 #, fuzzy msgid "error: no ownertrust value\n" msgstr "esporta i valori di fiducia" -#: g10/trustdb.c:1209 +#: g10/trustdb.c:1223 #, c-format msgid "LID %lu: changing trust from %u to %u\n" msgstr "" -#: g10/trustdb.c:1212 +#: g10/trustdb.c:1226 #, c-format msgid "LID %lu: setting trust to %u\n" msgstr "" -#: g10/trustdb.c:1220 +#: g10/trustdb.c:1234 msgid "key not in trustdb, searching ring.\n" msgstr "" -#: g10/trustdb.c:1223 +#: g10/trustdb.c:1237 #, fuzzy, c-format msgid "key not in ring: %s\n" msgstr "impossibile scrivere il portachiavi: %s\n" -#: g10/trustdb.c:1227 +#: g10/trustdb.c:1241 msgid "Oops: key is now in trustdb???\n" msgstr "" #. update the ownertrust -#: g10/trustdb.c:1232 +#: g10/trustdb.c:1246 #, fuzzy, c-format msgid "insert trust record failed: %s\n" msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" #. error -#: g10/trustdb.c:1238 +#: g10/trustdb.c:1252 #, fuzzy, c-format msgid "error finding dir record: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/trustdb.c:1305 +#: g10/trustdb.c:1351 #, c-format msgid "user '%s' not in trustdb - inserting\n" msgstr "" -#: g10/trustdb.c:1308 +#: g10/trustdb.c:1354 #, fuzzy, c-format msgid "failed to put '%s' into trustdb: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/trustdb.c:1355 +#: g10/trustdb.c:1404 #, c-format msgid "%s: keyblock read problem: %s\n" msgstr "" -#: g10/trustdb.c:1369 +#: g10/trustdb.c:1418 #, fuzzy, c-format msgid "%s: update failed: %s\n" msgstr "aggiornamento fallito: %s\n" -#: g10/trustdb.c:1372 +#: g10/trustdb.c:1421 #, fuzzy, c-format msgid "%s: updated\n" msgstr "\\t%lu chiavi aggiornate\n" -#: g10/trustdb.c:1374 +#: g10/trustdb.c:1423 #, c-format msgid "%s: okay\n" msgstr "" -#: g10/trustdb.c:1389 +#: g10/trustdb.c:1438 #, c-format msgid "lid %lu: dir record w/o key - skipped\n" msgstr "" -#: g10/trustdb.c:1402 +#: g10/trustdb.c:1451 #, fuzzy, c-format msgid "lid %lu: keyblock not found: %s\n" msgstr "chiave %08lX: chiave pubblica non trovata: %s\n" -#: g10/trustdb.c:1411 g10/trustdb.c:1480 +#: g10/trustdb.c:1460 g10/trustdb.c:1529 #, fuzzy, c-format msgid "lid %lu: update failed: %s\n" msgstr "aggiornamento fallito: %s\n" -#: g10/trustdb.c:1417 g10/trustdb.c:1486 +#: g10/trustdb.c:1466 g10/trustdb.c:1535 #, fuzzy, c-format msgid "lid %lu: updated\n" msgstr "\\t%lu chiavi aggiornate\n" -#: g10/trustdb.c:1421 g10/trustdb.c:1490 +#: g10/trustdb.c:1470 g10/trustdb.c:1539 #, fuzzy, c-format msgid "lid %lu: okay\n" msgstr "lid %lu: manca la chiave primaria\n" -#: g10/trustdb.c:1428 g10/trustdb.c:1496 +#: g10/trustdb.c:1477 g10/trustdb.c:1545 #, c-format msgid "%lu keys processed\n" msgstr "%lu chiavi esaminate\n" -#: g10/trustdb.c:1430 +#: g10/trustdb.c:1479 #, c-format msgid "\t%lu keys skipped\n" msgstr "\\t%lu chiavi saltate\n" -#: g10/trustdb.c:1432 g10/trustdb.c:1498 +#: g10/trustdb.c:1481 g10/trustdb.c:1547 #, c-format msgid "\t%lu keys with errors\n" msgstr "\\t%lu chiavi con errori\n" -#: g10/trustdb.c:1434 g10/trustdb.c:1500 +#: g10/trustdb.c:1483 g10/trustdb.c:1549 #, c-format msgid "\t%lu keys updated\n" msgstr "\\t%lu chiavi aggiornate\n" -#: g10/trustdb.c:1464 +#: g10/trustdb.c:1513 #, fuzzy, c-format msgid "lid ?: insert failed: %s\n" msgstr "aggiornamento della chiave segreta fallito: %s\n" -#: g10/trustdb.c:1469 +#: g10/trustdb.c:1518 #, fuzzy, c-format msgid "lid %lu: insert failed: %s\n" msgstr "aggiornamento della chiave segreta fallito: %s\n" -#: g10/trustdb.c:1475 +#: g10/trustdb.c:1524 #, fuzzy, c-format msgid "lid %lu: inserted\n" msgstr "\\t%lu chiavi inserite\n" -#: g10/trustdb.c:1502 +#: g10/trustdb.c:1551 #, c-format msgid "\t%lu keys inserted\n" msgstr "\\t%lu chiavi inserite\n" -#: g10/trustdb.c:1505 +#: g10/trustdb.c:1554 #, fuzzy, c-format msgid "enumerate keyblocks failed: %s\n" msgstr "enum_secret_keys fallito: %s\n" -#: g10/trustdb.c:1550 +#: g10/trustdb.c:1599 #, fuzzy, c-format msgid "check_trust: search dir record failed: %s\n" msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" -#: g10/trustdb.c:1557 +#: g10/trustdb.c:1606 #, c-format msgid "key %08lX: insert trust record failed: %s\n" msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" -#: g10/trustdb.c:1561 +#: g10/trustdb.c:1610 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" msgstr "chiave %08lX.%lu: inserita nel trustdb\n" -#: g10/trustdb.c:1569 +#: g10/trustdb.c:1618 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "" "chiave %08lX.%lu: creata nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/trustdb.c:1576 +#: g10/trustdb.c:1625 #, c-format msgid "key %08lX.%lu: expired at %s\n" msgstr "chiave %08lX.%lu: scaduta il %s\n" -#: g10/trustdb.c:1584 +#: g10/trustdb.c:1633 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n" -#: g10/trustdb.c:1753 g10/trustdb.c:1782 g10/trustdb.c:2521 +#: g10/trustdb.c:1820 g10/trustdb.c:1849 g10/trustdb.c:2588 msgid "WARNING: can't yet handle long pref records\n" msgstr "" -#: g10/trustdb.c:1804 +#: g10/trustdb.c:1871 #, fuzzy, c-format msgid "get_dir_record: search_record failed: %s\n" msgstr "aggiornamento della chiave segreta fallito: %s\n" -#: g10/trustdb.c:1867 +#: g10/trustdb.c:1934 #, fuzzy, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" msgstr "" "nota: rec di %lu[%d] nella hintlist di %lu ma marcato come verificato\n" -#: g10/trustdb.c:1871 +#: g10/trustdb.c:1938 #, fuzzy, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n" msgstr "nota: rec di %lu[%d] nella hintlist di %lu ma non marcato\n" #. we need the dir record -#: g10/trustdb.c:1878 +#: g10/trustdb.c:1945 #, c-format 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" -#: g10/trustdb.c:1884 +#: g10/trustdb.c:1951 #, c-format msgid "lid %lu: no primary key\n" msgstr "lid %lu: manca la chiave primaria\n" -#: g10/trustdb.c:1917 +#: g10/trustdb.c:1984 #, c-format msgid "lid %lu: user id not found in keyblock\n" msgstr "lid %lu: user id non trovato nel keyblock\n" -#: g10/trustdb.c:1921 +#: g10/trustdb.c:1988 #, c-format msgid "lid %lu: user id without signature\n" msgstr "chiave %08lX: user id senza firma\n" -#: g10/trustdb.c:1928 +#: g10/trustdb.c:1995 #, c-format msgid "lid %lu: self-signature in hintlist\n" msgstr "lid %lu: autofirma nella hintlist\n" -#: g10/trustdb.c:1939 g10/trustdb.c:2658 g10/trustdb.c:2742 +#: g10/trustdb.c:2006 g10/trustdb.c:2725 g10/trustdb.c:2809 msgid "Valid certificate revocation" msgstr "Revoca del certificato valida" -#: g10/trustdb.c:1940 g10/trustdb.c:2659 g10/trustdb.c:2743 +#: g10/trustdb.c:2007 g10/trustdb.c:2726 g10/trustdb.c:2810 msgid "Good certificate" msgstr "Certificato corretto" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:2016 msgid "very strange: no public key\n" msgstr "molto strano: non ci sono chiavi pubbliche\n" -#: g10/trustdb.c:1997 +#: g10/trustdb.c:2064 #, c-format 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" -#: g10/trustdb.c:2003 +#: g10/trustdb.c:2070 #, c-format msgid "lid %lu does not have a key\n" msgstr "Il lid %lu non ha una chiave\n" -#: g10/trustdb.c:2013 +#: g10/trustdb.c:2080 #, c-format msgid "lid %lu: can't get keyblock: %s\n" msgstr "lid %lu: impossibile ottenere il keyblock: %s\n" -#: g10/trustdb.c:2070 g10/trustdb.c:2984 +#: g10/trustdb.c:2137 g10/trustdb.c:3051 #, fuzzy, c-format msgid "tdbio_search_dir failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/trustdb.c:2223 +#: g10/trustdb.c:2290 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n" -#: g10/trustdb.c:2229 g10/trustdb.c:2271 +#: g10/trustdb.c:2296 g10/trustdb.c:2338 #, c-format msgid "key %08lX.%lu: Invalid subkey binding: %s\n" msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n" -#: g10/trustdb.c:2244 +#: g10/trustdb.c:2311 #, c-format msgid "key %08lX.%lu: Valid key revocation\n" msgstr "chiave %08lX.%lu: Revoca della chiave valida\n" -#: g10/trustdb.c:2250 +#: g10/trustdb.c:2317 #, c-format msgid "key %08lX.%lu: Invalid key revocation: %s\n" msgstr "chiave %08lX.%lu: Revoca della chiave non valida: %s\n" -#: g10/trustdb.c:2265 +#: g10/trustdb.c:2332 #, c-format msgid "key %08lX.%lu: Valid subkey revocation\n" msgstr "chiave %08lX.%lu: Revoca della subchiave valida\n" -#: g10/trustdb.c:2365 +#: g10/trustdb.c:2432 msgid "Good self-signature" msgstr "Autofirma corretta" -#: g10/trustdb.c:2376 +#: g10/trustdb.c:2443 msgid "Invalid self-signature" msgstr "Autofirma non valida" -#: g10/trustdb.c:2386 +#: g10/trustdb.c:2453 msgid "Valid user ID revocation skipped due to a newer self signature\n" msgstr "" -#: g10/trustdb.c:2393 +#: g10/trustdb.c:2460 msgid "Valid user ID revocation\n" msgstr "Revoca dell'user ID valida\n" -#: g10/trustdb.c:2400 +#: g10/trustdb.c:2467 msgid "Invalid user ID revocation" msgstr "Revoca dell'user ID non valida" -#: g10/trustdb.c:2484 +#: g10/trustdb.c:2551 msgid "Too many preferences" msgstr "Troppe preferenze" -#: g10/trustdb.c:2498 +#: g10/trustdb.c:2565 #, fuzzy msgid "Too many preference items" msgstr "Troppi elementi di preferenza" -#: g10/trustdb.c:2637 +#: g10/trustdb.c:2704 msgid "Duplicated certificate - deleted" msgstr "Certificato doppio - cancellato" -#: g10/trustdb.c:2670 +#: g10/trustdb.c:2737 #, fuzzy msgid "Hmmm, public key lost?" msgstr "chiave pubblica perduta" -#: g10/trustdb.c:2680 g10/trustdb.c:2763 +#: g10/trustdb.c:2747 g10/trustdb.c:2830 msgid "Invalid certificate revocation" msgstr "Certificato di revoca non valido" -#: g10/trustdb.c:2681 g10/trustdb.c:2764 +#: g10/trustdb.c:2748 g10/trustdb.c:2831 msgid "Invalid certificate" msgstr "Certificato non valido" -#: g10/trustdb.c:2696 +#: g10/trustdb.c:2763 #, c-format msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" msgstr "" -#: g10/trustdb.c:2710 +#: g10/trustdb.c:2777 #, fuzzy, c-format msgid "sig record %lu[%d] points to wrong record.\n" msgstr "Il rec di %lu[%d] nella hintlist di %lu non punta a un record dir\n" #. that should never happen -#: g10/trustdb.c:2954 +#: g10/trustdb.c:3021 #, fuzzy, c-format msgid "insert_trust_record: keyblock not found: %s\n" msgstr "chiave %08lX: chiave segreta non trovata: %s\n" -#: g10/trustdb.c:2972 +#: g10/trustdb.c:3039 msgid "did not use primary key for insert_trust_record()\n" msgstr "" @@ -2940,124 +2954,124 @@ msgstr "" "ho provato %d volte!\n" #. begin of list -#: g10/helptext.c:45 +#: g10/helptext.c:48 msgid "edit_ownertrust.value" msgstr "edit_ownertrust.value" -#: g10/helptext.c:51 +#: g10/helptext.c:54 msgid "revoked_key.override" msgstr "revoked_key.override" -#: g10/helptext.c:55 +#: g10/helptext.c:58 msgid "untrusted_key.override" msgstr "untrusted_key.override" -#: g10/helptext.c:59 +#: g10/helptext.c:62 msgid "pklist.user_id.enter" msgstr "pklist.user_id.enter" -#: g10/helptext.c:63 +#: g10/helptext.c:66 msgid "keygen.algo" msgstr "keygen.algo" -#: g10/helptext.c:79 +#: g10/helptext.c:82 #, fuzzy msgid "keygen.algo.elg_se" msgstr "keygen.algo" -#: g10/helptext.c:86 +#: g10/helptext.c:89 msgid "keygen.size" msgstr "keygen.size" -#: g10/helptext.c:90 +#: g10/helptext.c:93 msgid "keygen.size.huge.okay" msgstr "keygen.size.huge.okay" -#: g10/helptext.c:95 +#: g10/helptext.c:98 msgid "keygen.size.large.okay" msgstr "keygen.size.large.okay" -#: g10/helptext.c:100 +#: g10/helptext.c:103 msgid "keygen.valid" msgstr "keygen.valid" -#: g10/helptext.c:104 +#: g10/helptext.c:107 msgid "keygen.valid.okay" msgstr "keygen.valid.okay" -#: g10/helptext.c:109 +#: g10/helptext.c:112 msgid "keygen.name" msgstr "keygen.name" -#: g10/helptext.c:114 +#: g10/helptext.c:117 msgid "keygen.email" msgstr "keygen.email" -#: g10/helptext.c:118 +#: g10/helptext.c:121 msgid "keygen.comment" msgstr "keygen.comment" -#: g10/helptext.c:123 +#: g10/helptext.c:126 msgid "keygen.userid.cmd" msgstr "keygen.userid.cmd" -#: g10/helptext.c:132 +#: g10/helptext.c:135 msgid "keygen.sub.okay" msgstr "keygen.sub.okay" -#: g10/helptext.c:136 +#: g10/helptext.c:139 msgid "sign_uid.okay" msgstr "sign_uid.okay" -#: g10/helptext.c:141 +#: g10/helptext.c:144 msgid "change_passwd.empty.okay" msgstr "change_passwd.empty.okay" -#: g10/helptext.c:146 +#: g10/helptext.c:149 msgid "keyedit.cmd" msgstr "keyedit.cmd" -#: g10/helptext.c:150 +#: g10/helptext.c:153 msgid "keyedit.save.okay" msgstr "keyedit.save.okay" -#: g10/helptext.c:155 +#: g10/helptext.c:158 msgid "keyedit.cancel.okay" msgstr "keyedit.cancel.okay" -#: g10/helptext.c:159 +#: g10/helptext.c:162 msgid "keyedit.sign_all.okay" msgstr "keyedit.sign_all.okay" -#: g10/helptext.c:163 +#: g10/helptext.c:166 msgid "keyedit.remove.uid.okay" msgstr "keyedit.remove.uid.okay" -#: g10/helptext.c:168 +#: g10/helptext.c:171 msgid "keyedit.remove.subkey.okay" msgstr "keyedit.remove.subkey.okay" -#: g10/helptext.c:172 +#: g10/helptext.c:175 msgid "passphrase.enter" msgstr "passphrase.enter" -#: g10/helptext.c:179 +#: g10/helptext.c:182 msgid "passphrase.repeat" msgstr "passphrase.repeat" -#: g10/helptext.c:183 +#: g10/helptext.c:186 msgid "detached_signature.filename" msgstr "detached_signature.filename" -#: g10/helptext.c:187 +#: g10/helptext.c:190 msgid "openfile.overwrite.okay" msgstr "openfile.overwrite.okay" -#: g10/helptext.c:201 +#: g10/helptext.c:204 msgid "No help available" msgstr "Nessun aiuto disponibile" -#: g10/helptext.c:213 +#: g10/helptext.c:216 #, c-format msgid "No help available for '%s'" msgstr "Nessun aiuto disponibile per '%s'" diff --git a/po/pt_BR.po b/po/pt_BR.po index a68a39607..ac40974d8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1998-12-10 20:11+0100\n" +"POT-Creation-Date: 1998-12-17 18:30+0100\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-20 23:46:36-0200\n" "From: Thiago Jung Bauermann \n" @@ -210,11 +210,11 @@ msgstr "... isto msgid "you found a bug ... (%s:%d)\n" msgstr "vocЙ encontrou um bug ... (%s:%d)\n" -#: cipher/random.c:412 +#: cipher/random.c:406 msgid "WARNING: using insecure random number generator!!\n" msgstr "AVISO: usando gerador de nЗmeros aleatСrios inseguro!\n" -#: cipher/random.c:413 +#: cipher/random.c:407 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -228,7 +228,7 @@ msgstr "" "NцO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n" "\n" -#: cipher/rndlinux.c:116 +#: cipher/rndlinux.c:118 #, c-format msgid "" "\n" @@ -240,7 +240,7 @@ msgstr "" "para que o sistema possa coletar mais entropia!\n" "(SЦo necessАrios mais %d bytes)\n" -#: g10/g10.c:159 +#: g10/g10.c:160 msgid "" "@Commands:\n" " " @@ -248,123 +248,123 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:162 +#: g10/g10.c:163 msgid "|[file]|make a signature" msgstr "|[arquivo]|faz uma assinatura" -#: g10/g10.c:163 +#: g10/g10.c:164 msgid "|[file]|make a clear text signature" msgstr "|[arquivo]|faz uma assinatura em texto puro" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "make a detached signature" msgstr "faz uma assinatura separada" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encrypt data" msgstr "codifica dados" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "encryption only with symmetric cipher" msgstr "codifica apenas com criptografia simИtrica" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "store only" msgstr "apenas armazena" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "decrypt data (default)" msgstr "decodifica dados (padrЦo)" -#: g10/g10.c:169 +#: g10/g10.c:170 msgid "verify a signature" msgstr "verifica uma assinatura" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys" msgstr "lista as chaves" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "list keys and signatures" msgstr "lista as chaves e as assinaturas" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "check key signatures" msgstr "confere as assinaturas das chaves" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list keys and fingerprints" msgstr "lista as chaves e as impressУes digitais" -#: g10/g10.c:175 +#: g10/g10.c:176 msgid "list secret keys" msgstr "lista as chaves secretas" -#: g10/g10.c:177 +#: g10/g10.c:178 msgid "generate a new key pair" msgstr "gera um novo par de chaves" -#: g10/g10.c:179 +#: g10/g10.c:180 msgid "remove key from the public keyring" msgstr "remove a chave do anel de chaves pЗblico" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "sign or edit a key" msgstr "assina ou edita uma chave" -#: g10/g10.c:182 +#: g10/g10.c:183 msgid "generate a revocation certificate" msgstr "gera um certificado de revogaГЦo" -#: g10/g10.c:184 +#: g10/g10.c:185 msgid "export keys" msgstr "exporta as chaves" -#: g10/g10.c:187 +#: g10/g10.c:188 msgid "import/merge keys" msgstr "importa/funde as chaves" -#: g10/g10.c:189 +#: g10/g10.c:190 msgid "list only the sequence of packets" msgstr "lista apenas as seqЭЙncias de pacotes" -#: g10/g10.c:192 +#: g10/g10.c:193 msgid "export the ownertrust values" msgstr "exporta os valores de confianГa" -#: g10/g10.c:194 +#: g10/g10.c:195 msgid "import ownertrust values" msgstr "importa os valores de confianГa" -#: g10/g10.c:196 +#: g10/g10.c:197 msgid "|[NAMES]|update the trust database" msgstr "|[NOMES]|atualiza o banco de dados de confianГa" -#: g10/g10.c:198 +#: g10/g10.c:199 msgid "|[NAMES]|check the trust database" msgstr "|[NOMES]|confere o banco de dados de confianГa" -#: g10/g10.c:199 +#: g10/g10.c:200 msgid "fix a corrupted trust database" msgstr "conserta um banco de dados de confianГa danificado" -#: g10/g10.c:200 +#: g10/g10.c:201 msgid "De-Armor a file or stdin" msgstr "Retira a armadura de um arquivo ou \"stdin\"" -#: g10/g10.c:201 +#: g10/g10.c:202 msgid "En-Armor a file or stdin" msgstr "Cria armadura para um arquivo ou \"stdin\"" -#: g10/g10.c:202 +#: g10/g10.c:203 msgid "|algo [files]|print message digests" msgstr "|algo [arquivos]|imprime \"digests\" de mensagens" -#: g10/g10.c:203 +#: g10/g10.c:204 msgid "print all message digests" msgstr "imprime todos os \"digests\" de mensagens" -#: g10/g10.c:210 +#: g10/g10.c:211 msgid "" "@\n" "Options:\n" @@ -374,145 +374,145 @@ msgstr "" "OpГУes:\n" " " -#: g10/g10.c:212 +#: g10/g10.c:213 msgid "create ascii armored output" msgstr "cria uma saМda ascii com armadura" -#: g10/g10.c:214 +#: g10/g10.c:215 msgid "use this user-id to sign or decrypt" msgstr "usa este identificador de usuАrio para assinar ou decodificar" -#: g10/g10.c:215 +#: g10/g10.c:216 msgid "use this user-id for encryption" msgstr "usa este identificador de usuАrio para codificar" -#: g10/g10.c:216 +#: g10/g10.c:217 msgid "|N|set compress level N (0 disables)" msgstr "|N|estabelece nМvel de compressЦo N (0 desabilita)" -#: g10/g10.c:218 +#: g10/g10.c:219 msgid "use canonical text mode" msgstr "usa modo de texto canТnico" -#: g10/g10.c:220 +#: g10/g10.c:221 msgid "use as output file" msgstr "usa como arquivo de saМda" -#: g10/g10.c:221 +#: g10/g10.c:222 msgid "verbose" msgstr "prolixo" -#: g10/g10.c:222 +#: g10/g10.c:223 msgid "be somewhat more quiet" msgstr "ser mais silencioso" -#: g10/g10.c:223 +#: g10/g10.c:224 msgid "force v3 signatures" msgstr "forГa assinaturas v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:225 +#: g10/g10.c:226 msgid "batch mode: never ask" msgstr "processo de lote: nunca perguntar" -#: g10/g10.c:226 +#: g10/g10.c:227 msgid "assume yes on most questions" msgstr "assumir sim para a maioria das perguntas" -#: g10/g10.c:227 +#: g10/g10.c:228 msgid "assume no on most questions" msgstr "assumir nЦo para a maioria das perguntas" -#: g10/g10.c:228 +#: g10/g10.c:229 msgid "add this keyring to the list of keyrings" msgstr "adiciona este anel de chaves Ю lista de anИis de chaves" -#: g10/g10.c:229 +#: g10/g10.c:230 msgid "add this secret keyring to the list" msgstr "adiciona este anel de chaves secreto Ю lista" -#: g10/g10.c:230 +#: g10/g10.c:231 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usa NOME como chave secreta padrЦo" -#: g10/g10.c:231 +#: g10/g10.c:232 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME" -#: g10/g10.c:232 +#: g10/g10.c:233 msgid "read options from file" msgstr "lЙ opГУes do arquivo" -#: g10/g10.c:234 +#: g10/g10.c:235 msgid "set debugging flags" msgstr "estabelece parБmetros de depuraГЦo" -#: g10/g10.c:235 +#: g10/g10.c:236 msgid "enable full debugging" msgstr "habilita depuraГЦo completa" -#: g10/g10.c:236 +#: g10/g10.c:237 msgid "|FD|write status info to this FD" msgstr "|DA|escreve informaГУes de status para este DA" -#: g10/g10.c:237 +#: g10/g10.c:238 msgid "do not write comment packets" msgstr "nЦo escreve pacotes de comentАrio" -#: g10/g10.c:238 +#: g10/g10.c:239 msgid "(default is 1)" msgstr "(o padrЦo И 1)" -#: g10/g10.c:239 +#: g10/g10.c:240 msgid "(default is 3)" msgstr "(o padrЦo И 3)" -#: g10/g10.c:241 +#: g10/g10.c:242 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:242 +#: g10/g10.c:243 msgid "|FILE|load extension module FILE" msgstr "|ARQUIVO|carrega mСdulo de extensЦo ARQUIVO" -#: g10/g10.c:243 +#: g10/g10.c:244 msgid "emulate the mode described in RFC1991" msgstr "emula o modo descrito no RFC1991" -#: g10/g10.c:244 +#: g10/g10.c:245 msgid "|N|use passphrase mode N" msgstr "|N|usa frase secreta modo N" -#: g10/g10.c:246 +#: g10/g10.c:247 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:248 +#: g10/g10.c:249 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOME|usa algoritmo de criptografia NOME para\n" "frases secretas" -#: g10/g10.c:250 +#: g10/g10.c:251 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOME|usa algoritmo de criptografia NOME" -#: g10/g10.c:251 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME" -#: g10/g10.c:252 +#: g10/g10.c:253 msgid "|N|use compress algorithm N" msgstr "|N|usa algoritmo de compressЦo N" -#: g10/g10.c:253 +#: g10/g10.c:254 msgid "throw keyid field of encrypted packets" msgstr "elimina o campo keyid dos pacotes codificados" -#: g10/g10.c:261 +#: g10/g10.c:262 msgid "" "@\n" "Examples:\n" @@ -532,19 +532,19 @@ msgstr "" " --list-keys [nomes] mostra chaves\n" " --fingerprint [nomes] mostra impressУes digitais\n" -#: g10/g10.c:339 +#: g10/g10.c:341 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Uso: gpgm [opГУes] [arquivos] (-h para ajuda)" -#: g10/g10.c:346 +#: g10/g10.c:348 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opГУes] [arquivos] (-h para ajuda)" -#: g10/g10.c:351 +#: g10/g10.c:353 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -552,7 +552,7 @@ msgstr "" "Sintaxe: gpgm [opГУes] [arquivos]\n" "UtilitАrio de manutenГЦo do GnuPG\n" -#: g10/g10.c:354 +#: g10/g10.c:356 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -562,7 +562,7 @@ msgstr "" "assina, verifica, codifica ou decodifica\n" "a operaГЦo padrЦo depende dos dados de entrada\n" -#: g10/g10.c:360 +#: g10/g10.c:362 msgid "" "\n" "Supported algorithms:\n" @@ -570,149 +570,149 @@ msgstr "" "\n" "Algoritmos suportados:\n" -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpgm [options] " msgstr "Uso: gpgm [opГУes] " -#: g10/g10.c:437 +#: g10/g10.c:439 msgid "usage: gpg [options] " msgstr "uso: gpg [opГУes] " -#: g10/g10.c:478 +#: g10/g10.c:480 msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:616 +#: g10/g10.c:618 #, c-format msgid "NOTE: no default option file '%s'\n" msgstr "NOTA: arquivo de opГУes padrЦo '%s' inexistente\n" -#: g10/g10.c:620 +#: g10/g10.c:622 #, c-format msgid "option file '%s': %s\n" msgstr "arquivo de opГУes '%s': %s\n" -#: g10/g10.c:627 +#: g10/g10.c:629 #, c-format msgid "reading options from '%s'\n" msgstr "lendo opГУes de '%s'\n" -#: g10/g10.c:776 +#: g10/g10.c:782 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nЦo И um mapa de caracteres vАlido\n" -#: g10/g10.c:810 g10/g10.c:822 +#: g10/g10.c:817 g10/g10.c:829 msgid "selected cipher algorithm is invalid\n" msgstr "algoritmo de criptografia selecionado nЦo И vАlido\n" -#: g10/g10.c:816 g10/g10.c:828 +#: g10/g10.c:823 g10/g10.c:835 msgid "selected digest algorithm is invalid\n" msgstr "algoritmo de \"digest\" selecionado nЦo И vАlido\n" -#: g10/g10.c:831 +#: g10/g10.c:838 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "algoritmo de compressЦo deve estar na faixa %d..%d\n" -#: g10/g10.c:833 +#: g10/g10.c:840 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:835 +#: g10/g10.c:842 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:837 +#: g10/g10.c:844 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:840 +#: g10/g10.c:847 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:844 +#: g10/g10.c:851 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:927 +#: g10/g10.c:934 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confianГa: %s\n" -#: g10/g10.c:933 +#: g10/g10.c:940 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:941 +#: g10/g10.c:948 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:949 +#: g10/g10.c:956 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:962 +#: g10/g10.c:969 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:975 +#: g10/g10.c:982 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:989 +#: g10/g10.c:996 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:1001 +#: g10/g10.c:1008 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:1010 +#: g10/g10.c:1017 msgid "--edit-key username [commands]" msgstr "--edit-key nome_do_usuАrio [comandos]" -#: g10/g10.c:1026 +#: g10/g10.c:1033 msgid "--delete-secret-key username" msgstr "--delete-secret-key nome_do_usuАrio" -#: g10/g10.c:1029 +#: g10/g10.c:1036 msgid "--delete-key username" msgstr "--delete-key nome_do_usuАrio" -#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "impossМvel abrir %s: %s\n" -#: g10/g10.c:1063 +#: g10/g10.c:1070 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [id_do_usuАrio] [anel_de_chaves]" -#: g10/g10.c:1120 +#: g10/g10.c:1127 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:1128 +#: g10/g10.c:1135 #, c-format msgid "enarmoring failed: %s\n" msgstr "criaГЦo de armadura falhou: %s\n" -#: g10/g10.c:1194 +#: g10/g10.c:1201 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "algoritmo de distribuiГЦo invАlido '%s'\n" -#: g10/g10.c:1273 +#: g10/g10.c:1280 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:1277 +#: g10/g10.c:1284 msgid "Go ahead and type your message ...\n" msgstr "VА em frente e digite sua mensagem ...\n" -#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "impossМvel abrir '%s'\n" @@ -776,7 +776,7 @@ msgstr "erro na linha \"trailer\"\n" msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "nenum dado RFC1991 ou OpenPGP vАlido encontrado.\n" -#: g10/pkclist.c:121 +#: g10/pkclist.c:138 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -785,7 +785,7 @@ msgstr "" "Nenhum valor de confianГa designado para %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:131 +#: g10/pkclist.c:148 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -808,24 +808,29 @@ msgstr "" " 4 = Eu confio completamente\n" " 5 = Mostrar mais informaГЦo\n" -#: g10/pkclist.c:140 +#: g10/pkclist.c:157 msgid " m = back to the main menu\n" msgstr " m = volta ao menu principal\n" -#. a string with valid answers -#: g10/pkclist.c:145 -msgid "sSmM" -msgstr "iImM" +#: g10/pkclist.c:159 +msgid " q = quit\n" +msgstr "" -#: g10/pkclist.c:149 +#. a string with valid answers +#: g10/pkclist.c:164 +#, fuzzy +msgid "sSmMqQ" +msgstr "iImMqQ" + +#: g10/pkclist.c:168 msgid "Your decision? " msgstr "Sua decisЦo? " -#: g10/pkclist.c:169 +#: g10/pkclist.c:188 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:221 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" @@ -835,13 +840,13 @@ msgstr "" "Vamos ver se И possМvel designar alguns valores de confianГa perdidos.\n" "\n" -#: g10/pkclist.c:219 +#: g10/pkclist.c:251 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "Nenhuma rota que leva a uma de nossas chaves encontrada.\n" -#: g10/pkclist.c:221 +#: g10/pkclist.c:253 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -849,7 +854,7 @@ msgstr "" "Nenhum certificado com confianГa indefinida encontrado.\n" "\n" -#: g10/pkclist.c:223 +#: g10/pkclist.c:255 msgid "" "No trust values changed.\n" "\n" @@ -857,31 +862,31 @@ msgstr "" "Nenhum valor de confianГa modificado.\n" "\n" -#: g10/pkclist.c:238 +#: g10/pkclist.c:270 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "chave %08lX: a chave foi revogada!\n" -#: g10/pkclist.c:244 g10/pkclist.c:335 +#: g10/pkclist.c:276 g10/pkclist.c:369 msgid "Use this key anyway? " msgstr "Usa esta chave de qualquer modo?" -#: g10/pkclist.c:266 +#: g10/pkclist.c:298 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: a chave expirou\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:304 #, 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:288 +#: g10/pkclist.c:322 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: NСs NцO confiamos nesta chave\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:328 #, fuzzy, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -890,15 +895,15 @@ msgstr "" "%08lX: NЦo se tem certeza de que esta chave realmente pertence ao dono\n" "mas И aceitada de qualquer modo\n" -#: g10/pkclist.c:300 +#: g10/pkclist.c:334 msgid "This key probably belongs to the owner\n" msgstr "Esta chave provavelmente pertence ao dono\n" -#: g10/pkclist.c:305 +#: g10/pkclist.c:339 msgid "This key belongs to us\n" msgstr "Esta chave pertence a nСs (nСs temos a chave secreta)\n" -#: g10/pkclist.c:330 +#: g10/pkclist.c:364 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" @@ -910,49 +915,49 @@ msgstr "" "afirmativamente Ю prСxima pergunta\n" "\n" -#: g10/pkclist.c:339 +#: g10/pkclist.c:373 msgid "WARNING: Using untrusted key!\n" msgstr "AVISO: Usando chave nЦo confiАvel!\n" -#: g10/pkclist.c:375 +#: g10/pkclist.c:409 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:376 +#: g10/pkclist.c:410 msgid " This could mean that the signature is forgery.\n" msgstr " Isto pode significar que a assinatura И falsificada.\n" -#: g10/pkclist.c:397 +#: g10/pkclist.c:431 msgid "Note: This key has expired!\n" msgstr "Nota: Esta chave expirou!\n" -#: g10/pkclist.c:404 +#: g10/pkclist.c:438 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:406 +#: g10/pkclist.c:440 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:421 +#: g10/pkclist.c:456 msgid "WARNING: We do NOT trust this key!\n" msgstr "AVISO: NСs NцO confiamos nesta chave!\n" -#: g10/pkclist.c:422 +#: g10/pkclist.c:457 msgid " The signature is probably a FORGERY.\n" msgstr " A assinatura И provavelmente uma FALSIFICAгцO.\n" -#: g10/pkclist.c:429 +#: g10/pkclist.c:464 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "AVISO: Esta chave nЦo estА certificada com assinaturas confiАveis!\n" -#: g10/pkclist.c:432 +#: g10/pkclist.c:467 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:477 +#: g10/pkclist.c:512 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -960,25 +965,25 @@ msgstr "" "VocЙ nЦo especificou um ID de usuАrio. (pode-se usar \"-r\")\n" "\n" -#: g10/pkclist.c:482 +#: g10/pkclist.c:517 msgid "Enter the user ID: " msgstr "Digite o identificador de usuАrio:" -#: g10/pkclist.c:493 +#: g10/pkclist.c:528 msgid "No such user ID.\n" msgstr "Identificador de usuАrio inexistente.\n" -#: g10/pkclist.c:527 g10/pkclist.c:554 +#: g10/pkclist.c:562 g10/pkclist.c:589 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:535 +#: g10/pkclist.c:570 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: erro verificando chave: %s\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:596 msgid "no valid addressees\n" msgstr "nenhum endereГo vАlido\n" @@ -1336,7 +1341,7 @@ msgstr "entradas demais no cache unk - desabilitado\n" msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando chave secundАria %08lX ao invИs de chave primАria %08lX\n" -#: g10/import.c:129 g10/trustdb.c:1166 +#: g10/import.c:129 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "impossМvel abrir arquivo: %s\n" @@ -1346,12 +1351,12 @@ msgstr "imposs msgid "skipping block of type %d\n" msgstr "ignorando bloco do tipo %d\n" -#: g10/import.c:152 g10/trustdb.c:1425 g10/trustdb.c:1494 +#: g10/import.c:152 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu chaves processadas atИ agora\n" -#: g10/import.c:157 g10/trustdb.c:1242 +#: g10/import.c:157 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "erro de leitura: %s\n" @@ -1434,7 +1439,7 @@ msgstr "chave %08lX: chave p msgid "no default public keyring\n" msgstr "sem anel de chaves pЗblico padrЦo\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:569 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #, c-format msgid "writing to '%s'\n" msgstr "escrevendo para '%s'\n" @@ -2082,6 +2087,11 @@ msgstr "" msgid "can't handle public key algorithm %d\n" msgstr "impossМvel manipular algoritmo de chave pЗblica %d\n" +#: g10/parse-packet.c:801 +#, c-format +msgid "subpacket of type %d has critical bit set\n" +msgstr "" + #: g10/passphrase.c:141 msgid "" "\n" @@ -2105,19 +2115,19 @@ msgstr "Digite a frase secreta: " msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " -#: g10/plaintext.c:102 +#: g10/plaintext.c:103 msgid "data not saved; use option \"--output\" to save it\n" msgstr "dados nЦo salvos; use a opГЦo \"--output\" para salvА-los\n" -#: g10/plaintext.c:215 +#: g10/plaintext.c:216 msgid "Please enter name of data file: " msgstr "Por favor digite o nome do arquivo de dados: " -#: g10/plaintext.c:236 +#: g10/plaintext.c:237 msgid "reading stdin ...\n" msgstr "lendo \"stdin\" ...\n" -#: g10/plaintext.c:299 +#: g10/plaintext.c:300 #, c-format msgid "can't open signed data '%s'\n" msgstr "impossМvel abrir dados assinados '%s'\n" @@ -2170,12 +2180,16 @@ msgstr "" msgid "NOTE: signature key expired %s\n" msgstr "NOTA: chave de assinatura expirou %s\n" +#: g10/sig-check.c:226 +msgid "assuming bad signature due to an unknown critical bit\n" +msgstr "" + #: g10/sign.c:69 #, c-format msgid "%s signature from: %s\n" msgstr "%s assinatura de: %s\n" -#: g10/sign.c:200 g10/sign.c:564 +#: g10/sign.c:200 g10/sign.c:587 #, c-format msgid "can't create %s: %s\n" msgstr "impossМvel criar %s: %s\n" @@ -2314,166 +2328,166 @@ msgstr "%s: falha ao zerar um registro: %s\n" msgid "%s: failed to append a record: %s\n" msgstr "%s: falha ao anexar um registro: %s\n" -#: g10/trustdb.c:134 +#: g10/trustdb.c:142 msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n" msgstr "" "O banco de dados de confianГa estА danificado; por favor rode\n" "\"gpgm --fix-trust-db\".\n" -#: g10/trustdb.c:147 +#: g10/trustdb.c:155 #, fuzzy, c-format msgid "trust record %lu, req type %d: read failed: %s\n" msgstr "registro de confianГa %lu, tipo req %d: leitura falhou: %s\n" -#: g10/trustdb.c:162 +#: g10/trustdb.c:170 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" msgstr "registro de confianГa %lu, tipo %d: gravaГЦo falhou: %s\n" -#: g10/trustdb.c:176 +#: g10/trustdb.c:184 #, c-format msgid "trust record %lu: delete failed: %s\n" msgstr "registro de confianГa %lu: remoГЦo falhou: %s\n" -#: g10/trustdb.c:190 +#: g10/trustdb.c:198 #, c-format msgid "trust db: sync failed: %s\n" msgstr "banco de dados de confianГa: sincronizaГЦo falhou: %s\n" -#: g10/trustdb.c:319 +#: g10/trustdb.c:327 #, fuzzy, c-format msgid "error reading dir record for LID %lu: %s\n" msgstr "erro lendo registro de diretСrio para LID %lu: %s\n" -#: g10/trustdb.c:326 +#: g10/trustdb.c:334 #, fuzzy, c-format msgid "lid %lu: expected dir record, got type %d\n" msgstr "lid %lu: registro de diretСrio esperado, tipo %d recebido\n" -#: g10/trustdb.c:331 +#: g10/trustdb.c:339 #, c-format msgid "no primary key for LID %lu\n" msgstr "nenhuma chave primАria para LID %lu\n" -#: g10/trustdb.c:336 +#: g10/trustdb.c:344 #, c-format msgid "error reading primary key for LID %lu: %s\n" msgstr "erro lendo chave primАria para LID %lu: %s\n" -#: g10/trustdb.c:412 +#: g10/trustdb.c:420 #, fuzzy, c-format msgid "chained sigrec %lu has a wrong owner\n" msgstr "sigrec em cadeia %lu possui dono errado\n" -#: g10/trustdb.c:455 +#: g10/trustdb.c:463 #, fuzzy, c-format msgid "'%s' is not a valid long keyID\n" msgstr "%s nЦo И um mapa de caracteres vАlido\n" -#: g10/trustdb.c:490 +#: g10/trustdb.c:498 #, fuzzy, c-format msgid "key %08lX: no public key for trusted key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pЗblica - ignorada\n" -#: g10/trustdb.c:499 g10/trustdb.c:557 +#: g10/trustdb.c:507 g10/trustdb.c:565 #, c-format msgid "key %08lX: can't put it into the trustdb\n" msgstr "chave %08lX: impossМvel colocА-la no banco de dados de confianГa\n" -#: g10/trustdb.c:504 g10/trustdb.c:563 +#: g10/trustdb.c:512 g10/trustdb.c:571 #, c-format msgid "key %08lX: query record failed\n" msgstr "chave %08lX: pedido de registro falhou\n" -#: g10/trustdb.c:509 g10/trustdb.c:572 +#: g10/trustdb.c:517 g10/trustdb.c:580 #, fuzzy, c-format msgid "key %08lX: already in trusted key table\n" msgstr "chave %08lX: jА estА na tabela de chaves secretas\n" -#: g10/trustdb.c:512 g10/trustdb.c:575 +#: g10/trustdb.c:520 g10/trustdb.c:583 #, fuzzy, c-format msgid "key %08lX: accepted as trusted key.\n" msgstr "chave %08lX: aceita como chave secreta.\n" -#: g10/trustdb.c:528 +#: g10/trustdb.c:536 #, c-format msgid "NOTE: secret key %08lX is NOT protected.\n" msgstr "NOTA: chave secreta %08lX NцO estА protegida.\n" -#: g10/trustdb.c:540 +#: g10/trustdb.c:548 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pЗblica - ignorada\n" -#: g10/trustdb.c:547 +#: g10/trustdb.c:555 #, c-format msgid "key %08lX: secret and public key don't match\n" msgstr "chave %08lX: chaves secreta e pЗblica nЦo combinam\n" -#: g10/trustdb.c:583 +#: g10/trustdb.c:591 #, c-format msgid "enumerate secret keys failed: %s\n" msgstr "enumeraГЦo de chaves secretas falhou: %s\n" -#: g10/trustdb.c:766 +#: g10/trustdb.c:774 #, fuzzy, c-format msgid "lid %lu: read dir record failed: %s\n" msgstr "lid %lu: leitura de registro de diretСrio falhou: %s\n" -#: g10/trustdb.c:775 +#: g10/trustdb.c:783 #, c-format msgid "lid %lu: read key record failed: %s\n" msgstr "lid %lu: leitura de registro de chave falhou: %s\n" -#: g10/trustdb.c:785 +#: g10/trustdb.c:793 #, c-format msgid "lid %lu: read uid record failed: %s\n" msgstr "lid %lu: leitura de registro de uid falhou: %s\n" -#: g10/trustdb.c:794 +#: g10/trustdb.c:802 #, fuzzy, c-format msgid "lid %lu: read pref record failed: %s\n" msgstr "lid %lu: leitura de registro de preferЙncias falhou: %s\n" -#: g10/trustdb.c:804 +#: g10/trustdb.c:812 #, c-format msgid "lid %lu: read sig record failed: %s\n" msgstr "lid %lu: leitura de registro de assinatura falhou: %s\n" -#: g10/trustdb.c:999 +#: g10/trustdb.c:1013 msgid "Ooops, no keys\n" msgstr "Ooops, nenhuma chave\n" -#: g10/trustdb.c:1003 +#: g10/trustdb.c:1017 msgid "Ooops, no user ids\n" msgstr "Ooops, nenhum id de usuАrio\n" -#: g10/trustdb.c:1074 g10/trustdb.c:1092 +#: g10/trustdb.c:1088 g10/trustdb.c:1106 #, c-format msgid "user '%s' read problem: %s\n" msgstr "erro de leitura do usuАrio '%s': %s\n" -#: g10/trustdb.c:1077 g10/trustdb.c:1095 +#: g10/trustdb.c:1091 g10/trustdb.c:1109 #, c-format msgid "user '%s' list problem: %s\n" msgstr "erro de listagem do usuАrio '%s': %s\n" -#: g10/trustdb.c:1085 g10/trustdb.c:1300 +#: g10/trustdb.c:1099 g10/trustdb.c:1346 #, c-format msgid "user '%s' not found: %s\n" msgstr "usuАrio '%s' nЦo encontrado: %s\n" -#: g10/trustdb.c:1087 g10/trustdb.c:1302 +#: g10/trustdb.c:1101 g10/trustdb.c:1348 #, c-format msgid "problem finding '%s' in trustdb: %s\n" msgstr "problemas encontrando '%s' no banco de dados de confianГa: %s\n" -#: g10/trustdb.c:1090 +#: g10/trustdb.c:1104 #, c-format msgid "user '%s' not in trustdb\n" msgstr "usuАrio '%s' nЦo estА no banco de dados de confianГa\n" -#: g10/trustdb.c:1125 +#: g10/trustdb.c:1139 #, c-format msgid "" "# List of assigned trustvalues, created %s\n" @@ -2482,216 +2496,216 @@ msgstr "" "# Lista de valores de confianГa designados, criada em %s\n" "# (Use \"gpgm --import-ownertrust\" para restaurА-los)\n" -#: g10/trustdb.c:1131 +#: g10/trustdb.c:1145 msgid "directory record w/o primary key\n" msgstr "registro de diretСrio sem chave primАria\n" -#: g10/trustdb.c:1138 +#: g10/trustdb.c:1152 #, c-format msgid "error reading key record: %s\n" msgstr "erro lendo registro de chave: %s\n" -#: g10/trustdb.c:1178 +#: g10/trustdb.c:1192 msgid "line too long\n" msgstr "linha muito longa\n" -#: g10/trustdb.c:1186 +#: g10/trustdb.c:1200 msgid "error: missing colon\n" msgstr "erro: falta dois pontos\n" -#: g10/trustdb.c:1191 +#: g10/trustdb.c:1205 msgid "error: invalid fingerprint\n" msgstr "erro: impressЦo digital invАlida\n" -#: g10/trustdb.c:1195 +#: g10/trustdb.c:1209 msgid "error: no ownertrust value\n" msgstr "erro: nenhum valor de confianГa\n" -#: g10/trustdb.c:1209 +#: g10/trustdb.c:1223 #, c-format msgid "LID %lu: changing trust from %u to %u\n" msgstr "LID %lu: mudando confianГa de %u para %u\n" -#: g10/trustdb.c:1212 +#: g10/trustdb.c:1226 #, c-format msgid "LID %lu: setting trust to %u\n" msgstr "LID %lu: estabelecendo confianГa para %u\n" -#: g10/trustdb.c:1220 +#: g10/trustdb.c:1234 msgid "key not in trustdb, searching ring.\n" msgstr "" "chave nЦo encontrada no banco de dados de confianГa, procurando no anel\n" -#: g10/trustdb.c:1223 +#: g10/trustdb.c:1237 #, c-format msgid "key not in ring: %s\n" msgstr "chave nЦo encontrada no anel: %s\n" -#: g10/trustdb.c:1227 +#: g10/trustdb.c:1241 msgid "Oops: key is now in trustdb???\n" msgstr "Oops: agora a chave estА no banco de dados de confianГa???\n" #. update the ownertrust -#: g10/trustdb.c:1232 +#: g10/trustdb.c:1246 #, c-format msgid "insert trust record failed: %s\n" msgstr "inserГЦo de registro de confianГa falhou: %s\n" #. error -#: g10/trustdb.c:1238 +#: g10/trustdb.c:1252 #, fuzzy, c-format msgid "error finding dir record: %s\n" msgstr "erro encontrando registro de diretСrio: %s\n" -#: g10/trustdb.c:1305 +#: g10/trustdb.c:1351 #, c-format msgid "user '%s' not in trustdb - inserting\n" msgstr "" "usuАrio '%s' nЦo encontrado no banco de dados de confianГa - inserindo\n" -#: g10/trustdb.c:1308 +#: g10/trustdb.c:1354 #, c-format msgid "failed to put '%s' into trustdb: %s\n" msgstr "falha ao colocar '%s' no banco de dados de confianГa: %s\n" -#: g10/trustdb.c:1355 +#: g10/trustdb.c:1404 #, c-format msgid "%s: keyblock read problem: %s\n" msgstr "%s: erro de leitura de bloco de chaves: %s\n" -#: g10/trustdb.c:1369 +#: g10/trustdb.c:1418 #, c-format msgid "%s: update failed: %s\n" msgstr "%s: atualizaГЦo falhou: %s\n" -#: g10/trustdb.c:1372 +#: g10/trustdb.c:1421 #, c-format msgid "%s: updated\n" msgstr "%s: atualizado\n" -#: g10/trustdb.c:1374 +#: g10/trustdb.c:1423 #, c-format msgid "%s: okay\n" msgstr "%s: correto\n" -#: g10/trustdb.c:1389 +#: g10/trustdb.c:1438 #, fuzzy, c-format msgid "lid %lu: dir record w/o key - skipped\n" msgstr "lid %lu: registro de diretСrio sem chave - ignorado\n" -#: g10/trustdb.c:1402 +#: g10/trustdb.c:1451 #, c-format msgid "lid %lu: keyblock not found: %s\n" msgstr "lid %lu: bloco de chaves nЦo encontrado: %s\n" -#: g10/trustdb.c:1411 g10/trustdb.c:1480 +#: g10/trustdb.c:1460 g10/trustdb.c:1529 #, c-format msgid "lid %lu: update failed: %s\n" msgstr "lid %lu: atualizaГЦo falhou %s\n" -#: g10/trustdb.c:1417 g10/trustdb.c:1486 +#: g10/trustdb.c:1466 g10/trustdb.c:1535 #, c-format msgid "lid %lu: updated\n" msgstr "lid %lu: atualizado\n" -#: g10/trustdb.c:1421 g10/trustdb.c:1490 +#: g10/trustdb.c:1470 g10/trustdb.c:1539 #, c-format msgid "lid %lu: okay\n" msgstr "lid %lu: correto\n" -#: g10/trustdb.c:1428 g10/trustdb.c:1496 +#: g10/trustdb.c:1477 g10/trustdb.c:1545 #, c-format msgid "%lu keys processed\n" msgstr "%lu chaves processadas\n" -#: g10/trustdb.c:1430 +#: g10/trustdb.c:1479 #, c-format msgid "\t%lu keys skipped\n" msgstr "\t%lu chaves ignoradas\n" -#: g10/trustdb.c:1432 g10/trustdb.c:1498 +#: g10/trustdb.c:1481 g10/trustdb.c:1547 #, c-format msgid "\t%lu keys with errors\n" msgstr "\t%lu chaves com erros\n" -#: g10/trustdb.c:1434 g10/trustdb.c:1500 +#: g10/trustdb.c:1483 g10/trustdb.c:1549 #, c-format msgid "\t%lu keys updated\n" msgstr "\t%lu chaves atualizadas\n" -#: g10/trustdb.c:1464 +#: g10/trustdb.c:1513 #, c-format msgid "lid ?: insert failed: %s\n" msgstr "lid ?: inserГЦo falhou: %s\n" -#: g10/trustdb.c:1469 +#: g10/trustdb.c:1518 #, c-format msgid "lid %lu: insert failed: %s\n" msgstr "lid %lu: inserГЦo falhou: %s\n" -#: g10/trustdb.c:1475 +#: g10/trustdb.c:1524 #, c-format msgid "lid %lu: inserted\n" msgstr "lid %lu: inserido\n" -#: g10/trustdb.c:1502 +#: g10/trustdb.c:1551 #, c-format msgid "\t%lu keys inserted\n" msgstr "\t%lu chaves inseridas\n" -#: g10/trustdb.c:1505 +#: g10/trustdb.c:1554 #, c-format msgid "enumerate keyblocks failed: %s\n" msgstr "enumeraГЦo de blocos de chaves falhou: %s\n" -#: g10/trustdb.c:1550 +#: g10/trustdb.c:1599 #, c-format msgid "check_trust: search dir record failed: %s\n" msgstr "check_trust: busca de registro de diretСrio falhou: %s\n" -#: g10/trustdb.c:1557 +#: g10/trustdb.c:1606 #, c-format msgid "key %08lX: insert trust record failed: %s\n" msgstr "chave %08lX: inserГЦo de registro de confianГa falhou: %s\n" -#: g10/trustdb.c:1561 +#: g10/trustdb.c:1610 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" msgstr "chave %08lX.%lu: inserida no banco de dados de confianГa\n" -#: g10/trustdb.c:1569 +#: g10/trustdb.c:1618 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "" "chave %08lX.%lu: criada no futuro (viagem no tempo ou problema no relogio)\n" -#: g10/trustdb.c:1576 +#: g10/trustdb.c:1625 #, c-format msgid "key %08lX.%lu: expired at %s\n" msgstr "chave %08lX.%lu: expirada em %s\n" -#: g10/trustdb.c:1584 +#: g10/trustdb.c:1633 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" msgstr "chave %08lX.%lu: verificaГЦo de confianГa falhou: %s\n" -#: g10/trustdb.c:1753 g10/trustdb.c:1782 g10/trustdb.c:2521 +#: g10/trustdb.c:1820 g10/trustdb.c:1849 g10/trustdb.c:2588 msgid "WARNING: can't yet handle long pref records\n" msgstr "AVISO: ainda И impossМvel manipular registros de preferЙncias longos\n" -#: g10/trustdb.c:1804 +#: g10/trustdb.c:1871 #, c-format msgid "get_dir_record: search_record failed: %s\n" msgstr "get_dir_record: search_record falhou: %s\n" -#: g10/trustdb.c:1867 +#: g10/trustdb.c:1934 #, fuzzy, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" msgstr "" "NOTA: assinatura rec %lu[%d] em lista de sugestУes de %lu mas marcada\n" "como verificada\n" -#: g10/trustdb.c:1871 +#: g10/trustdb.c:1938 #, fuzzy, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n" msgstr "" @@ -2699,154 +2713,154 @@ msgstr "" "marcada\n" #. we need the dir record -#: g10/trustdb.c:1878 +#: g10/trustdb.c:1945 #, c-format msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n" msgstr "" "assinatura rec %lu[%d] em lista de sugestУes de %lu nЦo aponta para\n" "um registro de diretСrio\n" -#: g10/trustdb.c:1884 +#: g10/trustdb.c:1951 #, c-format msgid "lid %lu: no primary key\n" msgstr "lid %lu: nenhuma chave primАria\n" -#: g10/trustdb.c:1917 +#: g10/trustdb.c:1984 #, c-format msgid "lid %lu: user id not found in keyblock\n" msgstr "lid %lu: id de usuАrio nЦo encontrado no bloco de chaves\n" -#: g10/trustdb.c:1921 +#: g10/trustdb.c:1988 #, c-format msgid "lid %lu: user id without signature\n" msgstr "lid %lu: id de usuАrio sem assinatura\n" -#: g10/trustdb.c:1928 +#: g10/trustdb.c:1995 #, c-format msgid "lid %lu: self-signature in hintlist\n" msgstr "lid %lu: auto-assinatura na lista de sugestУes\n" -#: g10/trustdb.c:1939 g10/trustdb.c:2658 g10/trustdb.c:2742 +#: g10/trustdb.c:2006 g10/trustdb.c:2725 g10/trustdb.c:2809 msgid "Valid certificate revocation" msgstr "Certificado de revogaГЦo vАlido" -#: g10/trustdb.c:1940 g10/trustdb.c:2659 g10/trustdb.c:2743 +#: g10/trustdb.c:2007 g10/trustdb.c:2726 g10/trustdb.c:2810 msgid "Good certificate" msgstr "Certificado correto" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:2016 msgid "very strange: no public key\n" msgstr "muito estranho: nenhuma chave pЗblica\n" -#: g10/trustdb.c:1997 +#: g10/trustdb.c:2064 #, c-format msgid "hintlist %lu[%d] of %lu does not point to a dir record\n" msgstr "" "lista de sugestУes %lu[%d] de %lu nЦo aponta para registro de diretСrio\n" -#: g10/trustdb.c:2003 +#: g10/trustdb.c:2070 #, c-format msgid "lid %lu does not have a key\n" msgstr "lid %lu nЦo tem uma chave\n" -#: g10/trustdb.c:2013 +#: g10/trustdb.c:2080 #, c-format msgid "lid %lu: can't get keyblock: %s\n" msgstr "lid %lu: impossМvel pegar bloco de chaves: %s\n" -#: g10/trustdb.c:2070 g10/trustdb.c:2984 +#: g10/trustdb.c:2137 g10/trustdb.c:3051 #, c-format msgid "tdbio_search_dir failed: %s\n" msgstr "tdbio_search_dir falhou: %s\n" -#: g10/trustdb.c:2223 +#: g10/trustdb.c:2290 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" msgstr "chave %08lX.%lu: LigaГЦo de subchave vАlida\n" -#: g10/trustdb.c:2229 g10/trustdb.c:2271 +#: g10/trustdb.c:2296 g10/trustdb.c:2338 #, c-format msgid "key %08lX.%lu: Invalid subkey binding: %s\n" msgstr "chave %08lX.%lu: LigaГЦo de subchave invАlida: %s\n" -#: g10/trustdb.c:2244 +#: g10/trustdb.c:2311 #, c-format msgid "key %08lX.%lu: Valid key revocation\n" msgstr "chave %08lX.%lu: RevogaГЦo de chave vАlida\n" -#: g10/trustdb.c:2250 +#: g10/trustdb.c:2317 #, c-format msgid "key %08lX.%lu: Invalid key revocation: %s\n" msgstr "chave %08lX.%lu: RevogaГЦo de chave invАlida: %s\n" -#: g10/trustdb.c:2265 +#: g10/trustdb.c:2332 #, c-format msgid "key %08lX.%lu: Valid subkey revocation\n" msgstr "chave %08lX.%lu: RevogaГЦo de subchave vАlida\n" -#: g10/trustdb.c:2365 +#: g10/trustdb.c:2432 msgid "Good self-signature" msgstr "Auto-assinatura vАlida" -#: g10/trustdb.c:2376 +#: g10/trustdb.c:2443 msgid "Invalid self-signature" msgstr "Auto-assinatura invАlida" -#: g10/trustdb.c:2386 +#: g10/trustdb.c:2453 msgid "Valid user ID revocation skipped due to a newer self signature\n" msgstr "" -#: g10/trustdb.c:2393 +#: g10/trustdb.c:2460 msgid "Valid user ID revocation\n" msgstr "RevogaГЦo de ID de usuАrio vАlida\n" -#: g10/trustdb.c:2400 +#: g10/trustdb.c:2467 msgid "Invalid user ID revocation" msgstr "RevogaГЦo de ID de usuАrio invАlida" -#: g10/trustdb.c:2484 +#: g10/trustdb.c:2551 msgid "Too many preferences" msgstr "Muitas preferЙncias" -#: g10/trustdb.c:2498 +#: g10/trustdb.c:2565 msgid "Too many preference items" msgstr "Muitos itens de preferЙncia" -#: g10/trustdb.c:2637 +#: g10/trustdb.c:2704 msgid "Duplicated certificate - deleted" msgstr "Certificado duplicado - deletado" -#: g10/trustdb.c:2670 +#: g10/trustdb.c:2737 msgid "Hmmm, public key lost?" msgstr "Hmmm, chave pЗblica perdida?" -#: g10/trustdb.c:2680 g10/trustdb.c:2763 +#: g10/trustdb.c:2747 g10/trustdb.c:2830 msgid "Invalid certificate revocation" msgstr "Certificado de revogaГЦo invАlido" -#: g10/trustdb.c:2681 g10/trustdb.c:2764 +#: g10/trustdb.c:2748 g10/trustdb.c:2831 msgid "Invalid certificate" msgstr "Certificado invАlido" -#: g10/trustdb.c:2696 +#: g10/trustdb.c:2763 #, c-format msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" msgstr "" "uid %08lX.%lu/%02X%02X: tem diretСrio sombra %lu mas ainda nЦo estА\n" "marcado\n" -#: g10/trustdb.c:2710 +#: g10/trustdb.c:2777 #, c-format msgid "sig record %lu[%d] points to wrong record.\n" msgstr "registro de assinatura %lu[%d] aponta para registro errado.\n" #. that should never happen -#: g10/trustdb.c:2954 +#: g10/trustdb.c:3021 #, c-format msgid "insert_trust_record: keyblock not found: %s\n" msgstr "insert_trust_record: bloco de chaves nЦo encontrado: %s\n" -#: g10/trustdb.c:2972 +#: g10/trustdb.c:3039 msgid "did not use primary key for insert_trust_record()\n" msgstr "vocЙ usou a chave primАria para insert_trust_record()\n" @@ -2945,123 +2959,123 @@ msgstr "" "tentado %d vezes!\n" #. begin of list -#: g10/helptext.c:45 +#: g10/helptext.c:48 msgid "edit_ownertrust.value" msgstr "" -#: g10/helptext.c:51 +#: g10/helptext.c:54 msgid "revoked_key.override" msgstr "" -#: g10/helptext.c:55 +#: g10/helptext.c:58 msgid "untrusted_key.override" msgstr "" -#: g10/helptext.c:59 +#: g10/helptext.c:62 msgid "pklist.user_id.enter" msgstr "" -#: g10/helptext.c:63 +#: g10/helptext.c:66 msgid "keygen.algo" msgstr "" -#: g10/helptext.c:79 +#: g10/helptext.c:82 msgid "keygen.algo.elg_se" msgstr "" -#: g10/helptext.c:86 +#: g10/helptext.c:89 msgid "keygen.size" msgstr "" -#: g10/helptext.c:90 +#: g10/helptext.c:93 msgid "keygen.size.huge.okay" msgstr "" -#: g10/helptext.c:95 +#: g10/helptext.c:98 msgid "keygen.size.large.okay" msgstr "" -#: g10/helptext.c:100 +#: g10/helptext.c:103 msgid "keygen.valid" msgstr "" -#: g10/helptext.c:104 +#: g10/helptext.c:107 msgid "keygen.valid.okay" msgstr "" -#: g10/helptext.c:109 +#: g10/helptext.c:112 msgid "keygen.name" msgstr "" -#: g10/helptext.c:114 +#: g10/helptext.c:117 msgid "keygen.email" msgstr "" -#: g10/helptext.c:118 +#: g10/helptext.c:121 msgid "keygen.comment" msgstr "" -#: g10/helptext.c:123 +#: g10/helptext.c:126 msgid "keygen.userid.cmd" msgstr "" -#: g10/helptext.c:132 +#: g10/helptext.c:135 msgid "keygen.sub.okay" msgstr "" -#: g10/helptext.c:136 +#: g10/helptext.c:139 msgid "sign_uid.okay" msgstr "" -#: g10/helptext.c:141 +#: g10/helptext.c:144 msgid "change_passwd.empty.okay" msgstr "" -#: g10/helptext.c:146 +#: g10/helptext.c:149 msgid "keyedit.cmd" msgstr "" -#: g10/helptext.c:150 +#: g10/helptext.c:153 msgid "keyedit.save.okay" msgstr "" -#: g10/helptext.c:155 +#: g10/helptext.c:158 msgid "keyedit.cancel.okay" msgstr "" -#: g10/helptext.c:159 +#: g10/helptext.c:162 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/helptext.c:163 +#: g10/helptext.c:166 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/helptext.c:168 +#: g10/helptext.c:171 msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/helptext.c:172 +#: g10/helptext.c:175 msgid "passphrase.enter" msgstr "" -#: g10/helptext.c:179 +#: g10/helptext.c:182 msgid "passphrase.repeat" msgstr "" -#: g10/helptext.c:183 +#: g10/helptext.c:186 msgid "detached_signature.filename" msgstr "" -#: g10/helptext.c:187 +#: g10/helptext.c:190 msgid "openfile.overwrite.okay" msgstr "" -#: g10/helptext.c:201 +#: g10/helptext.c:204 msgid "No help available" msgstr "Nenhuma ajuda disponМvel" -#: g10/helptext.c:213 +#: g10/helptext.c:216 #, c-format msgid "No help available for '%s'" msgstr "Nenhuma ajuda disponМvel para '%s'" diff --git a/po/ru.po b/po/ru.po index cdd476ceb..307a63134 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ # QingLong (couldn't send an email to let you know) msgid "" msgstr "" -"POT-Creation-Date: 1998-12-10 20:11+0100\n" +"POT-Creation-Date: 1998-12-17 18:30+0100\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck \n" @@ -218,12 +218,12 @@ msgstr " msgid "you found a bug ... (%s:%d)\n" msgstr "Вы нашли ошибку в программе ... (%s:%d)\n" -#: cipher/random.c:412 +#: cipher/random.c:406 #, fuzzy msgid "WARNING: using insecure random number generator!!\n" msgstr "Внимание: используется ненадежный генератор случайных чисел!\n" -#: cipher/random.c:413 +#: cipher/random.c:407 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -237,7 +237,7 @@ msgstr "" "НЕ ПОЛЬЗУЙТЕСЬ ДАННЫМИ СОЗДАННЫМИ ЭТОЙ ПРОГРАММОЙ!\n" "\n" -#: cipher/rndlinux.c:116 +#: cipher/rndlinux.c:118 #, c-format msgid "" "\n" @@ -248,7 +248,7 @@ msgstr "" "Недостаточно случайных данных. Пожалуйста, поделайте что-нибудь, чтобы\n" "ОС могла набрать дополнительные случайные числа! (нужно еще %d байт)\n" -#: g10/g10.c:159 +#: g10/g10.c:160 msgid "" "@Commands:\n" " " @@ -256,128 +256,128 @@ msgstr "" "@Команды:\n" " " -#: g10/g10.c:162 +#: g10/g10.c:163 #, fuzzy msgid "|[file]|make a signature" msgstr "|[файл]|создать подпись" -#: g10/g10.c:163 +#: g10/g10.c:164 #, fuzzy msgid "|[file]|make a clear text signature" msgstr "|[файл]|создать текстовую подпись" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "make a detached signature" msgstr "создать отдельную подпись" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encrypt data" msgstr "зашифровать данные" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "encryption only with symmetric cipher" msgstr "зашифровать симметричным алгоритмом" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "store only" msgstr "только сохранить" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "decrypt data (default)" msgstr "расшифровать данные (по умолчанию)" -#: g10/g10.c:169 +#: g10/g10.c:170 msgid "verify a signature" msgstr "проверить подпись" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys" msgstr "список ключей" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "list keys and signatures" msgstr "список ключей и подписей" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "check key signatures" msgstr "проверить подпись на ключе" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list keys and fingerprints" msgstr "список ключей с их \"отпечатками пальцев\"" -#: g10/g10.c:175 +#: g10/g10.c:176 msgid "list secret keys" msgstr "список секретных ключей" -#: g10/g10.c:177 +#: g10/g10.c:178 msgid "generate a new key pair" msgstr "сгенерировать новую пару ключей (открытый и секретный)" -#: g10/g10.c:179 +#: g10/g10.c:180 msgid "remove key from the public keyring" msgstr "удалить ключ со связки" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "sign or edit a key" msgstr "подписать или редактировать ключ" -#: g10/g10.c:182 +#: g10/g10.c:183 msgid "generate a revocation certificate" msgstr "сгенерировать отзывающий сертификат" -#: g10/g10.c:184 +#: g10/g10.c:185 msgid "export keys" msgstr "экспортировать ключи" -#: g10/g10.c:187 +#: g10/g10.c:188 msgid "import/merge keys" msgstr "импортировать/добавить ключи" -#: g10/g10.c:189 +#: g10/g10.c:190 msgid "list only the sequence of packets" msgstr "напечатать только последовательность пакетов" -#: g10/g10.c:192 +#: g10/g10.c:193 #, fuzzy msgid "export the ownertrust values" msgstr "экспортировать параметры доверия\n" -#: g10/g10.c:194 +#: g10/g10.c:195 #, fuzzy msgid "import ownertrust values" msgstr "импортировать параметры доверия\n" -#: g10/g10.c:196 +#: g10/g10.c:197 #, fuzzy msgid "|[NAMES]|update the trust database" msgstr "|[ИМЕНА]|проверить базу данных доверия" -#: g10/g10.c:198 +#: g10/g10.c:199 msgid "|[NAMES]|check the trust database" msgstr "|[ИМЕНА]|проверить базу данных доверия" -#: g10/g10.c:199 +#: g10/g10.c:200 msgid "fix a corrupted trust database" msgstr "исправить разрушенную базу данных доверия" -#: g10/g10.c:200 +#: g10/g10.c:201 msgid "De-Armor a file or stdin" msgstr "Декодировать stdin или файл из ASCII-представления" -#: g10/g10.c:201 +#: g10/g10.c:202 msgid "En-Armor a file or stdin" msgstr "Закодировать stdin или файл в ASCII-представление" -#: g10/g10.c:202 +#: g10/g10.c:203 msgid "|algo [files]|print message digests" msgstr "|algo [files]|напечатать дайджест сообщения" -#: g10/g10.c:203 +#: g10/g10.c:204 msgid "print all message digests" msgstr "напечатать все дайджесты сообщения" -#: g10/g10.c:210 +#: g10/g10.c:211 msgid "" "@\n" "Options:\n" @@ -387,147 +387,147 @@ msgstr "" "Параметры:\n" " " -#: g10/g10.c:212 +#: g10/g10.c:213 msgid "create ascii armored output" msgstr "вывод в ASCII-представлении" -#: g10/g10.c:214 +#: g10/g10.c:215 msgid "use this user-id to sign or decrypt" msgstr "" "использовать указанный идентификатор пользователя для подписи или расшифровки" -#: g10/g10.c:215 +#: g10/g10.c:216 msgid "use this user-id for encryption" msgstr "использовать указанный идентификатор пользователя для шифрования" -#: g10/g10.c:216 +#: g10/g10.c:217 msgid "|N|set compress level N (0 disables)" msgstr "|N|установить уровень сжатия (0 - не сжимать)" -#: g10/g10.c:218 +#: g10/g10.c:219 msgid "use canonical text mode" msgstr "использовать канонический текстовый режим" -#: g10/g10.c:220 +#: g10/g10.c:221 msgid "use as output file" msgstr "использовать в качестве выходного файла" -#: g10/g10.c:221 +#: g10/g10.c:222 msgid "verbose" msgstr "многословный" -#: g10/g10.c:222 +#: g10/g10.c:223 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:223 +#: g10/g10.c:224 #, fuzzy msgid "force v3 signatures" msgstr "проверить подпись на ключе" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:225 +#: g10/g10.c:226 msgid "batch mode: never ask" msgstr "пакетный режим: ничего не спрашивать" -#: g10/g10.c:226 +#: g10/g10.c:227 msgid "assume yes on most questions" msgstr "отвечать \"да\" на большинство вопросов" -#: g10/g10.c:227 +#: g10/g10.c:228 msgid "assume no on most questions" msgstr "отвечать \"нет\" на большинство вопросов" -#: g10/g10.c:228 +#: g10/g10.c:229 msgid "add this keyring to the list of keyrings" msgstr "добавить эту связку к списку связок ключей" -#: g10/g10.c:229 +#: g10/g10.c:230 msgid "add this secret keyring to the list" msgstr "добавить эту секретную связку к списку связок ключей" -#: g10/g10.c:230 +#: g10/g10.c:231 msgid "|NAME|use NAME as default secret key" msgstr "|ИМЯ|использовать ИМЯ в качестве секретного ключа по умолчанию" -#: g10/g10.c:231 +#: g10/g10.c:232 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:232 +#: g10/g10.c:233 msgid "read options from file" msgstr "читать параметры из файла" -#: g10/g10.c:234 +#: g10/g10.c:235 msgid "set debugging flags" msgstr "установить отладочные флаги" -#: g10/g10.c:235 +#: g10/g10.c:236 msgid "enable full debugging" msgstr "разрешить всю отладку" -#: g10/g10.c:236 +#: g10/g10.c:237 msgid "|FD|write status info to this FD" msgstr "|FD| записывать информацию о состоянии в дескриптор (FD)" -#: g10/g10.c:237 +#: g10/g10.c:238 msgid "do not write comment packets" msgstr "не писать пакеты с комментариями" -#: g10/g10.c:238 +#: g10/g10.c:239 msgid "(default is 1)" msgstr "(по умолчанию 1)" -#: g10/g10.c:239 +#: g10/g10.c:240 msgid "(default is 3)" msgstr "(по умолчанию 3)" -#: g10/g10.c:241 +#: g10/g10.c:242 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:242 +#: g10/g10.c:243 #, fuzzy msgid "|FILE|load extension module FILE" msgstr "|ФАЙЛ|загрузить ФАЙЛ с расширяющими модулями" -#: g10/g10.c:243 +#: g10/g10.c:244 msgid "emulate the mode described in RFC1991" msgstr "эмулировать режим описанный в RFC1991" -#: g10/g10.c:244 +#: g10/g10.c:245 #, fuzzy msgid "|N|use passphrase mode N" msgstr "|N|использовать ключевую фразу режима N\n" -#: g10/g10.c:246 +#: g10/g10.c:247 #, fuzzy msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ для ключевых фраз" -#: g10/g10.c:248 +#: g10/g10.c:249 #, fuzzy msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ для ключевых фраз" -#: g10/g10.c:250 +#: g10/g10.c:251 msgid "|NAME|use cipher algorithm NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:251 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME" msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ" -#: g10/g10.c:252 +#: g10/g10.c:253 msgid "|N|use compress algorithm N" msgstr "|N|использовать алгоритм сжатия N" -#: g10/g10.c:253 +#: g10/g10.c:254 msgid "throw keyid field of encrypted packets" msgstr "выбрасывать поле keyid у зашифрованных пакетов" -#: g10/g10.c:261 +#: g10/g10.c:262 #, fuzzy msgid "" "@\n" @@ -548,21 +548,21 @@ msgstr "" " --list-keys [names] показать список ключей\n" " --fingerprint [names] показать \"отпечатки пальцев\" ключей\n" -#: g10/g10.c:339 +#: g10/g10.c:341 msgid "Please report bugs to .\n" msgstr "" "Пожалуйста, отправляйте сообщения об ошибках по адресу " ".\n" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Использование: gpgm [параметры] [файлы] (-h для помощи)" -#: g10/g10.c:346 +#: g10/g10.c:348 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Использование: gpg [параметры] [файлы] (-h для помощи)" -#: g10/g10.c:351 +#: g10/g10.c:353 #, fuzzy msgid "" "Syntax: gpgm [options] [files]\n" @@ -571,7 +571,7 @@ msgstr "" "Синтаксис: gpgm [параметры] [файлы]\n" "Программа сопровождения GNUPG\n" -#: g10/g10.c:354 +#: g10/g10.c:356 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -581,7 +581,7 @@ msgstr "" "подписывает, проверяет подписи, шифрует или расшифровывает\n" "режим работы зависит от входных данных\n" -#: g10/g10.c:360 +#: g10/g10.c:362 msgid "" "\n" "Supported algorithms:\n" @@ -589,151 +589,151 @@ msgstr "" "\n" "Поддерживаемые алгоритмы:\n" -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpgm [options] " msgstr "Использование: gpgm [параметры] " -#: g10/g10.c:437 +#: g10/g10.c:439 msgid "usage: gpg [options] " msgstr "Использование: gpg [параметры] " -#: g10/g10.c:478 +#: g10/g10.c:480 msgid "conflicting commands\n" msgstr "WidersprЭchliche Kommandos\n" -#: g10/g10.c:616 +#: g10/g10.c:618 #, fuzzy, c-format msgid "NOTE: no default option file '%s'\n" msgstr "замечание: файл параметров по умолчанию '%s' отсутствует\n" -#: g10/g10.c:620 +#: g10/g10.c:622 #, c-format msgid "option file '%s': %s\n" msgstr "файл параметров '%s': %s\n" -#: g10/g10.c:627 +#: g10/g10.c:629 #, c-format msgid "reading options from '%s'\n" msgstr "читаются параметры из '%s'\n" -#: g10/g10.c:776 +#: g10/g10.c:782 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "Недопустимый символ в комментарии.\n" -#: g10/g10.c:810 g10/g10.c:822 +#: g10/g10.c:817 g10/g10.c:829 msgid "selected cipher algorithm is invalid\n" msgstr "выбран недопустимый алгоритм шифрования\n" -#: g10/g10.c:816 g10/g10.c:828 +#: g10/g10.c:823 g10/g10.c:835 msgid "selected digest algorithm is invalid\n" msgstr "выбран недопустимый дайджест-алгоритм\n" -#: g10/g10.c:831 +#: g10/g10.c:838 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "алгоритм упаковки может иметь значения от %d до %d\n" -#: g10/g10.c:833 +#: g10/g10.c:840 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed должен быть больше 0\n" -#: g10/g10.c:835 +#: g10/g10.c:842 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed должен быть больше 1\n" -#: g10/g10.c:837 +#: g10/g10.c:844 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:840 +#: g10/g10.c:847 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "замечание: простой S2K режим (0) очень не рекомендуется\n" -#: g10/g10.c:844 +#: g10/g10.c:851 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "недопустимый режим S2K: должен быть 0, 1 или 3\n" -#: g10/g10.c:927 +#: g10/g10.c:934 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Ошибка инициализации базы данных доверия: %s\n" -#: g10/g10.c:933 +#: g10/g10.c:940 msgid "--store [filename]" msgstr "--store [имя файла]" -#: g10/g10.c:941 +#: g10/g10.c:948 msgid "--symmetric [filename]" msgstr "--symmetric [имя файла]" -#: g10/g10.c:949 +#: g10/g10.c:956 msgid "--encrypt [filename]" msgstr "--encrypt [имя файла]" -#: g10/g10.c:962 +#: g10/g10.c:969 msgid "--sign [filename]" msgstr "--sign [имя файла]" -#: g10/g10.c:975 +#: g10/g10.c:982 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [имя файла]" -#: g10/g10.c:989 +#: g10/g10.c:996 msgid "--clearsign [filename]" msgstr "--clearsign [имя файла]" -#: g10/g10.c:1001 +#: g10/g10.c:1008 msgid "--decrypt [filename]" msgstr "--decrypt [имя файла]" -#: g10/g10.c:1010 +#: g10/g10.c:1017 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key имя-пользователя" -#: g10/g10.c:1026 +#: g10/g10.c:1033 msgid "--delete-secret-key username" msgstr "--delete-secret-key имя-пользователя" -#: g10/g10.c:1029 +#: g10/g10.c:1036 msgid "--delete-key username" msgstr "--delete-key имя-пользователя" -#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "невозможно открыть файл '%s': %s\n" -#: g10/g10.c:1063 +#: g10/g10.c:1070 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [идентификатор пользователя] [связка ключей]" -#: g10/g10.c:1120 +#: g10/g10.c:1127 #, c-format msgid "dearmoring failed: %s\n" msgstr "ошибка декодирования: %s\n" -#: g10/g10.c:1128 +#: g10/g10.c:1135 #, c-format msgid "enarmoring failed: %s\n" msgstr "ошибка кодирования: %s\n" -#: g10/g10.c:1194 +#: g10/g10.c:1201 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "недопустимый хэш-алгоритм '%s'\n" -#: g10/g10.c:1273 +#: g10/g10.c:1280 msgid "[filename]" msgstr "[имя файла]" -#: g10/g10.c:1277 +#: g10/g10.c:1284 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "невозможно открыть файл '%s'\n" @@ -798,7 +798,7 @@ msgstr " msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "не найдено допустимых RFC1991 или OpenPGP данных.\n" -#: g10/pkclist.c:121 +#: g10/pkclist.c:138 #, fuzzy, c-format msgid "" "No trust value assigned to %lu:\n" @@ -807,7 +807,7 @@ msgstr "" "Не определены параметры доверия для %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:131 +#: g10/pkclist.c:148 #, fuzzy msgid "" "Please decide how far you trust this user to correctly\n" @@ -832,25 +832,30 @@ msgstr "" " 4 = Верю полностью\n" " s = Пожалуйста, покажите дополнительную информацию\n" -#: g10/pkclist.c:140 +#: g10/pkclist.c:157 msgid " m = back to the main menu\n" msgstr " m = обратно в главное меню\n" +#: g10/pkclist.c:159 +msgid " q = quit\n" +msgstr "" + # valid user replies (not including 1..4) #. a string with valid answers -#: g10/pkclist.c:145 -msgid "sSmM" -msgstr "sSmM" +#: g10/pkclist.c:164 +#, fuzzy +msgid "sSmMqQ" +msgstr "sSmMqQ" -#: g10/pkclist.c:149 +#: g10/pkclist.c:168 msgid "Your decision? " msgstr "Ваше решение? " -#: g10/pkclist.c:169 +#: g10/pkclist.c:188 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:197 +#: g10/pkclist.c:221 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" @@ -861,65 +866,65 @@ msgstr "" "некоторые недостающие значения \"доверия владельцу\"\n" "\n" -#: g10/pkclist.c:219 +#: g10/pkclist.c:251 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" -#: g10/pkclist.c:221 +#: g10/pkclist.c:253 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "" -#: g10/pkclist.c:223 +#: g10/pkclist.c:255 #, fuzzy msgid "" "No trust values changed.\n" "\n" msgstr "Значения параметров доверия не изменены.\n" -#: g10/pkclist.c:238 +#: g10/pkclist.c:270 #, fuzzy, c-format msgid "key %08lX: key has been revoked!\n" msgstr "build_sigrecs: ключ ist widerrufen\n" -#: g10/pkclist.c:244 g10/pkclist.c:335 +#: g10/pkclist.c:276 g10/pkclist.c:369 msgid "Use this key anyway? " msgstr "Все равно использовать этот ключ?" -#: g10/pkclist.c:266 +#: g10/pkclist.c:298 #, fuzzy, c-format msgid "%08lX: key has expired\n" msgstr "Замечание: Срок действия ключа уже истек!\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:304 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" -#: g10/pkclist.c:288 +#: g10/pkclist.c:322 #, fuzzy, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "ВНИМАНИЕ: Мы НЕ доверяем этому ключу!\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:328 #, 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:300 +#: g10/pkclist.c:334 msgid "This key probably belongs to the owner\n" msgstr "" -#: g10/pkclist.c:305 +#: g10/pkclist.c:339 msgid "This key belongs to us\n" msgstr "" -#: g10/pkclist.c:330 +#: g10/pkclist.c:364 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" @@ -930,50 +935,50 @@ msgstr "" "кто указан его владельцем. Отвечайте \"да\" на следующий вопрос,\n" "только если вы *действительно* понимаете что делаете.\n" -#: g10/pkclist.c:339 +#: g10/pkclist.c:373 msgid "WARNING: Using untrusted key!\n" msgstr "ВНИМАНИЕ: Используется ключ к которому нет доверия!\n" -#: g10/pkclist.c:375 +#: g10/pkclist.c:409 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ВНИМАНИЕ: Владелец ключа уже отозвал его!\n" -#: g10/pkclist.c:376 +#: g10/pkclist.c:410 msgid " This could mean that the signature is forgery.\n" msgstr " Это может означать, что подпись поддельная.\n" -#: g10/pkclist.c:397 +#: g10/pkclist.c:431 msgid "Note: This key has expired!\n" msgstr "Замечание: Срок действия ключа уже истек!\n" -#: g10/pkclist.c:404 +#: g10/pkclist.c:438 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "ВНИМАНИЕ: Этот ключ не заверен доверенной подписью!\n" -#: g10/pkclist.c:406 +#: g10/pkclist.c:440 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Нет никаких указания на то, что ключ принадлежит его владельцу.\n" -#: g10/pkclist.c:421 +#: g10/pkclist.c:456 msgid "WARNING: We do NOT trust this key!\n" msgstr "ВНИМАНИЕ: Мы НЕ доверяем этому ключу!\n" -#: g10/pkclist.c:422 +#: g10/pkclist.c:457 msgid " The signature is probably a FORGERY.\n" msgstr " Подпись вероятно -- ПОДДЕЛКА.\n" -#: g10/pkclist.c:429 +#: g10/pkclist.c:464 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "ВНИМАНИЕ: Этот ключ не заверен достаточно доверенными подписями!\n" -#: g10/pkclist.c:432 +#: g10/pkclist.c:467 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Нет уверенности, что подпись принадлежит владельцу.\n" -#: g10/pkclist.c:477 +#: g10/pkclist.c:512 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -982,25 +987,25 @@ msgstr "" "\"-r\").\n" "\n" -#: g10/pkclist.c:482 +#: g10/pkclist.c:517 msgid "Enter the user ID: " msgstr "Введите идентификатор пользователя: " -#: g10/pkclist.c:493 +#: g10/pkclist.c:528 msgid "No such user ID.\n" msgstr "Нет такого идентификатора пользователя.\n" -#: g10/pkclist.c:527 g10/pkclist.c:554 +#: g10/pkclist.c:562 g10/pkclist.c:589 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: пропущен: %s\n" -#: g10/pkclist.c:535 +#: g10/pkclist.c:570 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: ошибка при проверке ключа: %s\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:596 msgid "no valid addressees\n" msgstr "нет допустимых адресов\n" @@ -1362,7 +1367,7 @@ msgstr "" msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "используется дополнительный ключ %09lX вместо основного %08lX%\n" -#: g10/import.c:129 g10/trustdb.c:1166 +#: g10/import.c:129 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "невозможно открыть файл: %s\n" @@ -1372,12 +1377,12 @@ msgstr " msgid "skipping block of type %d\n" msgstr "пропускаем блок типа %d\n" -#: g10/import.c:152 g10/trustdb.c:1425 g10/trustdb.c:1494 +#: g10/import.c:152 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" msgstr "" -#: g10/import.c:157 g10/trustdb.c:1242 +#: g10/import.c:157 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "ошибка чтения: %s\n" @@ -1460,7 +1465,7 @@ msgstr " msgid "no default public keyring\n" msgstr "нет связки открытых ключей по умолчанию\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:569 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #, c-format msgid "writing to '%s'\n" msgstr "записывается в '%s'\n" @@ -2132,6 +2137,11 @@ msgstr "" msgid "can't handle public key algorithm %d\n" msgstr "невозможно заблокировать связку открытых ключей: %s\n" +#: g10/parse-packet.c:801 +#, c-format +msgid "subpacket of type %d has critical bit set\n" +msgstr "" + #: g10/passphrase.c:141 msgid "" "\n" @@ -2157,19 +2167,19 @@ msgstr " msgid "Repeat passphrase: " msgstr "Повторите ключевую фразу: %s\n" -#: g10/plaintext.c:102 +#: g10/plaintext.c:103 msgid "data not saved; use option \"--output\" to save it\n" msgstr "данные не были сохранены; воспользуйтесь --\"output\" для сохранения\n" -#: g10/plaintext.c:215 +#: g10/plaintext.c:216 msgid "Please enter name of data file: " msgstr "Пожалуйста, введите имя файла данных: " -#: g10/plaintext.c:236 +#: g10/plaintext.c:237 msgid "reading stdin ...\n" msgstr "" -#: g10/plaintext.c:299 +#: g10/plaintext.c:300 #, c-format msgid "can't open signed data '%s'\n" msgstr "невозможно открыть подписанные данные '%s' .\n" @@ -2223,12 +2233,16 @@ msgstr "" msgid "NOTE: signature key expired %s\n" msgstr "предупреждение: ключ подписи устарел %s\n" +#: g10/sig-check.c:226 +msgid "assuming bad signature due to an unknown critical bit\n" +msgstr "" + #: g10/sign.c:69 #, fuzzy, c-format msgid "%s signature from: %s\n" msgstr "ПЛОХАЯ подпись от \"" -#: g10/sign.c:200 g10/sign.c:564 +#: g10/sign.c:200 g10/sign.c:587 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "%s: невозможно открыть: %s\n" @@ -2368,536 +2382,536 @@ msgstr "" msgid "%s: failed to append a record: %s\n" msgstr "" -#: g10/trustdb.c:134 +#: g10/trustdb.c:142 msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n" msgstr "База данных доверия разрушена: запустите \"gpgm --fix-trust-db\".\n" -#: g10/trustdb.c:147 +#: g10/trustdb.c:155 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" msgstr "" -#: g10/trustdb.c:162 +#: g10/trustdb.c:170 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" msgstr "" -#: g10/trustdb.c:176 +#: g10/trustdb.c:184 #, fuzzy, c-format msgid "trust record %lu: delete failed: %s\n" msgstr "обновление секрета не удалось: %s\n" -#: g10/trustdb.c:190 +#: g10/trustdb.c:198 #, fuzzy, c-format msgid "trust db: sync failed: %s\n" msgstr "обновление базы данных доверия не удалось: %s\n" -#: g10/trustdb.c:319 +#: g10/trustdb.c:327 #, fuzzy, c-format msgid "error reading dir record for LID %lu: %s\n" msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" -#: g10/trustdb.c:326 +#: g10/trustdb.c:334 #, c-format msgid "lid %lu: expected dir record, got type %d\n" msgstr "" -#: g10/trustdb.c:331 +#: g10/trustdb.c:339 #, c-format msgid "no primary key for LID %lu\n" msgstr "" -#: g10/trustdb.c:336 +#: g10/trustdb.c:344 #, fuzzy, c-format msgid "error reading primary key for LID %lu: %s\n" msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" -#: g10/trustdb.c:412 +#: g10/trustdb.c:420 #, c-format msgid "chained sigrec %lu has a wrong owner\n" msgstr "" -#: g10/trustdb.c:455 +#: g10/trustdb.c:463 #, fuzzy, c-format msgid "'%s' is not a valid long keyID\n" msgstr "Недопустимый символ в комментарии.\n" -#: g10/trustdb.c:490 +#: g10/trustdb.c:498 #, fuzzy, c-format msgid "key %08lX: no public key for trusted key - skipped\n" msgstr "секретный ключ %08lX: не имеет соответствующего открытого ключа.\n" -#: g10/trustdb.c:499 g10/trustdb.c:557 +#: g10/trustdb.c:507 g10/trustdb.c:565 #, fuzzy, c-format msgid "key %08lX: can't put it into the trustdb\n" msgstr "ключ %08lX.%lu: невозможно положить в базу данных доверия\n" -#: g10/trustdb.c:504 g10/trustdb.c:563 +#: g10/trustdb.c:512 g10/trustdb.c:571 #, fuzzy, c-format msgid "key %08lX: query record failed\n" msgstr "ключ %08lX: запрос записи не удался\n" -#: g10/trustdb.c:509 g10/trustdb.c:572 +#: g10/trustdb.c:517 g10/trustdb.c:580 #, fuzzy, c-format msgid "key %08lX: already in trusted key table\n" msgstr "ключ %08lX: уже на связке секретных ключей\n" -#: g10/trustdb.c:512 g10/trustdb.c:575 +#: g10/trustdb.c:520 g10/trustdb.c:583 #, fuzzy, c-format msgid "key %08lX: accepted as trusted key.\n" msgstr "ключ %08lX: уже на связке секретных ключей\n" -#: g10/trustdb.c:528 +#: g10/trustdb.c:536 #, fuzzy, c-format msgid "NOTE: secret key %08lX is NOT protected.\n" msgstr "Этот ключ не защищен.\n" -#: g10/trustdb.c:540 +#: g10/trustdb.c:548 #, fuzzy, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "секретный ключ %08lX: не имеет соответствующего открытого ключа.\n" -#: g10/trustdb.c:547 +#: g10/trustdb.c:555 #, c-format msgid "key %08lX: secret and public key don't match\n" msgstr "ключ %08lX: секретный и открытого ключи не совпадают.\n" -#: g10/trustdb.c:583 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "enumerate secret keys failed: %s\n" msgstr "обновление секрета не удалось: %s\n" -#: g10/trustdb.c:766 +#: g10/trustdb.c:774 #, fuzzy, c-format msgid "lid %lu: read dir record failed: %s\n" msgstr "ключ %08lX.%lu: вставка доверительной записи не удалась: %s\n" -#: g10/trustdb.c:775 +#: g10/trustdb.c:783 #, fuzzy, c-format msgid "lid %lu: read key record failed: %s\n" msgstr "ключ %08lX.%lu: вставка доверительной записи не удалась: %s\n" -#: g10/trustdb.c:785 +#: g10/trustdb.c:793 #, fuzzy, c-format msgid "lid %lu: read uid record failed: %s\n" msgstr "ключ %08lX.%lu: вставка доверительной записи не удалась: %s\n" -#: g10/trustdb.c:794 +#: g10/trustdb.c:802 #, fuzzy, c-format msgid "lid %lu: read pref record failed: %s\n" msgstr "ключ %08lX.%lu: вставка доверительной записи не удалась: %s\n" -#: g10/trustdb.c:804 +#: g10/trustdb.c:812 #, fuzzy, c-format msgid "lid %lu: read sig record failed: %s\n" msgstr "ключ %08lX.%lu: вставка доверительной записи не удалась: %s\n" -#: g10/trustdb.c:999 +#: g10/trustdb.c:1013 msgid "Ooops, no keys\n" msgstr "" -#: g10/trustdb.c:1003 +#: g10/trustdb.c:1017 #, fuzzy msgid "Ooops, no user ids\n" msgstr "список ключей и идентификаторов пользователей" -#: g10/trustdb.c:1074 g10/trustdb.c:1092 +#: g10/trustdb.c:1088 g10/trustdb.c:1106 #, c-format msgid "user '%s' read problem: %s\n" msgstr "" -#: g10/trustdb.c:1077 g10/trustdb.c:1095 +#: g10/trustdb.c:1091 g10/trustdb.c:1109 #, c-format msgid "user '%s' list problem: %s\n" msgstr "" -#: g10/trustdb.c:1085 g10/trustdb.c:1300 +#: g10/trustdb.c:1099 g10/trustdb.c:1346 #, fuzzy, c-format msgid "user '%s' not found: %s\n" msgstr "%s: пользователь не найден\n" -#: g10/trustdb.c:1087 g10/trustdb.c:1302 +#: g10/trustdb.c:1101 g10/trustdb.c:1348 #, c-format msgid "problem finding '%s' in trustdb: %s\n" msgstr "" -#: g10/trustdb.c:1090 +#: g10/trustdb.c:1104 #, c-format msgid "user '%s' not in trustdb\n" msgstr "" -#: g10/trustdb.c:1125 +#: g10/trustdb.c:1139 #, c-format msgid "" "# List of assigned trustvalues, created %s\n" "# (Use \"gpgm --import-ownertrust\" to restore them)\n" msgstr "" -#: g10/trustdb.c:1131 +#: g10/trustdb.c:1145 msgid "directory record w/o primary key\n" msgstr "" -#: g10/trustdb.c:1138 +#: g10/trustdb.c:1152 #, fuzzy, c-format msgid "error reading key record: %s\n" msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" -#: g10/trustdb.c:1178 +#: g10/trustdb.c:1192 msgid "line too long\n" msgstr "" -#: g10/trustdb.c:1186 +#: g10/trustdb.c:1200 msgid "error: missing colon\n" msgstr "" -#: g10/trustdb.c:1191 +#: g10/trustdb.c:1205 #, fuzzy msgid "error: invalid fingerprint\n" msgstr "ошибка в завершающей строке\n" -#: g10/trustdb.c:1195 +#: g10/trustdb.c:1209 #, fuzzy msgid "error: no ownertrust value\n" msgstr "экспортировать параметры доверия\n" -#: g10/trustdb.c:1209 +#: g10/trustdb.c:1223 #, c-format msgid "LID %lu: changing trust from %u to %u\n" msgstr "" -#: g10/trustdb.c:1212 +#: g10/trustdb.c:1226 #, c-format msgid "LID %lu: setting trust to %u\n" msgstr "" -#: g10/trustdb.c:1220 +#: g10/trustdb.c:1234 msgid "key not in trustdb, searching ring.\n" msgstr "" -#: g10/trustdb.c:1223 +#: g10/trustdb.c:1237 #, fuzzy, c-format msgid "key not in ring: %s\n" msgstr "невозможно записать связку ключей: %s\n" -#: g10/trustdb.c:1227 +#: g10/trustdb.c:1241 msgid "Oops: key is now in trustdb???\n" msgstr "" #. update the ownertrust -#: g10/trustdb.c:1232 +#: g10/trustdb.c:1246 #, fuzzy, c-format msgid "insert trust record failed: %s\n" msgstr "ключ %08lX.%lu: вставка доверительной записи не удалась: %s\n" #. error -#: g10/trustdb.c:1238 +#: g10/trustdb.c:1252 #, fuzzy, c-format msgid "error finding dir record: %s\n" msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" -#: g10/trustdb.c:1305 +#: g10/trustdb.c:1351 #, c-format msgid "user '%s' not in trustdb - inserting\n" msgstr "" -#: g10/trustdb.c:1308 +#: g10/trustdb.c:1354 #, fuzzy, c-format msgid "failed to put '%s' into trustdb: %s\n" msgstr "Ошибка инициализации базы данных доверия: %s\n" -#: g10/trustdb.c:1355 +#: g10/trustdb.c:1404 #, c-format msgid "%s: keyblock read problem: %s\n" msgstr "" -#: g10/trustdb.c:1369 +#: g10/trustdb.c:1418 #, fuzzy, c-format msgid "%s: update failed: %s\n" msgstr "обновление не удалось: %s\n" -#: g10/trustdb.c:1372 +#: g10/trustdb.c:1421 #, c-format msgid "%s: updated\n" msgstr "" -#: g10/trustdb.c:1374 +#: g10/trustdb.c:1423 #, c-format msgid "%s: okay\n" msgstr "" -#: g10/trustdb.c:1389 +#: g10/trustdb.c:1438 #, c-format msgid "lid %lu: dir record w/o key - skipped\n" msgstr "" -#: g10/trustdb.c:1402 +#: g10/trustdb.c:1451 #, fuzzy, c-format msgid "lid %lu: keyblock not found: %s\n" msgstr "ключ %08lX: открытый ключ не найден: %s\n" -#: g10/trustdb.c:1411 g10/trustdb.c:1480 +#: g10/trustdb.c:1460 g10/trustdb.c:1529 #, fuzzy, c-format msgid "lid %lu: update failed: %s\n" msgstr "обновление не удалось: %s\n" -#: g10/trustdb.c:1417 g10/trustdb.c:1486 +#: g10/trustdb.c:1466 g10/trustdb.c:1535 #, c-format msgid "lid %lu: updated\n" msgstr "" -#: g10/trustdb.c:1421 g10/trustdb.c:1490 +#: g10/trustdb.c:1470 g10/trustdb.c:1539 #, c-format msgid "lid %lu: okay\n" msgstr "" -#: g10/trustdb.c:1428 g10/trustdb.c:1496 +#: g10/trustdb.c:1477 g10/trustdb.c:1545 #, c-format msgid "%lu keys processed\n" msgstr "" -#: g10/trustdb.c:1430 +#: g10/trustdb.c:1479 #, fuzzy, c-format msgid "\t%lu keys skipped\n" msgstr "%s: пропущен: %s\n" -#: g10/trustdb.c:1432 g10/trustdb.c:1498 +#: g10/trustdb.c:1481 g10/trustdb.c:1547 #, fuzzy, c-format msgid "\t%lu keys with errors\n" msgstr "Ошибка записи файла" -#: g10/trustdb.c:1434 g10/trustdb.c:1500 +#: g10/trustdb.c:1483 g10/trustdb.c:1549 #, c-format msgid "\t%lu keys updated\n" msgstr "" -#: g10/trustdb.c:1464 +#: g10/trustdb.c:1513 #, fuzzy, c-format msgid "lid ?: insert failed: %s\n" msgstr "обновление секрета не удалось: %s\n" -#: g10/trustdb.c:1469 +#: g10/trustdb.c:1518 #, fuzzy, c-format msgid "lid %lu: insert failed: %s\n" msgstr "обновление секрета не удалось: %s\n" -#: g10/trustdb.c:1475 +#: g10/trustdb.c:1524 #, c-format msgid "lid %lu: inserted\n" msgstr "" -#: g10/trustdb.c:1502 +#: g10/trustdb.c:1551 #, c-format msgid "\t%lu keys inserted\n" msgstr "" -#: g10/trustdb.c:1505 +#: g10/trustdb.c:1554 #, fuzzy, c-format msgid "enumerate keyblocks failed: %s\n" msgstr "обновление секрета не удалось: %s\n" -#: g10/trustdb.c:1550 +#: g10/trustdb.c:1599 #, fuzzy, c-format msgid "check_trust: search dir record failed: %s\n" msgstr "ключ %08lX.%lu: вставка доверительной записи не удалась: %s\n" -#: g10/trustdb.c:1557 +#: g10/trustdb.c:1606 #, fuzzy, c-format msgid "key %08lX: insert trust record failed: %s\n" msgstr "ключ %08lX.%lu: вставка доверительной записи не удалась: %s\n" -#: g10/trustdb.c:1561 +#: g10/trustdb.c:1610 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" msgstr "ключ %08lX.%lu: вставлен в базу данных доверия\n" -#: g10/trustdb.c:1569 +#: g10/trustdb.c:1618 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "" "ключ %08lX.%lu: сгенерирован в будущем (неправильно установлены часы)\n" -#: g10/trustdb.c:1576 +#: g10/trustdb.c:1625 #, c-format msgid "key %08lX.%lu: expired at %s\n" msgstr "ключ %08lX.%lu: срок действия истек %s\n" -#: g10/trustdb.c:1584 +#: g10/trustdb.c:1633 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" msgstr "ключ %08lX.%lu: проверка доверия не удалась: %s\n" -#: g10/trustdb.c:1753 g10/trustdb.c:1782 g10/trustdb.c:2521 +#: g10/trustdb.c:1820 g10/trustdb.c:1849 g10/trustdb.c:2588 msgid "WARNING: can't yet handle long pref records\n" msgstr "" -#: g10/trustdb.c:1804 +#: g10/trustdb.c:1871 #, fuzzy, c-format msgid "get_dir_record: search_record failed: %s\n" msgstr "обновление секрета не удалось: %s\n" -#: g10/trustdb.c:1867 +#: g10/trustdb.c:1934 #, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" msgstr "" -#: g10/trustdb.c:1871 +#: g10/trustdb.c:1938 #, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n" msgstr "" #. we need the dir record -#: g10/trustdb.c:1878 +#: g10/trustdb.c:1945 #, c-format msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n" msgstr "" -#: g10/trustdb.c:1884 +#: g10/trustdb.c:1951 #, c-format msgid "lid %lu: no primary key\n" msgstr "" -#: g10/trustdb.c:1917 +#: g10/trustdb.c:1984 #, fuzzy, c-format msgid "lid %lu: user id not found in keyblock\n" msgstr "%s: пользователь не найден\n" -#: g10/trustdb.c:1921 +#: g10/trustdb.c:1988 #, fuzzy, c-format msgid "lid %lu: user id without signature\n" msgstr "ключ %08lX: нет идентификатора пользователя для подписи\n" -#: g10/trustdb.c:1928 +#: g10/trustdb.c:1995 #, fuzzy, c-format msgid "lid %lu: self-signature in hintlist\n" msgstr "build_sigrecs: Selbst-Signatur fehlt\n" -#: g10/trustdb.c:1939 g10/trustdb.c:2658 g10/trustdb.c:2742 +#: g10/trustdb.c:2006 g10/trustdb.c:2725 g10/trustdb.c:2809 #, fuzzy msgid "Valid certificate revocation" msgstr "Плохой сертификат" -#: g10/trustdb.c:1940 g10/trustdb.c:2659 g10/trustdb.c:2743 +#: g10/trustdb.c:2007 g10/trustdb.c:2726 g10/trustdb.c:2810 #, fuzzy msgid "Good certificate" msgstr "Плохой сертификат" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:2016 msgid "very strange: no public key\n" msgstr "" -#: g10/trustdb.c:1997 +#: g10/trustdb.c:2064 #, c-format msgid "hintlist %lu[%d] of %lu does not point to a dir record\n" msgstr "" -#: g10/trustdb.c:2003 +#: g10/trustdb.c:2070 #, c-format msgid "lid %lu does not have a key\n" msgstr "" -#: g10/trustdb.c:2013 +#: g10/trustdb.c:2080 #, fuzzy, c-format msgid "lid %lu: can't get keyblock: %s\n" msgstr "невозможно записать блок ключа: %s\n" -#: g10/trustdb.c:2070 g10/trustdb.c:2984 +#: g10/trustdb.c:2137 g10/trustdb.c:3051 #, fuzzy, c-format msgid "tdbio_search_dir failed: %s\n" msgstr "ошибка декодирования: %s\n" -#: g10/trustdb.c:2223 +#: g10/trustdb.c:2290 #, fuzzy, c-format msgid "key %08lX.%lu: Good subkey binding\n" msgstr "ключ %08lX: нет идентификатора пользователя\n" -#: g10/trustdb.c:2229 g10/trustdb.c:2271 +#: g10/trustdb.c:2296 g10/trustdb.c:2338 #, fuzzy, c-format msgid "key %08lX.%lu: Invalid subkey binding: %s\n" msgstr "ключ %08lX: нет допустимых идентификаторов пользователей\n" -#: g10/trustdb.c:2244 +#: g10/trustdb.c:2311 #, fuzzy, c-format msgid "key %08lX.%lu: Valid key revocation\n" msgstr "ключ %08lX.%lu: срок действия истек %s\n" -#: g10/trustdb.c:2250 +#: g10/trustdb.c:2317 #, fuzzy, c-format msgid "key %08lX.%lu: Invalid key revocation: %s\n" msgstr "ключ %08lX: открытый ключ не найден: %s\n" -#: g10/trustdb.c:2265 +#: g10/trustdb.c:2332 #, fuzzy, c-format msgid "key %08lX.%lu: Valid subkey revocation\n" msgstr "ключ %08lX: нет допустимых идентификаторов пользователей\n" -#: g10/trustdb.c:2365 +#: g10/trustdb.c:2432 #, fuzzy msgid "Good self-signature" msgstr "[само-подпись]\n" -#: g10/trustdb.c:2376 +#: g10/trustdb.c:2443 #, fuzzy msgid "Invalid self-signature" msgstr "ключ %08lX: недопустимая само-подпись\n" -#: g10/trustdb.c:2386 +#: g10/trustdb.c:2453 msgid "Valid user ID revocation skipped due to a newer self signature\n" msgstr "" -#: g10/trustdb.c:2393 +#: g10/trustdb.c:2460 #, fuzzy msgid "Valid user ID revocation\n" msgstr "Недопустимый выбор.\n" -#: g10/trustdb.c:2400 +#: g10/trustdb.c:2467 #, fuzzy msgid "Invalid user ID revocation" msgstr "Недопустимый выбор.\n" -#: g10/trustdb.c:2484 +#: g10/trustdb.c:2551 msgid "Too many preferences" msgstr "" -#: g10/trustdb.c:2498 +#: g10/trustdb.c:2565 msgid "Too many preference items" msgstr "" -#: g10/trustdb.c:2637 +#: g10/trustdb.c:2704 msgid "Duplicated certificate - deleted" msgstr "" -#: g10/trustdb.c:2670 +#: g10/trustdb.c:2737 #, fuzzy msgid "Hmmm, public key lost?" msgstr "Плохой открытый ключ" -#: g10/trustdb.c:2680 g10/trustdb.c:2763 +#: g10/trustdb.c:2747 g10/trustdb.c:2830 #, fuzzy msgid "Invalid certificate revocation" msgstr "Плохой сертификат" -#: g10/trustdb.c:2681 g10/trustdb.c:2764 +#: g10/trustdb.c:2748 g10/trustdb.c:2831 #, fuzzy msgid "Invalid certificate" msgstr "Плохой сертификат" -#: g10/trustdb.c:2696 +#: g10/trustdb.c:2763 #, c-format msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" msgstr "" -#: g10/trustdb.c:2710 +#: g10/trustdb.c:2777 #, c-format msgid "sig record %lu[%d] points to wrong record.\n" msgstr "" #. that should never happen -#: g10/trustdb.c:2954 +#: g10/trustdb.c:3021 #, fuzzy, c-format msgid "insert_trust_record: keyblock not found: %s\n" msgstr "ключ %08lX: секретный ключ не найден: %s\n" -#: g10/trustdb.c:2972 +#: g10/trustdb.c:3039 msgid "did not use primary key for insert_trust_record()\n" msgstr "" @@ -2996,106 +3010,106 @@ msgstr "" "раз!\n" #. begin of list -#: g10/helptext.c:45 +#: g10/helptext.c:48 msgid "edit_ownertrust.value" msgstr "" -#: g10/helptext.c:51 +#: g10/helptext.c:54 msgid "revoked_key.override" msgstr "" -#: g10/helptext.c:55 +#: g10/helptext.c:58 msgid "untrusted_key.override" msgstr "" -#: g10/helptext.c:59 +#: g10/helptext.c:62 msgid "pklist.user_id.enter" msgstr "" -#: g10/helptext.c:63 +#: g10/helptext.c:66 msgid "keygen.algo" msgstr "" -#: g10/helptext.c:79 +#: g10/helptext.c:82 msgid "keygen.algo.elg_se" msgstr "" -#: g10/helptext.c:86 +#: g10/helptext.c:89 msgid "keygen.size" msgstr "" -#: g10/helptext.c:90 +#: g10/helptext.c:93 msgid "keygen.size.huge.okay" msgstr "" -#: g10/helptext.c:95 +#: g10/helptext.c:98 msgid "keygen.size.large.okay" msgstr "" -#: g10/helptext.c:100 +#: g10/helptext.c:103 msgid "keygen.valid" msgstr "" -#: g10/helptext.c:104 +#: g10/helptext.c:107 msgid "keygen.valid.okay" msgstr "" -#: g10/helptext.c:109 +#: g10/helptext.c:112 msgid "keygen.name" msgstr "" -#: g10/helptext.c:114 +#: g10/helptext.c:117 msgid "keygen.email" msgstr "" -#: g10/helptext.c:118 +#: g10/helptext.c:121 msgid "keygen.comment" msgstr "" -#: g10/helptext.c:123 +#: g10/helptext.c:126 msgid "keygen.userid.cmd" msgstr "" -#: g10/helptext.c:132 +#: g10/helptext.c:135 msgid "keygen.sub.okay" msgstr "" -#: g10/helptext.c:136 +#: g10/helptext.c:139 msgid "sign_uid.okay" msgstr "" -#: g10/helptext.c:141 +#: g10/helptext.c:144 msgid "change_passwd.empty.okay" msgstr "" -#: g10/helptext.c:146 +#: g10/helptext.c:149 msgid "keyedit.cmd" msgstr "" -#: g10/helptext.c:150 +#: g10/helptext.c:153 msgid "keyedit.save.okay" msgstr "" -#: g10/helptext.c:155 +#: g10/helptext.c:158 msgid "keyedit.cancel.okay" msgstr "" -#: g10/helptext.c:159 +#: g10/helptext.c:162 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/helptext.c:163 +#: g10/helptext.c:166 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/helptext.c:168 +#: g10/helptext.c:171 msgid "keyedit.remove.subkey.okay" msgstr "" # ################################ # ####### Help msgids ############ # ################################ -#: g10/helptext.c:172 +#: g10/helptext.c:175 msgid "passphrase.enter" msgstr "" "Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n" @@ -3110,27 +3124,27 @@ msgstr "" "werden,\n" "sind i.d.R. eine gute Wahl" -#: g10/helptext.c:179 +#: g10/helptext.c:182 msgid "passphrase.repeat" msgstr "" "Um sicher zu gehen, daъ Sie sich bei der Eingabe der \"Passphrase\" nicht\n" "vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n" "Эbereinstimmen, wird die \"Passphrase\" akzeptiert." -#: g10/helptext.c:183 +#: g10/helptext.c:186 #, fuzzy msgid "detached_signature.filename" msgstr "имя файла для отдельной подписи" -#: g10/helptext.c:187 +#: g10/helptext.c:190 msgid "openfile.overwrite.okay" msgstr "Вы желаете перезаписать файл (возможна потеря данных)" -#: g10/helptext.c:201 +#: g10/helptext.c:204 msgid "No help available" msgstr "Помощь отсутствует." -#: g10/helptext.c:213 +#: g10/helptext.c:216 #, c-format msgid "No help available for '%s'" msgstr "Помощь для '%s' отсутствует." diff --git a/scripts/ChangeLog b/scripts/ChangeLog index eb1fe5ab2..7151ecaa3 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +Wed Dec 23 13:18:14 CET 1998 Werner Koch + + * gnupg.spec: Updated version by Fabio Coatti + Thu Dec 17 18:31:15 CET 1998 Werner Koch * gnupg.spec: New version by Reuben Sumner and did some more diff --git a/scripts/gnupg.spec b/scripts/gnupg.spec index e2961e50f..34a8c2005 100644 --- a/scripts/gnupg.spec +++ b/scripts/gnupg.spec @@ -3,56 +3,82 @@ # This is a template. The dist target uses it to create the real file. # %define version @pkg_version@ +%define name gnupg Summary: GPL public key crypto -Name: gnupg +Name: %{name} Version: %{version} Release: 1 Copyright: GPL Group: Applications/Cryptography -Source: ftp://ftp.gnupg.org/pub/gcrypt/gnupg-%{version}.tar.gz +Source: ftp://ftp.gnupg.org/pub/gcrypt/%{name}-%{version}.tar.gz URL: http://www.gnupg.org Provides: gpg openpgp -BuildRoot: /tmp/gnupg +BuildRoot: /tmp/rpmbuild_%{name} + +%changelog +* Sat Dec 19 1998 Fabio Coatti +- Modified the spec file provided by Caskey L. Dickson +- Now it can be built also by non-root. Installation has to be done as +root, gpg is suid. +- Added some changes by Ross Golder +- Updates for version 0.4.5 of GnuPG (.mo files) %description -GnuPG is a complete and free replacement for PGP. Because it does not use -IDEA or RSA it can be used without any restrictions. GnuPG is in +GnuPG is a complete and free replacement for PGP. Because it does not +use IDEA or RSA it can be used without any restrictions. GnuPG is in compliance with the OpenPGP specification (RFC2440). +%description -l it +GnuPG Х un sostituto completo e gratuito per il PGP. Non utilizzando +IDEA o RSA puР essere utilizzato senza restrizioni. GnuPG Х conforme +alle specifiche OpenPGP (RFC2440). + %prep +rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_DIR/%{name}-%{version} + %setup -rm -rf $RPM_BUILD_ROOT - %build -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr make %install -make prefix="${RPM_BUILD_ROOT}/usr" install +make install-strip prefix=$RPM_BUILD_ROOT/usr +rm $RPM_BUILD_ROOT/usr/man/man1/gpgm.1 +cd $RPM_BUILD_ROOT/usr/man/man1/ +ln -s gpg.1 gpgm.1 + +%files + +%doc %attr (-,root,root) INSTALL +%doc %attr (-,root,root) AUTHORS +%doc %attr (-,root,root) COPYING +%doc %attr (-,root,root) ChangeLog +%doc %attr (-,root,root) NEWS +%doc %attr (-,root,root) README +%doc %attr (-,root,root) THANKS +%doc %attr (-,root,root) TODO +%doc %attr (-,root,root) doc/DETAILS +%doc %attr (-,root,root) doc/FAQ +%doc %attr (-,root,root) doc/HACKING +%doc %attr (-,root,root) doc/OpenPGP + +%attr (-,root,root) /usr/man/man1/gpg.1 +%attr (-,root,root) /usr/man/man1/gpgm.1 +%attr (4755,root,root) /usr/bin/gpg +%attr (755,root,root) /usr/bin/gpgm +#%attr (-,root,root) /usr/share/locale/en/LC_MESSAGES/%{name}.mo +%attr (-,root,root) /usr/share/locale/de/LC_MESSAGES/%{name}.mo +%attr (-,root,root) /usr/share/locale/it/LC_MESSAGES/%{name}.mo +%attr (-,root,root) /usr/share/locale/fr/LC_MESSAGES/%{name}.mo +%attr (-,root,root) /usr/share/locale/ru/LC_MESSAGES/%{name}.mo +%attr (-,root,root) /usr/share/locale/es_ES/LC_MESSAGES/%{name}.mo +%attr (-,root,root) /usr/share/locale/pt_BR/LC_MESSAGES/%{name}.mo + +%attr (-,root,root) /usr/lib/%{name} +%attr (-,root,root) /usr/share/%{name} %clean rm -rf $RPM_BUILD_ROOT - -%files -%attr(-,root,root) %doc doc/DETAILS -%attr(-,root,root) %doc INSTALL -%attr(-,root,root) %doc AUTHORS -%attr(-,root,root) %doc ABOUT-NLS -%attr(-,root,root) %doc COPYING -%attr(-,root,root) %doc ChangeLog -%attr(-,root,root) %doc NEWS -%attr(-,root,root) %doc README -%attr(-,root,root) %doc THANKS -%attr(-,root,root) %doc TODO -%attr(-,root,root) /usr/man/man1/gpg.1 -%attr (4755,root,root) /usr/bin/gpg -%attr (755,root,root) /usr/bin/gpgm -%attr(-,root,root) /usr/share/locale/en/LC_MESSAGES/gnupg.mo -%attr(-,root,root) /usr/share/locale/de/LC_MESSAGES/gnupg.mo -%attr(-,root,root) /usr/share/locale/it/LC_MESSAGES/gnupg.mo -%attr(-,root,root) /usr/share/locale/fr/LC_MESSAGES/gnupg.mo -%attr(-,root,root) /usr/lib/gnupg/tiger -%attr(-,root,root) /usr/lib/gnupg/twofish -%attr(-,root,root) /usr/share/gnupg/options.skel - +rm -rf $RPM_BUILD_DIR/%{name}-%{version} diff --git a/tools/bftest.c b/tools/bftest.c index 551e8e55d..0bfb4105e 100644 --- a/tools/bftest.c +++ b/tools/bftest.c @@ -1,14 +1,14 @@ /* bftest.c - Blowfish test program * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/tools/mpicalc.c b/tools/mpicalc.c index 3d7ae37ca..22af505ac 100644 --- a/tools/mpicalc.c +++ b/tools/mpicalc.c @@ -7,14 +7,14 @@ * Addition operators: ++ and --. All operators must be delimited by a blank * * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/dotlock.c b/util/dotlock.c index b57583004..794a362f7 100644 --- a/util/dotlock.c +++ b/util/dotlock.c @@ -1,14 +1,14 @@ /* dotlock.c - dotfile locking * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/errors.c b/util/errors.c index b4db10b17..acee8f14b 100644 --- a/util/errors.c +++ b/util/errors.c @@ -1,14 +1,14 @@ /* errors.c - error strings * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/fileutil.c b/util/fileutil.c index 2169f9572..adf5c7a5d 100644 --- a/util/fileutil.c +++ b/util/fileutil.c @@ -1,14 +1,14 @@ /* fileutil.c - file utilities * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/g10u.c b/util/g10u.c index e63b8f7ca..967ba089a 100644 --- a/util/g10u.c +++ b/util/g10u.c @@ -1,14 +1,14 @@ /* g10u.c - Wrapper for utility functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/iobuf.c b/util/iobuf.c index 67a097495..7ed5b722d 100644 --- a/util/iobuf.c +++ b/util/iobuf.c @@ -1,14 +1,14 @@ /* iobuf.c - file handling * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/logger.c b/util/logger.c index cd9380d01..89302161e 100644 --- a/util/logger.c +++ b/util/logger.c @@ -1,14 +1,14 @@ /* logger.c - log functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/memory.c b/util/memory.c index 586a744ec..4370c72ec 100644 --- a/util/memory.c +++ b/util/memory.c @@ -10,14 +10,14 @@ * c) memory usage reporting if compiled with M_DEBUG * d) memory checking if compiled with M_GUARD * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/miscutil.c b/util/miscutil.c index 3e382ead9..5e1844893 100644 --- a/util/miscutil.c +++ b/util/miscutil.c @@ -1,14 +1,14 @@ /* miscutil.c - miscellaneous utilities * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/secmem.c b/util/secmem.c index ffcb45674..ce93a6bf8 100644 --- a/util/secmem.c +++ b/util/secmem.c @@ -1,14 +1,14 @@ /* secmem.c - memory allocation from a secure heap * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/strgutil.c b/util/strgutil.c index 20489dabf..d5379f903 100644 --- a/util/strgutil.c +++ b/util/strgutil.c @@ -1,14 +1,14 @@ /* strgutil.c - miscellaneous utilities * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/util/ttyio.c b/util/ttyio.c index 9f095d86e..cfc8f4dac 100644 --- a/util/ttyio.c +++ b/util/ttyio.c @@ -1,14 +1,14 @@ /* ttyio.c - tty i/O functions * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details.