diff --git a/ChangeLog b/ChangeLog index b92ca4be4..51ae522a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,16 @@ -Mon Jul 26 09:34:46 CEST 1999 Werner Koch +Wed Aug 4 10:34:46 CEST 1999 Werner Koch + * VERSION: Set to 0.9.10. + +Mon Jul 26 09:34:46 CEST 1999 Werner Koch + * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): remove init of ac_cv_... * Makefile.am (DISCLEANFILES): New Fri Jul 23 13:53:03 CEST 1999 Werner Koch - * VERSION: Set to 0.9.9. * configure.in: Print a notice when rndunix is used. diff --git a/NEWS b/NEWS index 06a5c9084..ac834a1af 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,9 @@ +Noteworthy changes in version 0.9.10 +------------------------------------ + * Some strange new options to help pgpgpg + + * Cleaned up the dox a bit. Noteworthy changes in version 0.9.9 diff --git a/README b/README index 23b0021d2..3c015a154 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ GnuPG - The GNU Privacy Guard ------------------------------- - Version 0.9.9 + Version 0.9.10 GnuPG is now in Beta test and you should report all bugs to the mailing list (see below). The 0.9.x versions are released mainly @@ -12,28 +12,6 @@ GnuPG works best on GNU/Linux or *BSD. Other Unices are also supported but are not as well tested as the Free Unices. - Please verify the tar file with the PGP2 or OpenPGP - signatures provided. My PGP2 key is well known and published in - the "Global Trust Register for 1998", ISBN 0-9532397-0-5. - - I have included my pubring as "g10/pubring.asc", which contains - the key used to make GnuPG signatures: - - "pub 1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) " - "Key fingerprint = 6BD9 050F D8FC 941B 4341 2DCC 68B7 AB89 5754 8DCD" - - You may want to add this DSA key to your GnuPG pubring and use it in - the future to verify new releases. Because you verified this README - file and _checked_that_it_is_really_my PGP2 key 0C9857A5, you can be - quite sure that the above fingerprint is correct. - - Please subscribe to announce@gnupg.org by sending a mail with - a subject of "subscribe" to "announce-request@gnupg.org". If you - have problems, please subscribe to "gnupg-users@gnupg.org" by sending - mail with the subject "subscribe" to "gnupg-users-request@gnupg.org" - and ask there. The gnupg.org domain is hosted in Germany to avoid - possible legal problems (technical advices may count as a violation - of ITAR). See the file COPYING for copyright and warranty information. @@ -62,23 +40,99 @@ Here is a quick summary: - 1) "./configure" + 1) Check that you have unmodified sources. The below on how to do this. + Don't skip it - this is an important step! - 2) "make" + 2) Unpack the TAR. With GNU tar you can do it this way: + "tar xzvf gnupg-x.y.z.tar.gz" - 3) "make install" + 3) "cd gnupg-x.y.z" - 4) You end up with a "gpg" binary in /usr/local/bin. - Note: Because some programs rely on the existence of a + 4) "./configure" + + 5) "make" + + 6) "make install" + + 7) You end up with a "gpg" binary in /usr/local/bin. + Note: Because some old programs rely on the existence of a binary named "gpgm"; you should install a symbolic link from gpgm to gpg: - $ cd /usr/local/bin; ln -s gpg gpgm + "cd /usr/local/bin; ln -s gpg gpgm" - 5) To avoid swapping out of sensitive data, you can install "gpg" as + 8) To avoid swapping out of sensitive data, you can install "gpg" as suid root. If you don't do so, you may want to add the option "no-secmem-warning" to ~/.gnupg/options + How to Verify the Source + ------------------------ + + In order to check that the version of GnuPG which you are going to + install is an original and unmodified one, you can do it in one of + the following ways: + + a) If you already have a trusted Version of GnuPG installed, you + can simply check the supplied signature: + + $ gpg --verify gnupg-x.y.z.tar.gz.asc + + This checks that the detached signature gnupg-x.y.z.tar.gz.asc + is indeed a a signature of gnupg-x.y.z.tar.gz. The key used to + create this signature is: + + "pub 1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) " + + If you do not have this key, you can get it from the source in + the file g10/pubring.asc (use "gpg --import g10/pubring.gpg" to + add it to the keyring) or from any keyserver. You have to make + sure that this is really the key and not a faked one. You can do + this by comparing the output of: + + $ gpg --fingerprint 0x57548DCD + + with the elsewhere published fingerprint, or - if you are able to + _positively_ verify the signature of this README file - with + this fingerprint: "6BD9 050F D8FC 941B 4341 2DCC 68B7 AB89 5754 8DCD" + + Please note, that you have to use an old version of GnuPG to + do all this stuff. *Never* use the version which you are going + to check! + + + b) If you have a trusted Version of PGP 2 or 5 installed, you + can check the supplied PGP 2 signature: + + $ pgp gnupg-x.y.z.tar.gz.sig gnupg-x.y.z.tar.gz + + This checks that the detached signature gnupg-x.y.z.tar.gz.sig + is indeed a a signature of gnupg-x.y.z.tar.gz. Please note, + that this signature has been created with a RSA signature and + you probably can't use this method (due to legal reasons) when + you are in the U.S. The key used to create this signature is + the same as the one used to sign this README file. It should be + available at the keyservers and is also included in the source + of GnuPG in g10/pubring.asc. + + "pub 768R/0C9857A5 1995-09-30 Werner Koch " + + The finperprint of this key is published in printed form in the + "Global Trust Register for 1998", ISBN 0-9532397-0-5. + + + c) If you don't have any of the above programs, you have to verify + the MD5 checksum: + + $ md5sum gnupg-x.y.z.tar.gz.sig + + This should yield an output similar to this: + + fd9351b26b3189c1d577f0970f9dcadc gnupg-x.y.z.tar.gz + + Now check that this checksum is _exactly_ the same as the one + published via the anouncement list and probably via Usenet. + + Introduction ------------ @@ -409,15 +463,15 @@ inner structure of a encrypted packet. This command should list all kinds of rfc2440 messages. - gpgm --list-trustdb + gpg --list-trustdb List the contents of the trust DB in a human readable format - gpgm --list-trustdb + gpg --list-trustdb List the tree of certificates for the given usernames - gpgm --list-trust-path username + gpg --list-trust-path username List the possible trust paths for the given username. The length of such a trust path is limited by the option --max-cert-depth @@ -435,8 +489,23 @@ See http://www.gnupg.org/mirrors.html for a list of FTP mirrors and use them if possible. - To avoid possible legal problems we have decided, not to use - the normal www.gnu.org webserver. + We have some mailing lists dedicated to GnuPG: + + gnupg-announce@gnupg.org For important announcements like + new versions and such stuff. + This is a moderated list and has + very low traffic. + gnupg-users@gnupg.org For general user discussion and + help. + gnupg-devel@gnupg.org GnuPG developers main forum. + + You subscribe to one of the list by sending mail with a subject + of "subscribe" to x-request@gnupg.org, where x is the name of the + mailing list (gnupg-announce, gnupg-users, etc.). An archive of + the mailing lists is available at http://lists.gnupg.org . + + The gnupg.org domain is hosted in Germany to avoid possible legal + problems (technical advices may count as a violation of ITAR). Please direct bug reports to or post them direct to the mailing list . @@ -447,12 +516,13 @@ Have fun and remember: Echelon is looking at you kid. +- -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- -Version: GnuPG v0.9.8a (GNU/Linux) +Version: GnuPG v0.9.9 (GNU/Linux) Comment: For info see http://www.gnupg.org -iQB1AwUBN5g4Lx0Z9MEMmFelAQE+RwL/Ws+kNklTHJnABT8YU8BqN8x310DyUm+e -ViS23npv3S/kRnHbCOOQo4cEjUYZFFrJXzQgodBvKbLVzMgdj4XQvkulTSBYK6pm -B7GeQptWRCNJ7m+Hw0Z4gwJ7giQTdfF8 -=pJ7c +iQB1AwUBN6figR0Z9MEMmFelAQHydwL+LuKC3W6kRkm0clwab3v8I7zlX0bagxzA +RStlHXdO6ln1Mo3s3nBuCfrS6LogiUgNRFhNJQ5+rjrTydz00nzcorbyTalqvMlq +Gnsu9Pd/pTPzvk6kP79yDdoBxfaQGcgw +=W8uz -----END PGP SIGNATURE----- diff --git a/THOUGHTS b/THOUGHTS index 247264c90..586eea1f6 100644 --- a/THOUGHTS +++ b/THOUGHTS @@ -216,6 +216,13 @@ of the existing key servers (I think they bail out on some rfc2440 packet formats). + +Special procmail addresses +========================== + * foo+bar@example.net: Try to match the address without the "+bar". + Should be done by the MUA, but maybe we can do this. + + Suggested things which I will not do: ===================================== * Let take --help an option to select some topics. diff --git a/TODO b/TODO index 2f9381825..bbd499535 100644 --- a/TODO +++ b/TODO @@ -47,5 +47,5 @@ Nice to have trustdb. * Evaluate whether it make sense to replace the namehashs either by using the user ID directly or by using pointers into the trustdb. - + * --gen-prime may trigger a log_bug; should be a log_fatal. diff --git a/VERSION b/VERSION index 36f77eef1..56f315114 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.9a +0.9.10 diff --git a/checks/ChangeLog b/checks/ChangeLog index b5c20f7da..d5520589e 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 4 10:34:18 CEST 1999 Werner Koch + + + * defs.inc (echo_n): New and used instead of /bin/echo "\c" + Sun Apr 18 10:11:28 CEST 1999 Werner Koch * mkdemodirs: New diff --git a/checks/clearsig.test b/checks/clearsig.test index 99dca45f8..f77fd5db0 100755 --- a/checks/clearsig.test +++ b/checks/clearsig.test @@ -73,7 +73,7 @@ $srcdir/run-gpg --verify x # bash's builtin echo needs the option -e so we use the external one. # ====================================== echo "this is a sig test" >y -/bin/echo " \c" >>y +echo_n " " >>y echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 --clearsign -o x --yes y $srcdir/run-gpg --verify x diff --git a/checks/defs.inc b/checks/defs.inc index 5c4a82b75..058a23370 100755 --- a/checks/defs.inc +++ b/checks/defs.inc @@ -51,6 +51,28 @@ chdir () { cd $1 || fatal "cannot cd to $1" } +echo_n_init=no +echo_n () { + if test "$echo_n_init" = "no"; then + if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + echo_n_n= + echo_n_c=' +' + else + echo_n_n='-n' + echo_n_c= + fi + else + echo_n_n= + echo_n_c='\c' + fi + echo_n_init=yes + fi + echo $echo_n_n "${1}$echo_n_c" +} + + #cleanup () { # rm $cleanup_files 2>/dev/null || true # echo "#empty" >./options diff --git a/checks/mds.test b/checks/mds.test index 98584b395..6b9cfbd15 100755 --- a/checks/mds.test +++ b/checks/mds.test @@ -25,7 +25,7 @@ fi [ "$failed" != "" ] && error "$failed failed for empty string" -/bin/echo "abcdefghijklmnopqrstuvwxyz\c" | $srcdir/run-gpg --print-mds >y +echo_n "abcdefghijklmnopqrstuvwxyz" | $srcdir/run-gpg --print-mds >y test_one "MD5" "C3FCD3D76192E4007DFB496CCA67E13B" test_one "SHA1" "32D10C7B8CF96570CA04CE37F2A19D84240D3A89" test_one "RMD160" "F71C27109C692C1B56BBDCEB5B9D2865B3708DBC" diff --git a/doc/DETAILS b/doc/DETAILS index d58567fdb..67ca23c16 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -32,7 +32,7 @@ ssb::1536:20:5CE086B5B5A18FF4:1998-07-07:0::: 16 = ElGamal (encrypt only) 17 = DSA (sometimes called DH, sign only) 20 = ElGamal (sign and encrypt) - (for other id's see include/cipher.h) + (for other id's see include/cipher.h) 5. Field: KeyID 6. Field: Creation Date (in UTC) 7. Field: Key expiration date or empty if none. @@ -144,13 +144,20 @@ more arguments in future versions. Issued whenever a passphrase for symmetric encryption is needed. MISSING_PASSPHRASE + No passphrase was supplied. An application which encounters this + message may want to stop parsing immediately because the next message + will probably be a BAD_PASSPHRASE. However, if the application + is a wrapper around the key edit menu functionalty it might not + make sense to stop parsing but simply ignoring the following + PAD_PASSPHRASE. BAD_PASSPHRASE - The supplied passphrase was wrong + The supplied passphrase was wrong or not given. In the latter case + you may have seen a MISSING_PASSPHRASE. GOOD_PASSPHRASE The supplied passphrase was good and the secret key material - is therefore usuable. + is therefore usable. DECRYPTION_FAILED The symmetric decryption failed - one reason could be a wrong @@ -577,9 +584,15 @@ The standard http URL encoded query parameters are this (always key=value): - fingerprint=on. Also reports the fingerprints when used with 'index' or 'vindex' -New (already used by GnuPG): +The keyserver also recognizes http-POSTs to /pks/add. Use this to upload +keys. + + +A better way to to this would be a request like: /pks/lookup/?op= -The keyserver also recognizes http-POSTs to /pks/add. Use this to upload -keys. +this can be implemented using Hurd's translater mechanism. +However, I think the whole key server stuff has to be re-thougth; +I have some ideas and probably create a white paper. + diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 67b07db9f..b4f0873cb 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -27,7 +27,7 @@ --> -directory"> file"> &ParmFile;"> @@ -359,14 +359,14 @@ trust value. Letters are used for the values: --sign-key &ParmName; Sign a public key with you secret key. This is a shortcut version -of the subcommand sign from --edit. +of the subcommand "sign" from --edit. --lsign-key &ParmName; Sign a public key with you secret key but mark it as non-exportable. -This is a shortcut version of the subcommand lsign from --edit. +This is a shortcut version of the subcommand "lsign" from --edit. @@ -432,7 +432,9 @@ This is normally not very useful and a security risk. --import &OptParmFiles; --fast-import &OptParmFiles; -Import/merge keys. The fast version does not build +Import/merge keys. This adds the given keys to the +keyring. +The fast version does not build the trustdb; this can be done at any time with the command --update-trustdb. @@ -1019,6 +1021,7 @@ will still get disabled. Never allow the use of &ParmName; as public key algorithm. The given name will not be checked so that a later loaded algorithm will still get disabled. + --throw-keyid @@ -1099,10 +1102,11 @@ signatures on data. Force the use of encryption with appended manipulation code. This is always used with the newer cipher (those with a blocksize greater than 64 bit). +This option might not be implemented yet. ---allow-non-self-signed-uid +--allow-non-selfsigned-uid Allow the import of keys with user IDs which are not self-signed. This is only allows the import - key validation will fail und you @@ -1145,6 +1149,12 @@ Suppress the initial copyright message but do not enter batch mode. + +--no-secmem-warning + +Suppress the warning about "using insecure memory". + + --no-armor @@ -1165,7 +1175,7 @@ keyrings. --skip-verify Skip the signature verification step. This may be -used to make the encryption faster if the signature +used to make the decryption faster if the signature verification is not needed. @@ -1193,13 +1203,13 @@ and may be used together with another command. --no-literal -This is not for normal use. Use the source to see for it might be used for. +This is not for normal use. Use the source to see for what it might be useful. --set-filesize -This is not for normal use. Use the source to see for it might be used for. +This is not for normal use. Use the source to see for what it might be useful. @@ -1243,6 +1253,18 @@ a signature was bad, and other error codes for fatal errors. show fingerprint + +gpg --verify +gpg --verify + +Verify the signature of the file but do not output the data. The second form +is used for detached signatures, where + diff --git a/g10/ChangeLog b/g10/ChangeLog index 87647369f..43d5f0324 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,6 +1,17 @@ -Mon Jul 26 09:34:46 CEST 1999 Werner Koch +Wed Aug 4 10:34:18 CEST 1999 Werner Koch + * pubring.asc: Updated. + + * pkclist.c (do_we_trust_pre,check_signatures_trust): Do not print + the warning about --always_trust when --quiet is used. + + * pkclist.c (fpr_info): New and called at several places. + + * parse-packet.c (dump_sig_subpkt): List revocation key contents. + +Mon Jul 26 09:34:46 CEST 1999 Werner Koch + * pkclist.c (build_pk_list): Fixed typo in format string. * trustdb.c (create_shadow_dir): Don't translate the error string. @@ -94,7 +105,7 @@ Mon Jul 12 14:55:34 CEST 1999 Werner Koch * openfile.c (make_outfile_name): s/error/info/ * passphrase.c (passphrase_to_dek): Return an empty passphrase when - in batch mode and don't make the warbing message fatal + in batch mode and don't make the warning message fatal * seckey-cert.c (check_secret_key): Try only once when in batch mode. * g10.c (make_username): New. @@ -148,7 +159,7 @@ Thu Jul 1 12:47:31 CEST 1999 Werner Koch (trust_letter): Mask the value. (do_check): Take disabled flag into account. - * passphrase.c (passphrase_to_dek): Add a pubkey_alfo arg and changed + * passphrase.c (passphrase_to_dek): Add a pubkey_algo arg and changed all callers. * g10.c (utf8_strings): 2 new options. diff --git a/g10/encode.c b/g10/encode.c index 5ee999665..bc03401ac 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -298,7 +298,7 @@ encode_crypt( const char *filename, STRLIST remusr ) if( rc ) goto leave; - if (!opt.no_literal) + if (!opt.no_literal) { /* setup the inner packet */ if( filename || opt.set_filename ) { char *s = make_basename( opt.set_filename ? opt.set_filename : filename ); @@ -311,6 +311,7 @@ encode_crypt( const char *filename, STRLIST remusr ) pt = m_alloc( sizeof *pt - 1 ); pt->namelen = 0; } + } if( filename && !opt.textmode ) { if( !(filesize = iobuf_get_filelength(inp)) ) diff --git a/g10/keyedit.c b/g10/keyedit.c index 5b04e2883..db5c0050f 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -684,7 +684,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands, trim_spaces(answer); } while( *answer == '#' ); - arg_number = 0; + arg_number = 0; /* Yes, here is the init which egcc complains about*/ if( !*answer ) cmd = cmdLIST; else if( *answer == CONTROL_D ) diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 577a1fcfe..967aa7a22 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -737,7 +737,14 @@ dump_sig_subpkt( int hashed, int type, int critical, printf(" %d", buffer[i] ); break; case SIGSUBPKT_REV_KEY: - p = "revocation key"; + fputs("revocation key: ", stdout ); + if( length < 22 ) + p = "[too short]"; + else { + printf("c=%02x a=%d f=", buffer[0], buffer[1] ); + for( i=2; i < length; i++ ) + printf("%02X", buffer[i] ); + } break; case SIGSUBPKT_ISSUER: if( length >= 8 ) diff --git a/g10/pkclist.c b/g10/pkclist.c index 310874421..fb0d3cd41 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -68,6 +68,33 @@ print_fpr( PKT_public_key *pk ) tty_printf("\n"); } +static void +fpr_info( PKT_public_key *pk ) +{ + byte array[MAX_FINGERPRINT_LEN], *p; + size_t i, n; + FILE *fp = log_stream(); + + fingerprint_from_pk( pk, array, &n ); + p = array; + log_info(_("Fingerprint:")); + if( n == 20 ) { + for(i=0; i < n ; i++, i++, p += 2 ) { + if( i == 10 ) + putc(' ', fp); + fprintf(fp, " %02X%02X", *p, p[1] ); + } + } + else { + for(i=0; i < n ; i++, p++ ) { + if( i && !(i%8) ) + putc(' ', fp); + fprintf(fp, " %02X", *p ); + } + } + putc('\n', fp ); +} + static void @@ -453,7 +480,8 @@ do_we_trust_pre( PKT_public_key *pk, int trustlevel ) */ } else if( opt.always_trust && !rc ) { - log_info(_("WARNING: Using untrusted key!\n")); + if( !opt.quiet ) + log_info(_("WARNING: Using untrusted key!\n")); rc = 1; } return rc; @@ -475,7 +503,8 @@ check_signatures_trust( PKT_signature *sig ) if( opt.always_trust ) { - log_info(_("WARNING: Using untrusted key!\n")); + if( !opt.quiet ) + log_info(_("WARNING: Using untrusted key!\n")); return 0; } @@ -523,6 +552,7 @@ check_signatures_trust( PKT_signature *sig ) case TRUST_EXPIRED: log_info(_("Note: This key has expired!\n")); + fpr_info( pk ); break; case TRUST_UNDEFINED: @@ -533,6 +563,7 @@ check_signatures_trust( PKT_signature *sig ) log_info(_( " There is no indication that the " "signature belongs to the owner.\n" )); + fpr_info( pk ); } else { int quit; @@ -560,6 +591,7 @@ check_signatures_trust( PKT_signature *sig ) log_info(_( " It is not certain that the signature belongs to the owner.\n" )); + fpr_info( pk ); break; case TRUST_FULLY: diff --git a/g10/pubring.asc b/g10/pubring.asc index a7258157d..dc4e8bdb6 100644 --- a/g10/pubring.asc +++ b/g10/pubring.asc @@ -1,20 +1,6 @@ - -pub 1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) - Key fingerprint = 6BD9 050F D8FC 941B 4341 2DCC 68B7 AB89 5754 8DCD - -pub 1024D/621CC013 1998-07-07 Werner Koch - Key fingerprint = ECAF 7590 EB34 43B5 C7CF 3ACB 6C7E E1B8 621C C013 - -pub 768R/0C9857A5 1995-09-30 Werner Koch - Key fingerprint = 62 9E 97 C0 D5 55 76 3B 90 5A FA E9 81 1C 64 09 - -pub 768g/E1D81275 1998-02-09 werner - Key fingerprint = 86E2 6681 6C0B 6DD5 4C06 BA6C E113 9763 E1D8 1275 - - -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v0.4.3c (GNU/Linux) -Comment: For info finger gcrypt@ftp.guug.de +Version: GnuPG v0.9.9 (GNU/Linux) +Comment: For info see http://www.gnupg.org mQGiBDWiHh4RBAD+l0rg5p9rW4M3sKvmeyzhs2mDxhRKDTVVUnTwpMIR2kIA9pT4 3No/coPajDvhZTaDM/vSz25IZDZWJ7gEu86RpoEdtr/eK8GuDcgsWvFs5+YpCDwW @@ -36,155 +22,204 @@ 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 -=7eJ9 +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 +AJkBDI7hajSe1D6Krh2j0zf8VMWOIA== +=TbxO -----END PGP PUBLIC KEY BLOCK----- - diff --git a/g10/sign.c b/g10/sign.c index 090c12b7a..eb53794dc 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -385,7 +385,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr, } } else { - if (!opt.no_literal) + if (!opt.no_literal) { if( fname || opt.set_filename ) { char *s = make_basename( opt.set_filename ? opt.set_filename : fname ); pt = m_alloc( sizeof *pt + strlen(s) - 1 ); @@ -397,6 +397,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr, pt = m_alloc( sizeof *pt - 1 ); pt->namelen = 0; } + } if( fname ) { if( !(filesize = iobuf_get_filelength(inp)) ) @@ -412,7 +413,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr, } else filesize = opt.set_filesize ? opt.set_filesize : 0; /* stdin */ - + if (!opt.no_literal) { pt->timestamp = make_timestamp(); pt->mode = opt.textmode && !outfile ? 't':'b'; @@ -441,7 +442,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr, /* catch errors from above blocks */ if (rc) - goto leave; + goto leave; /* loop over the secret certificates */ for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) { diff --git a/po/ChangeLog b/po/ChangeLog index 9e7a36c0e..e0b1951b7 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 4 10:34:18 CEST 1999 Werner Koch + + + * de.po: Updated (Walter). + Mon Jul 26 09:34:46 CEST 1999 Werner Koch diff --git a/po/de.po b/po/de.po index fc89a652f..9e89fc89a 100644 --- a/po/de.po +++ b/po/de.po @@ -3,8 +3,8 @@ # Walter Koch , 1998. msgid "" msgstr "" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" -"PO-Revision-Date: 1999-07-12 21:56+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" +"PO-Revision-Date: 1999-08-02 21:56+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -274,7 +274,7 @@ msgstr "" "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte benötigt.)\n" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -282,138 +282,135 @@ msgstr "" "@Befehle:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[Datei]|Eine Unterschrift erzeugen" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[Datei]|Eine Klartextunterschrift erzeugen" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "Eine abgetrennte Unterschrift erzeugen" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "Daten verschlüsseln" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "Daten symmetrisch verschlüsseln" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "Nur speichern" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "Daten entschlüsseln (Voreinstellung)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "Signatur prüfen" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "Liste der Schlüssel" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "Liste der Schlüssel und ihrer Signaturen" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "Signaturen der Schlüssel prüfen" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\"" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "Liste der geheimen Schlüssel" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "Ein neues Schlüsselpaar erzeugen" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "Schlüssel entfernen" -#: g10/g10.c:201 -#, fuzzy -msgid "sign a key" -msgstr "Den Schlüssel signieren" - -#: g10/g10.c:202 -#, fuzzy -msgid "sign a key locally" -msgstr "Den Schlüssel nur auf diesem Rechner signieren" - #: g10/g10.c:203 +msgid "sign a key" +msgstr "Schlüssel signieren" + +#: g10/g10.c:204 +msgid "sign a key locally" +msgstr "Schlüssel nur auf diesem Rechner signieren" + +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "Unterschreiben oder Bearbeiten eines Schlüssels" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "Schlüssel exportieren" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "Schlüssel zu einem Schlüsselserver exportieren" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "Schlüssel von einem Schlüsselserver importieren" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "Schlüssel importieren/kombinieren" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "Lediglich die Struktur der Datenpakete anzeigen" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "Exportieren der \"Owner trust\" Werte" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "Importieren der \"Owner trust\" Werte" -#: g10/g10.c:218 -#, fuzzy -msgid "update the trust database" -msgstr "|[NAMEN]|Ändern der \"Trust\"-Datenbank" - #: g10/g10.c:220 +msgid "update the trust database" +msgstr "Ändern der \"Trust\"-Datenbank" + +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NAMEN]|Überprüfen der \"Trust\"-Datenbank" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "Reparieren einer beschädigten \"Trust\"-Datenbank" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "Datei oder stdin von der ASCII-Hülle befreien" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "Datei oder stdin in eine ASCII-Hülle einpacken" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -423,171 +420,170 @@ msgstr "" "Optionen:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-Hülle versehen" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NAME|Verschlüsseln für NAME" -#: g10/g10.c:234 -#, fuzzy -msgid "|NAME|use NAME as default recipient" -msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen" - #: g10/g10.c:236 +msgid "|NAME|use NAME as default recipient" +msgstr "|NAME|NAME als voreingestellten Empfänger benutzen" + +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:241 -msgid "|N|set compress level N (0 disables)" -msgstr "Kompressionsstufe auf N setzen (0=keine Kompr.)" - #: g10/g10.c:243 +msgid "|N|set compress level N (0 disables)" +msgstr "Kompressionsstufe auf N setzen (0=keine)" + +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "Als Ausgabedatei benutzen" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "Detaillierte Informationen" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "Etwas weniger Infos" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "das Terminal gar nicht benutzen" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "v3 Signaturen erzwingen" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "Keine wirklichen Änderungen durchführen" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "Stapelmodus: Keine Abfragen" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "\"Ja\" als Standardantwort annehmen" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "\"Nein\" als Standardantwort annehmen" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "Als öffentlichen Schlüsselbund mitbenutzen" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "Als geheimen Schlüsselbund mitbenutzen" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|Schlüssel bei diesem Server nachschlagen" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|Terminalzeichensatz NAME benutzen" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "Optionen aus der Datei lesen" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "Debug-Flags einschalten" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "Alle Debug-Flags einschalten" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "Keine Kommentarpakete schreiben" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "Benötigte Vollvertrauen (Voreinstellung 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "Benötigte Teilvertrauen (Voreinstellung 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|DATEI|Erweiterungsmodul DATEI laden" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "Den in RFC1991 beschriebenen Modus nachahmen" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -"alle Paket-, Verschlüsselungs- und Hashoptionen auf OpenPGP-Verhalten " -"einstellen" +"alle Paket-, Verschlüsselungs- und \n" +"Hashoptionen auf OpenPGP-Verhalten einstellen" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|Verwenden des Mantra-Modus N" -#: g10/g10.c:274 -msgid "|NAME|use message digest algorithm NAME for passphrases" -msgstr "|NAME|Das Hashverfahren NAME für Mantras benutzen" - #: g10/g10.c:276 -msgid "|NAME|use cipher algorithm NAME for passphrases" -msgstr "|NAME|Das Verschlü.verfahren NAME für Mantras benutzen" - -#: g10/g10.c:277 -msgid "|NAME|use cipher algorithm NAME" -msgstr "|NAME|Das Verschlü.verfahren NAME benutzen" +msgid "|NAME|use message digest algorithm NAME for passphrases" +msgstr "|NAME|Hashverfahren NAME für Mantras benutzen" #: g10/g10.c:278 -msgid "|NAME|use message digest algorithm NAME" -msgstr "|NAME|Das Hashverfahren NAME benutzen" +msgid "|NAME|use cipher algorithm NAME for passphrases" +msgstr "|NAME|Verschlü.verfahren NAME für Mantras benutzen" #: g10/g10.c:279 -msgid "|N|use compress algorithm N" -msgstr "|N|Die Komprimierverfahren N benutzen" +msgid "|NAME|use cipher algorithm NAME" +msgstr "|NAME|Verschlü.verfahren NAME benutzen" #: g10/g10.c:280 -msgid "throw keyid field of encrypted packets" -msgstr "Entferne die Absender-ID verschlüsselter Pakete" +msgid "|NAME|use message digest algorithm NAME" +msgstr "|NAME|Hashverfahren NAME benutzen" #: g10/g10.c:281 +msgid "|N|use compress algorithm N" +msgstr "|N|Komprimierverfahren N benutzen" + +#: g10/g10.c:282 +msgid "throw keyid field of encrypted packets" +msgstr "Entferne Absender-ID verschlüsselter Pakete" + +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "|NAME=WERT|verwende diese \"notation\"-Daten" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -607,15 +603,15 @@ msgstr "" " --list-keys [Namen] Schlüssel anzeigen\n" " --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "Berichte über Bugs (Programmfehler) bitte an .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -625,7 +621,7 @@ msgstr "" "Signieren, prüfen, verschlüsseln, entschlüsseln\n" "Die voreingestellte Operation ist abhängig von den Eingabedaten\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -633,173 +629,184 @@ msgstr "" "\n" "Unterstützte Verfahren:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "Widersprüchliche Befehle\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gültiger Zeichensatz.\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsslungsverfahren ist ungültig\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "Die angegebene URL für Richtlinien ist ungültig\n" -#: g10/g10.c:920 +#: g10/g10.c:941 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "Das Komprimierverfahren muß im Bereich %d bis %d liegen\n" -#: g10/g10.c:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed müssen größer als 0 sein\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed müssen größer als 1 sein\n" -#: g10/g10.c:926 +#: g10/g10.c:947 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n" -#: g10/g10.c:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:933 +#: g10/g10.c:954 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n" -#: g10/g10.c:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 -#, fuzzy +#: g10/g10.c:1120 msgid "--lsign-key user-id" -msgstr "--delete-key Benutzername" +msgstr "--lsign-key User-ID" -#: g10/g10.c:1107 -#, fuzzy +#: g10/g10.c:1128 msgid "--edit-key user-id [commands]" -msgstr "--edit-key Username [Befehle]" +msgstr "--edit-key User-ID [Befehle]" -#: g10/g10.c:1123 -#, fuzzy +#: g10/g10.c:1144 msgid "--delete-secret-key user-id" -msgstr "--delete-secret-key Username" +msgstr "--delete-secret-key User-ID" -#: g10/g10.c:1126 -#, fuzzy +#: g10/g10.c:1147 msgid "--delete-key user-id" -msgstr "--delete-key Benutzername" +msgstr "--delete-key User-ID" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "'%s' kann nicht geöffnet werden: %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" -msgstr "-k[v][v][v][c] [Benutzername] [Keyring]" +#: g10/g10.c:1182 +msgid "-k[v][v][v][c] [user-id] [keyring]" +msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Ungültiges Hashverfahren '%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "'%s' kann nicht geöffnet werden\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" "Das erste Zeichen eines \"notation\"-Namens muß ein Buchstabe oder\n" "ein Unterstrich sein\n" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -807,12 +814,12 @@ msgstr "" "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " "enthalten und muß mit einem '=' enden\n" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" "Punkte in einem \"notation\"-Namen müssen von anderen Zeichen umgeben sein\n" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" @@ -894,17 +901,21 @@ msgstr "" #. Translators: this shoud fit into 24 bytes to that the fingerprint #. * data is properly aligned with the user ID #: g10/pkclist.c:53 -#, fuzzy msgid " Fingerprint:" -msgstr " importiert: %lu" +msgstr " Fingerabdruck:" + +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "\"Fingerabdruck\" anzeigen" # valid user replies (not including 1..4) #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "sSmMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -913,7 +924,7 @@ msgstr "" "Es ist kein \"Owner trust\" für %lu definiert:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -936,23 +947,23 @@ msgstr "" " 4 = Ich vertraue ihm vollständig\n" " s = Bitte weitere Information anzeigen\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = Zurück zum Menü\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr " q = verlassen\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Ihre Auswahl? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Zertifikate führen zu einem letztlich vertrauenswürdigen Schlüssel:\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -963,7 +974,7 @@ msgstr "" "ermitteln können.\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -971,7 +982,7 @@ msgstr "" "Kein Pfad führt zu einen unserer Schlüsseln.\n" "\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -979,7 +990,7 @@ msgstr "" "Keine Zertifikate mit undefinierten Vertrauen gefunden.\n" "\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -987,38 +998,38 @@ msgstr "" "Keine \"trust\" Werte geändert.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "Schlüssel %08lX: Schlüssel wurde widerrufen\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "Diesen Schlüssel trotzdem benutzen?" -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "Schlüssel %08lX: Unterschlüssel wurde widerrufen\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: Schlüssel ist verfallen!\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" "%08lX: Keine Infos zur Berechnung der Vertrauenswahrscheinlichkeit " "vorgefunden\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1027,18 +1038,18 @@ 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:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "" "Dieser Schlüssel gehört höchstwahrscheinlich dem angegebenen Besitzer\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "" "Dieser Schlüssel gehört uns (da wir nämlich den geheimen Schlüssel dazu " "haben)\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1049,69 +1060,69 @@ msgstr "" "Wenn Sie *wirklich* wissen, was Sie tun, können Sie die nächste\n" "Frage mit ja beantworten\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "WARNUNG: Dieser Schlüssel wurde von seinem Besitzer widerrufen!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Das könnte bedeuten, daß die Signatur gefälscht ist.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "WARNUNG: Dieser Unterschlüssel wurde von seinem Besitzer widerrufen!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen " "Besitzer gehört.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "WARNUNG: Dieser Schlüssel ist nicht durch hinreichend vertrauenswürdige " "Signaturen zertifiziert!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen " "Besitzer gehört.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: übersprungen: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1119,34 +1130,34 @@ msgstr "" "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Geben Sie die User-ID ein: " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "Keine solche User-ID vorhanden.\n" -#: g10/pkclist.c:739 -#, fuzzy +#: g10/pkclist.c:771 msgid "Public key is disabled.\n" -msgstr "Öffentlicher Schlüssel ist %08lX\n" +msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, c-format +msgid "unknown default recipient `%s'\n" +msgstr "Unbekannter voreingestellter Empfänger '%s'\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: Fehler beim Prüfen des Schlüssels: %s\n" -#: g10/pkclist.c:806 -#, fuzzy, c-format +#: g10/pkclist.c:838 +#, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n" +msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "Keine gültigen Adressaten\n" @@ -1491,17 +1502,17 @@ msgstr "%s: kann nicht ge msgid "error creating passphrase: %s\n" msgstr "Fehler beim Erzeugen des Mantras: %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: WARNUNG: Leere Datei\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "Lesen von '%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s verschlüsselt für: %s\n" @@ -1533,6 +1544,18 @@ msgstr "zu viele Eintr msgid "too many entries in unk cache - disabled\n" msgstr "zu viele Einträge im unk-Lager - abgeschaltet\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +msgid "No key for user-id\n" +msgstr "Kein Schlüssel für User-ID\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +msgid "No user-id for key\n" +msgstr "Keine User-ID für Schlüssel\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1637,7 +1660,7 @@ msgstr "Schl msgid "no default public keyring\n" msgstr "Kein voreingestellter öffentlicher Schlüsselbund\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "Schreiben nach '%s'\n" @@ -1769,14 +1792,14 @@ msgid "key %08lX: invalid subkey binding\n" msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n" #: g10/import.c:769 -#, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" -msgstr "Schlüssel %08lX: übergehe User-ID '" +#, c-format +msgid "key %08lX: accepted non self-signed user-id '" +msgstr "Schlüssel %08lX: Nicht eigenbeglaubigte User-ID übernommen'" #: g10/import.c:798 #, c-format -msgid "key %08lX: skipped userid '" -msgstr "Schlüssel %08lX: übergehe User-ID '" +msgid "key %08lX: skipped user-id '" +msgstr "Schlüssel %08lX: User-ID übergangen '" #: g10/import.c:821 #, c-format @@ -2246,9 +2269,8 @@ msgid "Invalid command (try \"help\")\n" msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n" #: g10/keyedit.c:1065 -#, fuzzy msgid "This key has been disabled" -msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n" +msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet" #: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" @@ -2472,7 +2494,7 @@ msgstr "" msgid "can't handle public key algorithm %d\n" msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n" -#: g10/parse-packet.c:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n" @@ -2601,7 +2623,7 @@ msgstr "" msgid "%s signature from: %s\n" msgstr "%s Unterschrift von: %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "%s kann nicht erzeugt werden: %s\n" @@ -2610,7 +2632,7 @@ msgstr "%s kann nicht erzeugt werden: %s\n" msgid "signing:" msgstr "unterschreibe:" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "WARNUNG: '%s' ist eine leere Datei.\n" @@ -2849,11 +2871,6 @@ msgstr "Schl msgid "enumerate secret keys failed: %s\n" msgstr "enum_secret_keys fehlgeschlagen: %s\n" -#: g10/trustdb.c:802 -#, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_sdir fehlgeschlagen: %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -2947,9 +2964,9 @@ msgid "lid %lu: inserted\n" msgstr "lid %lu: eingefügt\n" #: g10/trustdb.c:1652 -#, fuzzy, c-format +#, c-format msgid "error reading dir record: %s\n" -msgstr "Fehler beim Auffinden des Verz.Satzes: %s\n" +msgstr "Fehler beim Lesen des Verz.Satzes: %s\n" #: g10/trustdb.c:1660 g10/trustdb.c:1714 #, c-format @@ -3114,9 +3131,8 @@ msgid "%s: unknown suffix\n" msgstr "%s: unbekannte Dateinamenerweiterung\n" #: g10/openfile.c:119 -#, fuzzy msgid "Enter new filename" -msgstr "--store [Dateiname]" +msgstr "Neuen Dateinamen eingeben" #: g10/openfile.c:160 msgid "writing to stdout\n" @@ -3444,6 +3460,9 @@ msgstr "Keine Hilfe vorhanden." msgid "No help available for `%s'" msgstr "Keine Hilfe für '%s' vorhanden." +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "tdbio_search_sdir fehlgeschlagen: %s\n" + #~ msgid "print all message digests" #~ msgstr "Message-Digests für die Eingabedaten ausgeben" diff --git a/po/es_ES.po b/po/es_ES.po index a270a3696..7715be63c 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ # GPG version: 0.9.7 msgid "" msgstr "" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" "PO-Revision-Date: 1999-06-06 18:33+0200\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-13 10:49:25+0100\n" @@ -283,7 +283,7 @@ msgstr "" "otro trabajo para que el sistema pueda recolectar más entropía\n" "(se necesitan %d bytes más).\n" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -291,138 +291,138 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[file]|hace una firma" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[file]|hace una firma en texto claro" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "hace una firma separada" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "cifra datos" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "cifra sólo con un cifrado simétrico" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "sólo almacenar" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "descifra datos (predefinido)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "lista claves" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "lista claves y firmas" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "comprueba las firmas de las claves" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "lista claves y huellas dactilares" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "lista claves secretas" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "genera un nuevo par de claves" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "elimina la clave del anillo público" -#: g10/g10.c:201 +#: g10/g10.c:203 #, fuzzy msgid "sign a key" msgstr "firma la clave" -#: g10/g10.c:202 +#: g10/g10.c:204 #, fuzzy msgid "sign a key locally" msgstr "firma la clave localmente" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "firma o modifica una clave" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "genera un certificado de revocación" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "exporta claves" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "exporta claves a un servidor de claves" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "importa claves desde un servidor de claves" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "importa/fusiona claves" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "lista sólo la secuencia de paquetes" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "exporta los valores de confianza" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "importa los valores de confianza" -#: g10/g10.c:218 +#: g10/g10.c:220 #, fuzzy msgid "update the trust database" msgstr "|[NOMBRES]|actualiza la base de datos de confianza" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NOMBRES]|comprueba la base de datos de confianza" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "arregla una base de datos de confianza dañada" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "quita la armadura de un fichero o stdin" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "crea la armadura a un fichero o stdin" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [ficheros]|imprime resúmenes de mensaje" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -432,173 +432,173 @@ msgstr "" "Opciones:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "crea una salida ascii con armadura" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NOMBRE|cifra para NOMBRE" -#: g10/g10.c:234 +#: g10/g10.c:236 #, fuzzy msgid "|NAME|use NAME as default recipient" msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "usa este usuario para firmar o descifrar" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|establece nivel de compresión N (0 no comprime)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "usa modo de texto canónico" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "usa como fichero de salida" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "prolijo" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "algo más discreto" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "fuerza firmas v3" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "siempre usa un MCD para cifrar" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "no hace ningún cambio" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "proceso por lotes: nunca preguntar" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "asume \"sí\" en casi todas las preguntas" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "asume \"no\" en casi todas las preguntas" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "añade este anillo a la lista de anillos" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "añade este anillo secreto a la lista" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|SERVIDOR|usa este servidor de claves" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NOMBRE|usa el juego de caracteres NOMBRE" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "lee opciones del fichero" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "establece los parámetros de depuración" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "habilita depuración completa" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|DF|escribe información de estado en descriptor DF" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "no escribe paquetes de comentario" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "(por defecto es 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "(por defecto es 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|FICHERO|carga módulo de extensiones FICHERO" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "emula el modo descrito en la RFC1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|usa modo de contraseña N" -#: g10/g10.c:274 +#: g10/g10.c:276 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "" "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n" "para las contraseñas" -#: g10/g10.c:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n" "contraseñas" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|usa el algoritmo de compresión N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "elimina el campo keyid de los paquetes cifrados" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -618,15 +618,15 @@ msgstr "" " --list-keys [nombres] muestra las claves\n" " --fingerprint [nombres] muestra las huellas dactilares\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "Por favor, informe de posibles \"bugs\" a .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -636,7 +636,7 @@ msgstr "" "Firma, comprueba, cifra o descifra.\n" "La operación por defecto depende del tipo de datos de entrada.\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -644,181 +644,197 @@ msgstr "" "\n" "Algoritmos soportados:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "uso: gpg [opciones] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "comandos incompatibles\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "%s no es un juego de caracteres válido\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado no es válido\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no es válido\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "el algoritmo de compresión debe estar en el rango %d-%d\n" -#: g10/g10.c:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth debe estar en el rango 1-255\n" -#: g10/g10.c:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n" -#: g10/g10.c:933 +#: g10/g10.c:954 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n" -#: g10/g10.c:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicialización de la base de datos de confianza fallida: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key nombre_usuario" -#: g10/g10.c:1107 +#: g10/g10.c:1128 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key nombre_usuario [comandos]" -#: g10/g10.c:1123 +#: g10/g10.c:1144 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nombre_usuario" -#: g10/g10.c:1126 +#: g10/g10.c:1147 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key nombre_usuario" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "no puede abrirse `%s': %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id_usuario] [anillo]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminación de armadura fallida: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "creación de armadura fallida: %s\n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribución no válido `%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[nombre_fichero]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Adelante, teclee su mensaje ...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "no puede abrirse `%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -904,12 +920,17 @@ msgstr "" msgid " Fingerprint:" msgstr " importadas: %lu" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "muestra huella dactilar" + #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "iImMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -918,7 +939,7 @@ msgstr "" "No hay confianza definida para el propietario %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -940,23 +961,23 @@ msgstr "" " 4 = Me fío completamente\n" " i = Mostrar más información\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = volver al menú principal\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr " q = salir\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Su decisión: " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que llevan a una clave de confianza absoluta:\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -966,7 +987,7 @@ msgstr "" "si es posible asignar algunos valores de confianza perdidos.\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -974,7 +995,7 @@ msgstr "" "No se ha encontrado ninguna ruta con una de nuestras claves.\n" "\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -982,7 +1003,7 @@ msgstr "" "No se ha encontrado ningún certificado sin valor de confianza.\n" "\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -990,36 +1011,36 @@ msgstr "" "No se cambió ningún valor de confianza.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "clave %08lX: ¡esta clave ha sido revocada!\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "¿Usar esta clave de todas formas? " -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "clave %08lX: ¡esta subclave ha sido revocada!\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: clave caducada\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "%08lX: no hay información para calcular la probabilidad de confianza\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: ¡Esta clave NO es de confianza!\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1029,15 +1050,15 @@ msgstr "" "proprietario\n" "pero se acepta igualmente\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "Esta clave probablemente pertenece a su proprietario\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "Esta clave nos pertenece\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1049,66 +1070,66 @@ msgstr "" "\"sí\" a la siguiente pregunta.\n" "\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "ATENCIÓN: ¡Usando una clave no fiable!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Esto puede significar que la firma está falsificada.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Nota: ¡Esta clave está caducada!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "ATENCIÓN: ¡Esta clave no está certificada por una firma de confianza!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " No hay indicios de que la firma pertenezca al propietario.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATENCIÓN: ¡Esta clave NO es de confianza!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " La firma es probablemente una FALSIFICACIÓN.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATENCIÓN: ¡Esta clave no está certificada con suficientes firmas de " "confianza!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " No es seguro que la firma pertenezca al propietario.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, fuzzy, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: problema lectura del bloque de clave: %s\n" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1116,34 +1137,35 @@ msgstr "" "No se ha especificado un ID de usuario (puede usar \"-r\")\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Introduzca el ID de usuario: " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "ID de usuario inexistente.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 #, fuzzy msgid "Public key is disabled.\n" msgstr "la clave pública es %08lX\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: error comprobando la clave: %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: problema lectura del bloque de clave: %s\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "no hay direcciones válidas\n" @@ -1490,17 +1512,17 @@ msgstr "%s: no puede abrirse: %s\n" msgid "error creating passphrase: %s\n" msgstr "error creando contraseña: %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ATENCIÓN: fichero vacío\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "leyendo desde `%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s cifrado para: %s\n" @@ -1532,6 +1554,20 @@ msgstr "demasiados registros en la cache pk - anulada\n" msgid "too many entries in unk cache - disabled\n" msgstr "demasiados registros en la cache unk - anulada\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "clave %08lX: no hay identificativo de usuario\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "no hay clave secreta\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1635,7 +1671,7 @@ msgstr "clave %08lX: clave p msgid "no default public keyring\n" msgstr "no hay anillo público por defecto\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "escribiendo en `%s'\n" @@ -1765,12 +1801,12 @@ msgstr "clave %08lX.%lu: uni #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "clave %08lX: ignorado identificativo de usuario '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "clave %08lX: ignorado identificativo de usuario '" #: g10/import.c:821 @@ -2475,7 +2511,7 @@ msgstr "" msgid "can't handle public key algorithm %d\n" msgstr "no puedo manejar el algoritmo de clave pública %d\n" -#: g10/parse-packet.c:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n" @@ -2596,7 +2632,7 @@ msgstr "asumiendo firma mala debido a un bit cr msgid "%s signature from: %s\n" msgstr "firma %s de %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "no puede crearse %s: %s\n" @@ -2605,7 +2641,7 @@ msgstr "no puede crearse %s: %s\n" msgid "signing:" msgstr "firmando:" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATENCIÓN `%s' es un fichero vacío\n" @@ -2843,11 +2879,6 @@ msgstr "clave %08lX: aceptada como clave de confianza.\n" msgid "enumerate secret keys failed: %s\n" msgstr "enum_secret_keys fallido: %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_dir fallida: %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -3293,6 +3324,10 @@ msgstr "Ayuda no disponible" msgid "No help available for `%s'" msgstr "Ayuda no disponible para `%s'" +#, fuzzy +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "tdbio_search_dir fallida: %s\n" + #~ msgid "print all message digests" #~ msgstr "imprime todos los resúmenes de mensaje" diff --git a/po/fr.po b/po/fr.po index ae9fb97de..8b4712c0f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 0.9.7\n" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" "PO-Revision-Date: 1999-05-24 21:48+02:00\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" @@ -276,7 +276,7 @@ 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:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -284,139 +284,139 @@ msgstr "" "@Commandes:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[fichier]|faire une signature" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[fichier]|faire une signature en texte clair" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "faire une signature détachée" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "chiffrer les données" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "chiffrement symétrique seulement" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "pas d'action" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "déchiffrer les données (défaut)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "vérifier une signature" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "lister les clés" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "lister les clés et les signatures" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "vérifier les signatures des clés" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "lister les clés et les empreintes" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "lister les clés secrètes" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "générer une nouvelle paire de clés" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "enlever la clé du porte-clés public" -#: g10/g10.c:201 +#: g10/g10.c:203 #, fuzzy msgid "sign a key" msgstr "signer la clé" -#: g10/g10.c:202 +#: g10/g10.c:204 #, fuzzy msgid "sign a key locally" msgstr "signer la clé localement" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "signer ou éditer une clé" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "générer un certificat de révocation" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "exporter les clés" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "exporter les clés vers un serveur de clés" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "importer les clés d'un serveur de clés" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "importer/fusionner les clés" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "ne lister que les paquets" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "exporter les indices de confiance" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "importer les indices de confiance" # -#: g10/g10.c:218 +#: g10/g10.c:220 #, fuzzy msgid "update the trust database" msgstr "|[NOMS]|mettre la base de confiance à jour" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NOMS]|vérifier la base de confiance" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "réparer une base de confiance corrompue" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "Enlever l'armure d'un fichier ou de stdin" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "Mettre une armure à un fichier ou à stdin" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|alg. [fich.]|indiquer les fonctions de hachage" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -426,171 +426,171 @@ msgstr "" "Options:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "créer une sortie ascii avec armure" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NOM|chiffrer pour NOM" -#: g10/g10.c:234 +#: g10/g10.c:236 #, fuzzy msgid "|NAME|use NAME as default recipient" msgstr "|NOM|utiliser NOM comme clé secrète par défaut" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "utiliser ce nom pour signer ou déchiffrer" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|niveau de compression N (0 désactive)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "utiliser le mode texte canonique" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "utiliser comme fichier de sortie" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "bavard" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "devenir beaucoup plus silencieux" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" # -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "forcer les signatures en v3" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "toujours utiliser un sceau pour le chiffrement" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "ne rien changer" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "mode automatique : ne jamais rien demander" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "répondre oui à la plupart des questions" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "répondre non à la plupart des questions" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "ajouter ce porte-clés à la liste des porte-clés" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "ajouter ce porte-clés secret à la liste" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NOM|utiliser NOM comme clé secrète par défaut" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HÔTE|utiliser ce serveur pour chercher des clés" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NOM|le terminal utilise la table de caractères NOM" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "lire les options du fichier" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "choisir les attributs de déboguage" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "permettre un déboguage complet" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|FD|écrire l'état sur ce descripteur" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "ne pas écrire de paquets de commentaire" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "nombre de signatures complètes requises (1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "nombre de signatures marginales requises (3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|FICH|charger le module d'extension FICH" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "imiter le mode décrit dans la RFC1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" # FIXMOI : faudra trouver mieux ... -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|utiliser le mode de codage des mots de passe N" -#: g10/g10.c:274 +#: g10/g10.c:276 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NOM|utiliser le hachage NOM pour les mots de passe" -#: g10/g10.c:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOM|utiliser l'algorithme de chiffrement NOM" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOM|utiliser la fonction de hachage NOM" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|utiliser l'algorithme de compression N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "supprimer l'identification des paquets chiffrés" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -610,15 +610,15 @@ msgstr "" " --list-keys [utilisateur] montrer les clés\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "Rapporter toutes anomalies à .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -628,7 +628,7 @@ msgstr "" "signer, vérifier, chiffer ou déchiffrer\n" "l'opération par défaut dépend des données entrées\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -636,181 +636,197 @@ msgstr "" "\n" "Algorithmes supportés:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE : pas de fichier d'options par défaut `%s'\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s' : %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "%s n'est pas une table de caractères valide\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sélectionné est invalide\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sélectionnée est invalide\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algorithme de compression doit faire partie de l'échelle %d..%d\n" -#: g10/g10.c:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "« completes-needed » doit être supérieur à 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "« marginals-needed » doit être supérieur à 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "« max-cert-depth » doit être compris entre 1 et 255\n" -#: g10/g10.c:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE : le mode S2K simple (0) est fortement déconseillé\n" -#: g10/g10.c:933 +#: g10/g10.c:954 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K invalide ; doit être 0, 1 ou 3\n" -#: g10/g10.c:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "n'a pas pu initialiser la base de confiance : %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key utilisateur" -#: g10/g10.c:1107 +#: g10/g10.c:1128 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:1123 +#: g10/g10.c:1144 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key utilisateur" -#: g10/g10.c:1126 +#: g10/g10.c:1147 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key utilisateur" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "ne peut ouvrir %s: %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "suppression d'armure non réussie : %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "construction d'armure non réussie : %s \n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Continuez et tapez votre message...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "ne peut ouvrir `%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -896,12 +912,17 @@ msgstr "" msgid " Fingerprint:" msgstr " importée : %lu" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "afficher l'empreinte" + #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "sSmMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -910,7 +931,7 @@ msgstr "" "Pas de confiance définie pour %lu :\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -934,23 +955,23 @@ msgstr "" " 4 = je le crois totalement\n" " s = montrez-moi plus d'informations\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = retour au menu principal\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr " q = quitter\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Votre décision ? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificats conduisant vers une clé à confiance ultime :\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -959,7 +980,7 @@ 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:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -967,7 +988,7 @@ msgstr "" "Aucun chemin menant vers une de nos clés n'a été trouvé.\n" "\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -975,7 +996,7 @@ msgstr "" "Aucun certificat à confiance indéfinie n'a été trouvé.\n" "\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -983,36 +1004,36 @@ msgstr "" "Pas d'indice de confiance changé.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "clé %08lX : la clé a été révoquée !\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "Utiliser cette clé quand-même ? " -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "clé %08lX : la sous-clé a été révoquée !\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX : la clé a expiré\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "%08lX : pas d'information pour calculer une probabilité de confiance\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX : Nous ne faisons PAS confiance à cette clé\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1022,15 +1043,15 @@ msgstr "" "propriétaire\n" "mais elle est quand même acceptée\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "Cette clé appartient probablement à son propriétaire\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "Cette clé nous appartient\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1042,67 +1063,67 @@ msgstr "" "oui à la prochaine question\n" "\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENTION : Utilisation d'une clé sans confiance !\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATTENTION : Cette clé à été révoquée par son propriétaire !\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Cela pourrait signifier que la signature est fausse.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATTENTION : Cette sous-clé à été révoquée par son propriétaire !\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Note : Cette clé a expiré !\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "ATTENTION : Cette clé n'est pas certifiée avec une signature de confiance !\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Rien ne dit que la signature appartient à son propriétaire.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENTION : Nous ne faisons PAS confiance à cette clé !\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " La signature est certainement FAUSSE.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATTENTION : Les signatures de cette clé n'ont pas une confiance suffisante " "!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Il n'est pas sûr que la signature appartient à son propriétaire.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s : ignoré : %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, fuzzy, c-format msgid "%s: skipped: public key already present\n" msgstr "%s : problème de lecture du bloc de clés : %s\n" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1111,34 +1132,35 @@ msgstr "" "\"-r\")\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Entrez le nom d'utilisateur : " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "Pas de tel utilisateur.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 #, fuzzy msgid "Public key is disabled.\n" msgstr "la clé publique est %08lX\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "NOTE : pas de fichier d'options par défaut `%s'\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s : erreur pendant la vérification de la clé : %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s : problème de lecture du bloc de clés : %s\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "pas de destinataire valide\n" @@ -1484,17 +1506,17 @@ msgstr "%s : ne peut ouvrir : %s\n" msgid "error creating passphrase: %s\n" msgstr "erreur pendant la création du mot de passe : %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s : ATTENTION : fichier vide\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "lecture de `%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s chiffré pour : %s\n" @@ -1526,6 +1548,20 @@ msgstr "trop d'entr msgid "too many entries in unk cache - disabled\n" msgstr "trop d'entrées dans le cache unk - désactivé\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "clé %08lX : pas de nom d'utilisateur\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "pas de clé secrète\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1631,7 +1667,7 @@ msgstr "cl msgid "no default public keyring\n" msgstr "pas de porte-clés public par défaut\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "écriture de `%s'\n" @@ -1761,12 +1797,12 @@ msgstr "cl #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "clé %08lX : utilisateur non pris en compte '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "clé %08lX : utilisateur non pris en compte '" #: g10/import.c:821 @@ -2472,7 +2508,7 @@ msgstr "" msgid "can't handle public key algorithm %d\n" msgstr "ne peut gérer l'algorithme à clé publique %d\n" -#: g10/parse-packet.c:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "un sous-paquet de type %d possède un bit critique\n" @@ -2599,7 +2635,7 @@ msgstr "" msgid "%s signature from: %s\n" msgstr "Signature %s de : %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "ne peut créer %s : %s\n" @@ -2608,7 +2644,7 @@ msgstr "ne peut cr msgid "signing:" msgstr "signature :" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATTENTION : `%s' est un fichier vide\n" @@ -2853,11 +2889,6 @@ msgstr "cl msgid "enumerate secret keys failed: %s\n" msgstr "l'énumération des clés secrètes a échoué : %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_dir a échoué : %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -3349,6 +3380,10 @@ msgstr "Pas d'aide disponible" msgid "No help available for `%s'" msgstr "Pas d'aide disponible pour `%s'" +#, fuzzy +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "tdbio_search_dir a échoué : %s\n" + #~ msgid "print all message digests" #~ msgstr "écrire toutes les fonctions de hachage" diff --git a/po/it.po b/po/it.po index 3b79d0114..729a92d8e 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.9.7\n" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" "PO-Revision-Date: 1999-07-25 14:36+02:00\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -271,7 +271,7 @@ msgstr "" "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n" "(Servono ancora %d altri byte)\n" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -279,135 +279,135 @@ msgstr "" "@Comandi:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[file]|fai una firma" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[file]|fai una firma mantenendo il testo in chiaro" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "fai una firma separata" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "cifra dati" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "cifra solo con un cifrario simmetrico" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "immagazzina soltanto" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "decifra dati (predefinito)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "elenca le chiavi" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "elenca le chiavi e le firme" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "controlla le firme delle chiavi" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "elenca le chiavi e le impronte digitali" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "elenca le chiavi segrete" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "genera una nuova coppia di chiavi" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "rimuove una chiave dal portachiavi pubblico" -#: g10/g10.c:201 +#: g10/g10.c:203 msgid "sign a key" msgstr "firma una chiave" -#: g10/g10.c:202 +#: g10/g10.c:204 msgid "sign a key locally" msgstr "firma localmente una chiave" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "firma o modifica una chiave" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "genera un certificato di revoca" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "esporta delle chiavi" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "esporta le chiavi a un key server" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "importa le chiavi da un key server" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "importa/aggiungi delle chiavi" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "elenca solo la sequenza dei pacchetti" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "esporta i valori di fiducia" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "importa i valori di fiducia" -#: g10/g10.c:218 +#: g10/g10.c:220 msgid "update the trust database" msgstr "aggiorna il database della fiducia" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NOMI]|controlla il database della fiducia" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "ripara un database della fiducia rovinato" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "rimuovi l'armatura a un file o a stdin" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "crea l'armatura a un file o a stdin" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [files]|stampa tutti i message digests" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -417,168 +417,170 @@ msgstr "" "Opzioni:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "crea un output ascii con armatura" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NOME|cifra per NOME" -#: g10/g10.c:234 +#: g10/g10.c:236 msgid "|NAME|use NAME as default recipient" msgstr "|NOME|usa NOME come destinatario predefinito" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "usa la chiave predefinita come destinatario predefinito" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "usa questo user-id per firmare o decifrare" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|imposta il livello di compressione (0 disab.)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "usa il modo testo canonico" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "usa come file di output" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "prolisso" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "meno prolisso" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "non usa per niente il terminale" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "forza l'uso di firme v3" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "usa sempre un MDC per cifrare" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "non fa cambiamenti" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "modo batch: non fare domande" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "assumi \"sì\" a quasi tutte le domande" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "assumi \"no\" a quasi tutte le domande" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "aggiungi questo portachiavi alla lista" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "aggiungi questo portachiavi segreto alla lista" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usa NOME come chiave segreta predefinita" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|cerca le chiavi in questo keyserver" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NOME|imposta il set di caratteri del terminale NOME" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "leggi le opzioni dal file" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "imposta i flag di debugging" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "abilita il debugging completo" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|FD|scrivi le informazioni di stato su questo fd" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "non scrivere pacchetti di commento" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "(predefinito è 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "(predefinito è 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|FILE|carica il modulo di estensione FILE" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "emula il modo descritto in RFC 1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" -msgstr "imposta tutte le opzioni di pacchetto,\ncifrario e digest per OpenPGP" +msgstr "" +"imposta tutte le opzioni di pacchetto,\n" +"cifrario e digest per OpenPGP" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|usa il modo N per la passphrase" -#: g10/g10.c:274 +#: g10/g10.c:276 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NOME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|usa l'algoritmo di compressione N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "elimina il campo keyid dei pacchetti cifrati" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "|NOME=VALORE|usa questi dati per una nota" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -598,15 +600,15 @@ msgstr "" " --list-keys [nomi] mostra le chiavi\n" " --fingerprint [nomi] mostra le impronte digitali\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "Per favore segnala i bug a .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -616,7 +618,7 @@ msgstr "" "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -624,169 +626,185 @@ msgstr "" "\n" "Algoritmi gestiti:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "uso: gpg [options] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: manca il file con le opzioni predefinite `%s'\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "file con le opzioni `%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "%s non è un set di caratteri valido\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "L'URL della policy indicato non è valido\n" -#: g10/g10.c:920 +#: g10/g10.c:941 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algoritmo di compressione deve essere tra %d e %d\n" -#: g10/g10.c:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve essere tra 1 e 255\n" -#: g10/g10.c:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n" -#: g10/g10.c:933 +#: g10/g10.c:954 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non valido; deve essere 0, 1 o 3\n" -#: g10/g10.c:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:1099 +#: g10/g10.c:1120 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:1107 +#: g10/g10.c:1128 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [comandi]" -#: g10/g10.c:1123 +#: g10/g10.c:1144 msgid "--delete-secret-key user-id" msgstr "--delete-secret-key user-id" -#: g10/g10.c:1126 +#: g10/g10.c:1147 msgid "--delete-key user-id" msgstr "--delete-key user-id" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire `%s': %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [userid] [portachiavi]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Vai avanti e scrivi il messaggio...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "impossibile aprire `%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" "il primo carattere del nome di una nota deve essere una lettera o un\n" "underscore\n" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -794,11 +812,11 @@ msgstr "" "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n" "underscore e deve finire con `='\n" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "il valore di una nota non deve usare caratteri di controllo\n" @@ -883,14 +901,19 @@ msgstr "" msgid " Fingerprint:" msgstr " Fingerprint:" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "mostra le impronte digitali" + # valid user replies (not including 1..4) # [Marco, you can change 'm' and 's' to whatever letters you like] #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "sSmMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -899,7 +922,7 @@ msgstr "" "Nessun valore di fiducia assegnato a %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -921,23 +944,23 @@ msgstr "" " 4 = Mi fido completamente\n" " s = mostrami ulteriori informazioni\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = torna al menù principale\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr " q = abbandona\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Cosa hai deciso? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificati che portano a chiavi definitivamente affidabili:\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -947,20 +970,20 @@ msgstr "" "se possiamo assegnare qualche valore di fiducia del proprietario mancante.\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" "Non è stato trovato alcun percorso che porti a una delle nostre chiavi.\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "Non è stato trovato alcun certificato con fiducia non definita.\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -968,37 +991,37 @@ msgstr "" "Nessun valore di fiducia modificato.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "chiave %08lX: la chiave è stata revocata!\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "Uso lo stesso questa chiave? " -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "chiave %08lX: la subchiave è stata revocata!\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: la chiave è scaduta\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" "%08lX: mancano informazioni su come calcolare una probabilità di fiducia\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: NON ci fidiamo di questa chiave!\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1007,15 +1030,15 @@ msgstr "" "%08lX: Non è sicuro che questa chiave appartenga veramente al proprietario\n" "ma è accettata comunque\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "Questa chiave probabilmente appartiene al proprietario\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "Questa chiave ci appartiene\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1027,65 +1050,65 @@ msgstr "" "prossima domanda.\n" "\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENZIONE: uso di una chiave non fidata!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATTENZIONE: questa chiave è stata revocata dal suo proprietario!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Questo può significare che la firma è stata falsificata.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATTENZIONE: questa subchiave è stata revocata dal proprietario!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Nota: questa chiave è scaduta!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "ATTENZIONE: questa chiave non è certificata con una firma fidata!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Non ci sono indicazioni che la firma appartenga al proprietario.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " La firma è probabilmente un FALSO.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATTENZIONE: questa chiave non è certificata con firme abbastanza fidate!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Non è sicuro che la firma appartenga al proprietario.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: saltata: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: saltato: chiave pubblica già presente\n" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1093,33 +1116,34 @@ msgstr "" "Non hai specificato un user ID. (puoi usare \"-r\")\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Inserisci l'user ID: " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "User ID inesistente.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 msgid "Public key is disabled.\n" msgstr "La chiave pubblica è disabilitata.\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" msgstr "destinatario predefinito sconosciuto `s'\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: errore nel controllare la chiave: %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: saltato: chiave pubblica disabilitata\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "nessun indirizzo valido\n" @@ -1460,17 +1484,17 @@ msgstr "%s: impossibile aprire: %s\n" msgid "error creating passphrase: %s\n" msgstr "errore nella creazione della passhprase: %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ATTENZIONE: file vuoto\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "lettura da `%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s cifrato per: %s\n" @@ -1502,6 +1526,20 @@ msgstr "troppe voci nella pk cache - disabilitata\n" msgid "too many entries in unk cache - disabled\n" msgstr "troppe voci nella unk cache - disabilitata\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "chiave %08lX: nessun user id\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "manca la chiave segreta\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1605,7 +1643,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:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "scrittura in `%s'\n" @@ -1734,13 +1772,13 @@ msgid "key %08lX: invalid subkey binding\n" msgstr "chiave %08lX: legame con la subchiave non valido:\n" #: g10/import.c:769 -#, c-format -msgid "key %08lX: accepted non self-signed userid '" +#, fuzzy, c-format +msgid "key %08lX: accepted non self-signed user-id '" msgstr "chiave %08lX: accettato l'userid non autofirmato '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "chiave %08lX: saltato l'user id '" #: g10/import.c:821 @@ -2432,7 +2470,7 @@ msgstr "questo algoritmo di cifratura msgid "can't handle public key algorithm %d\n" msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n" -#: g10/parse-packet.c:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n" @@ -2556,7 +2594,7 @@ msgstr "" msgid "%s signature from: %s\n" msgstr "Firma %s da: %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "impossibile creare %s: %s\n" @@ -2565,7 +2603,7 @@ msgstr "impossibile creare %s: %s\n" msgid "signing:" msgstr "firma:" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATTENZIONE: `%s' è un file vuoto\n" @@ -2801,11 +2839,6 @@ msgstr "chiave %08lX: accettata come chiave affidabile\n" msgid "enumerate secret keys failed: %s\n" msgstr "enumerate secret keys fallito: %s\n" -#: g10/trustdb.c:802 -#, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_sdir fallita: %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -2841,7 +2874,8 @@ msgstr "Autofirma non valida" #: g10/trustdb.c:1060 msgid "Valid user ID revocation skipped due to a newer self signature" -msgstr "Saltata una revoca dell'user ID valida a causa di una autofirma più recente" +msgstr "" +"Saltata una revoca dell'user ID valida a causa di una autofirma più recente" #: g10/trustdb.c:1066 msgid "Valid user ID revocation" @@ -3248,3 +3282,6 @@ msgstr "Non #, c-format msgid "No help available for `%s'" msgstr "Non è disponibile un aiuto per `%s'" + +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "tdbio_search_sdir fallita: %s\n" diff --git a/po/pl.po b/po/pl.po index f6d64ad8f..2df5ed056 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.9.7\n" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" "PO-Revision-Date: 1999-05-30 19:08+02:00\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -285,7 +285,7 @@ msgstr "" "Proszê kontynuowaæ inne dzia³ania aby system móg³ zebraæ odpowiedni±\n" "ilo¶æ entropii do ich wygenerowania (brakuje %d bajtów).\n" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -293,138 +293,138 @@ msgstr "" "@Polecenia:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[plik]|z³o¿enie podpisu" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[plik]|z³o¿enie podpisu na czytelnym dokumencie" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "sporz±dzenie podpisu oddzielonego od dokumentu" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "szyfrowanie danych" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "szyfrowanie tylko szyfrem symetrycznym" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "tylko zapis" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "odszyfrowywanie danych (domy¶lnie)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "sprawdzenie podpisu" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "lista kluczy" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "lista kluczy i podpisów" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "sprawdzenie podpisów kluczy" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "lista kluczy i ich odcisków" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "lista kluczy tajnych" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "generacja nowej pary klucza" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "usuniêcie klucza ze zbioru kluczy publicznych" -#: g10/g10.c:201 +#: g10/g10.c:203 #, fuzzy msgid "sign a key" msgstr "z³o¿enie podpisu na kluczu" -#: g10/g10.c:202 +#: g10/g10.c:204 #, fuzzy msgid "sign a key locally" msgstr "z³o¿enie lokalnego podpisu na kluczu" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "podpisanie lub modyfikacja klucza" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "generacja certyfikatu uniewa¿nienia klucza" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "eksport kluczy do pliku" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "eksport kluczy do serwera kluczy" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "import kluczy z serwera kluczy" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "import/do³±czenie kluczy" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "wypisane sekwencji pakietów" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "eksport warto¶ci zaufania" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "wczytanie warto¶æi zaufania" -#: g10/g10.c:218 +#: g10/g10.c:220 #, fuzzy msgid "update the trust database" msgstr "|[NAZWY]|naniesienie poprawek do bazy zaufania" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NAZWY]|sprawdzenie bazy zaufania" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "naprawa uszkodzonej Bazy Zaufania" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "zdjêcie opakowania ASCII pliku lub potoku" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "opakowanie ASCII pliku lub potoku" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [pliki]|skróty wiadomo¶ci" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -434,169 +434,169 @@ msgstr "" "Opcje:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "plik wynikowy w opakowaniu ASCII" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA" -#: g10/g10.c:234 +#: g10/g10.c:236 #, fuzzy msgid "|NAME|use NAME as default recipient" msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego klucza tajnego" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "identyfikator do podpisania lub odszyfrowania" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|poziom kompresji N (0 - brak)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "kanoniczny format tekstowy" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "plik wyj¶ciowy" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "z informacjami dodatkowymi" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "mniej komunikatóww" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "wymuszenie trzeciej wersji formatu podpisów" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "do szyfrowania bêdzie u¿ywany MDC" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "pozostawienie bez zmian" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "tryb wsadowy: ¿adnych pytañ" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "automatyczna odpowied¼ tak na wiêkszo¶æ pytañ" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "automatyczna odpowied¼ nie na wiêkszo¶æ pytañ" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "dodaæ zbiór kluczy do listy u¿ywanych" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "dodaæ zbiór kluczy tajnych do listy" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego klucza tajnego" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|serwer kluczy w którym bêd± poszukiwane" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NAZWA|zestaw znaków terminala NAZWA" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "wczytanie opcji z pliku" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "ustawienie opcji ¶ledzenia wykonania programu" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "umo¿liwienie pe³nego ¶ledzenia programu" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|FD|zapisaæ opis stanu do FD" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "nie zapisywaæ pakietów z komentarzem" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "(domy¶lnie 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "(domy¶lnie 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|PLIK|³adowanie modu³u rozszerzenia z PLIK" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "emulacja trybu opisanego w RFC1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|N-ty tryb wprowadzania wyra¿enia przej¶ciowego" -#: g10/g10.c:274 +#: g10/g10.c:276 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|ALG|algorytm obliczania skrótów wiadomo¶ci ALG" -#: g10/g10.c:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|ALG|algorytmu szyfruj±cy ALG dla has³a" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAZWA|algorytm szyfruj±cy NAZWA" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAZWA|algorytm obliczania skrótów wiadomo¶ci NAZWA" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|algorytm kompresji N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "usuniêcie identyfikatorów kluczy z pakietów" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -617,15 +617,15 @@ msgstr "" " --list-keys [nazwy] pokazuje klucze\n" " --fingerprint [nazwy] pokazuje odciski kluczy\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "B³êdy prosimy zg³aszaæ na adres .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -635,7 +635,7 @@ msgstr "" "podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n" "domy¶lnie wykonywana operacja zale¿y od danych wej¶ciowych\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -643,181 +643,197 @@ msgstr "" "\n" "Obs³ugiwane algorytmy:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "wywo³anie: gpg [opcje]" -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "sprzeczne polecenia\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "UWAGA: brak domy¶lnego pliku opcji '%s'\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "plik opcji '%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "odczyt opcji z '%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nie jest poprawn± nazw± zestawu znaków\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "ustawienie algortytmu kompresji musi pochodziæ z zakresu %d..%d\n" -#: g10/g10.c:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "warto¶æ max-cert-depth musi mie¶ciæ siê w zakresie od 1 do 255\n" -#: g10/g10.c:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/g10.c:933 +#: g10/g10.c:954 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "Niepoprawny tryb S2K; musi mieæ warto¶æ 0, 1 lub 3\n" -#: g10/g10.c:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Inicjowanie Bazy Zaufania nie powiod³o siê: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key nazwa u¿ytkownika" -#: g10/g10.c:1107 +#: g10/g10.c:1128 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key nazwa u¿ytkownika [polecenia]" -#: g10/g10.c:1123 +#: g10/g10.c:1144 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nazwa u¿ytkownika" -#: g10/g10.c:1126 +#: g10/g10.c:1147 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key nazwa u¿ytkownika" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "nie mogê otworzyæ %s: %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "usuniêcie opakowania ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "opakowywanie ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niew³a¶ciwy algorytm skrótu '%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "nie mogê otworzyæ '%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -903,12 +919,17 @@ msgstr "" msgid " Fingerprint:" msgstr " do³±czono do zbioru: %lu" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "okazanie odcisku klucza" + #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 msgid "sSmMqQ" msgstr "iIpPwW" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -917,7 +938,7 @@ msgstr "" "Brak warto¶ci zaufania dla %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -940,23 +961,23 @@ msgstr "" " 4 = W pe³ni mu ufam.\n" " i = potrzebujê wiêcej informacji\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " p = powrót do g³ównego menu\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr "w = wyj¶cie\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Twoja decyzja? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certyfikaty prowadz±ce do ostatecznie zaufanego klucza:\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -966,7 +987,7 @@ msgstr "" "Sprawd¼my czy mo¿na przypisaæ brakuj±ce warto¶ci zaufania.\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -974,7 +995,7 @@ msgstr "" "Brak ¶cie¿ki prowadz±cej do którego¶ z naszych kluczy.\n" "\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -982,7 +1003,7 @@ msgstr "" "Brak certyfikatów o niezdefiniowanym poziomie zaufania.\n" "\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -990,36 +1011,36 @@ msgstr "" "Parametry zaufania nie zosta³y zmienione.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "klucz %08lX: klucz zosta³ uniewa¿niony!\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "U¿yæ tego klucza pomimo to? " -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "klucz %08lX: podklucz zosta³ uniewa¿niony!\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: data wa¿no¶ci klucza up³ynê³a\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "%08lX: brak informacji aby obliczyæ prawdopodobieñstwo zaufania\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: NIE UFAMY temu kluczowi\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1028,16 +1049,16 @@ msgstr "" "%08lX: Nie ma pewno¶æi ¿e ten klucz faktycznie nale¿y do odoby podaj±cej\n" "siê za jego w³a¶ciciela, ale jest akceptowalny.\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "" "Ten klucz prawdopodobnie nale¿y do osoby podaj±cej siê za jego w³a¶ciciela.\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "Ten klucz nale¿y do nas\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1048,67 +1069,67 @@ msgstr "" "w³a¶ciciela. Je¶li nie masz co do tego ¿adnych w±tpliwo¶ci i *naprawdê*\n" "wiesz co robisz mo¿esz odpowiedzieæ \"tak\" na nastêpne pytanie.\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "OSTRZE¯ENIE: u¿ywany jest klucz nie obdarzony zaufaniem!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "OSTRZE¯ENIE: Ten klucz zosta³ uniewa¿niony przez w³a¶ciciela!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " To mo¿e oznaczaæ ¿e podpis jest fa³szerstwem.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "OSTRZE¯ENIE: Ten podklucz zosta³ uniewa¿niony przez w³a¶ciciela!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Uwaga: Data wa¿no¶ci tego klucza up³ynê³a!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "OSTRZE¯ENIE: Ten klucz nie jest po¶wiadczony zaufanym podpisem!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Nic nie wskazuje na to ¿e ten podpis z³o¿y³ w³a¶ciciel klucza.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "OSTRZE¯ENIE: NIE UFAMY temu kluczowi!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " Ten podpis prawdopodobnie jest FA£SZERSTWEM.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "OSTRZE¯ENIE: Ten klucz nie jest po¶wiadczony wystarczaj±co zaufanymi " "podpisami!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Nie ma pewno¶ci ¿e ten podpis zosta³ z³o¿nony przez w³a¶ciciela.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: pominiêty: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, fuzzy, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: problem przy odczycie bloku klucza: %s\n" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1116,34 +1137,35 @@ msgstr "" "Nie poda³e¶ identyfikatora u¿ytkownika (user ID). \n" "Mo¿na to zrobiæ za pomoc± opcji \"-r\".\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Wprowad¼ identyfikator u¿ytkownika (user ID): " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "Brak takiego identyfikatora u¿ytkownika.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 #, fuzzy msgid "Public key is disabled.\n" msgstr "klucz publiczny %08lX\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "UWAGA: brak domy¶lnego pliku opcji '%s'\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: b³±d podczas sprawdzania klucza: %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: problem przy odczycie bloku klucza: %s\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "brak poprawnych adresów\n" @@ -1492,17 +1514,17 @@ msgstr "%s: nie mog msgid "error creating passphrase: %s\n" msgstr "b³±d podczs tworzenia wyra¿enia przej¶ciowego (has³a): %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: OSTRZE¯ENIE: plik jest pusty\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "odczyt z '%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s zaszyfrowany dla: %s\n" @@ -1534,6 +1556,20 @@ msgstr "zbyt wiele wpis msgid "too many entries in unk cache - disabled\n" msgstr "zbyt wiele wpisów w buforze nieznanych kluczy - wy³±czony\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "klucz %08lX: brak identyfikatora u¿ytkownika\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "brak klucza prywatnego\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1637,7 +1673,7 @@ msgstr "klucz %08lX: brak klucza publicznego: %s\n" msgid "no default public keyring\n" msgstr "brak domy¶lnego zbioru kluczy publicznych\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "zapis do '%s'\n" @@ -1770,12 +1806,12 @@ msgstr "klucz %08lX: niepoprawne dowi #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "klucz %08lX: zosta³ pominiêty identyfikator u¿ytkownika '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "klucz %08lX: zosta³ pominiêty identyfikator u¿ytkownika '" #: g10/import.c:821 @@ -2487,7 +2523,7 @@ msgstr "" msgid "can't handle public key algorithm %d\n" msgstr "algorytm klucza publicznego niemo¿liwy do obs³u¿enia: %d\n" -#: g10/parse-packet.c:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n" @@ -2614,7 +2650,7 @@ msgstr "" msgid "%s signature from: %s\n" msgstr "%s podpis z³o¿ony przez: %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "nie mogê stworzyæ %s: %s\n" @@ -2623,7 +2659,7 @@ msgstr "nie mog msgid "signing:" msgstr "podpis:" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "OSTRZE¯ENIE: plik '%s' jest pusty\n" @@ -2859,11 +2895,6 @@ msgstr "Klucz %08lX: zaakceptowany jako klucz zaufany.\n" msgid "enumerate secret keys failed: %s\n" msgstr "wyliczenie kluczy tajnych nie powiod³o siê %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "Procedura tdbio_search_dir nie powiod³a siê: %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -3365,6 +3396,10 @@ msgstr "Pomoc niedost msgid "No help available for `%s'" msgstr "Brak pomocy o '%s'" +#, fuzzy +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "Procedura tdbio_search_dir nie powiod³a siê: %s\n" + #~ msgid "print all message digests" #~ msgstr "wszystkie skróty wiadomo¶ci" diff --git a/po/pt_BR.po b/po/pt_BR.po index ed98b6278..21dfe7804 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-20 23:46:36-0200\n" "From: Thiago Jung Bauermann \n" @@ -285,7 +285,7 @@ msgstr "" "para que o sistema possa coletar mais entropia!\n" "(São necessários mais %d bytes)\n" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -293,141 +293,141 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "|[file]|make a signature" msgstr "|[arquivo]|faz uma assinatura" -#: g10/g10.c:186 +#: g10/g10.c:188 msgid "|[file]|make a clear text signature" msgstr "|[arquivo]|faz uma assinatura em texto puro" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "faz uma assinatura separada" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "criptografa dados" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "criptografa apenas com criptografia simétrica" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "apenas armazena" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "descriptografa dados (padrão)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "verifica uma assinatura" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "lista as chaves" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "lista as chaves e as assinaturas" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "confere as assinaturas das chaves" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "lista as chaves e as impressões digitais" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "lista as chaves secretas" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "gera um novo par de chaves" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "remove a chave do chaveiro público" -#: g10/g10.c:201 +#: g10/g10.c:203 #, fuzzy msgid "sign a key" msgstr "assina a chave" -#: g10/g10.c:202 +#: g10/g10.c:204 #, fuzzy msgid "sign a key locally" msgstr "assina a chave localmente" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "assina ou edita uma chave" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "gera um certificado de revogação" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "exporta as chaves" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "exporta chaves para um servidor" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "importa chaves de um servidor" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "importa/funde as chaves" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "lista apenas as seqüências de pacotes" # ownertrust ??? -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "export the ownertrust values" msgstr "exporta os valores de confiança" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "import ownertrust values" msgstr "importa os valores de confiança" -#: g10/g10.c:218 +#: g10/g10.c:220 #, fuzzy msgid "update the trust database" msgstr "|[NOMES]|atualiza o banco de dados de confiabilidade" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[NOMES]|confere o banco de dados de confiabilidade" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "" "conserta um banco de dados de confiabilidade\n" "danificado" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "Retira a armadura de um arquivo ou de \"stdin\"" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "Cria armadura para um arquivo ou \"stdin\"" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [arquivos]|imprime \"digests\" de mensagens" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -437,177 +437,177 @@ msgstr "" "Opções:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "cria uma saída com armadura ascii" -#: g10/g10.c:231 +#: g10/g10.c:233 msgid "|NAME|encrypt for NAME" msgstr "|NOME|criptografa para NOME" -#: g10/g10.c:234 +#: g10/g10.c:236 #, fuzzy msgid "|NAME|use NAME as default recipient" msgstr "|NOME|usa NOME como chave secreta padrão" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "" "usa este identificador de usuário para assinar\n" "ou descriptografar" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|estabelece nível de compressão N (0 desabilita)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "usa modo de texto canônico" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "usa como arquivo de saída" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "detalhado" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "ser mais silencioso" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "force v3 signatures" msgstr "força assinaturas v3" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "always use a MDC for encryption" msgstr "sempre usar um MDC para criptografar" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "não fazer alterações" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "modo não-interativo: nunca perguntar" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "assumir sim para a maioria das perguntas" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "assumir não para a maioria das perguntas" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "adiciona este chaveiro à lista de chaveiros" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "adiciona este chaveiro secreto à lista" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usa NOME como chave secreta padrão" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "|ENDEREÇO|usa este servidor para buscar chaves" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "|NAME|set terminal charset to NAME" msgstr "|NOME|define mapa de caracteres do terminal como NOME" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "lê opções do arquivo" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "define parâmetros de depuração" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "habilita depuração completa" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "" "|DA|escreve informações de status para o descritor\n" "de arquivo DA" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "não escreve pacotes de comentário" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "(o padrão é 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "(o padrão é 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 msgid "|FILE|load extension module FILE" msgstr "|ARQUIVO|carrega módulo de extensão ARQUIVO" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "emula o modo descrito no RFC1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:272 +#: g10/g10.c:274 msgid "|N|use passphrase mode N" msgstr "|N|usa frase secreta modo N" -#: g10/g10.c:274 +#: g10/g10.c:276 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "" "|NOME|usa algoritmo de \"digest\" de mensagens NOME para\n" "frases secretas" -#: g10/g10.c:276 +#: g10/g10.c:278 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOME|usa algoritmo de criptografia NOME para\n" "frases secretas" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOME|usa algoritmo de criptografia NOME" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|usa algoritmo de compressão N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "elimina o campo keyid dos pacotes criptografados" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 msgid "" "@\n" "Examples:\n" @@ -627,16 +627,16 @@ msgstr "" " --list-keys [nomes] mostra chaves\n" " --fingerprint [nomes] mostra impressões digitais\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)" # em cima, "check" está como "conferir" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -646,7 +646,7 @@ msgstr "" "assina, verifica, criptografa ou descriptografa\n" "a operação padrão depende dos dados de entrada\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -654,182 +654,198 @@ msgstr "" "\n" "Algoritmos suportados:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "uso: gpg [opções] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de opções `%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "lendo opções de `%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, c-format msgid "%s is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n" -#: g10/g10.c:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve estar na faixa 1 a 255\n" -#: g10/g10.c:929 +#: g10/g10.c:950 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/g10.c:933 +#: g10/g10.c:954 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key nome_do_usuário" -#: g10/g10.c:1107 +#: g10/g10.c:1128 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key nome_do_usuário [comandos]" -#: g10/g10.c:1123 +#: g10/g10.c:1144 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nome_do_usuário" -#: g10/g10.c:1126 +#: g10/g10.c:1147 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key nome_do_usuário" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossível abrir %s: %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id_do_usuário] [chaveiro]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" # "hash" poderia ser "espalhamento", mas não fica claro -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash inválido `%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "Vá em frente e digite sua mensagem ...\n" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "impossível abrir `%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -915,14 +931,19 @@ msgstr "" msgid " Fingerprint:" msgstr " importados: %lu" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "mostra impressão digital" + # ??? #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 #, fuzzy msgid "sSmMqQ" msgstr "sSmMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -931,7 +952,7 @@ msgstr "" "Nenhum valor de confiança designado para %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -954,23 +975,23 @@ msgstr "" " 4 = Eu confio completamente\n" " 5 = Mostrar mais informação\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = volta ao menu principal\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr " q = sai\n" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "Sua decisão? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -980,13 +1001,13 @@ msgstr "" "Vamos ver se é possível designar alguns valores de confiança ausentes.\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "Nenhuma rota encontrada que leve a uma de nossas chaves.\n" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -994,7 +1015,7 @@ msgstr "" "Nenhum certificado com confiança indefinida encontrado.\n" "\n" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 msgid "" "No trust values changed.\n" "\n" @@ -1002,36 +1023,36 @@ msgstr "" "Nenhum valor de confiança modificado.\n" "\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "chave %08lX: a chave foi revogada!\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "Usa esta chave de qualquer modo? " -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "chave %08lX: a subchave foi revogada!\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: a chave expirou\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "%08lX: sem informação para calcular probabilidade de confiança\n" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: Nós NÃO confiamos nesta chave\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1040,15 +1061,15 @@ msgstr "" "%08lX: Não se tem certeza de que esta chave realmente pertence ao dono,\n" "mas é aceita de qualquer modo\n" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "Esta chave provavelmente pertence ao dono\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "Esta chave pertence a nós\n" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1060,65 +1081,65 @@ msgstr "" "afirmativamente à próxima pergunta\n" "\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "AVISO: Usando chave não confiável!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " Isto pode significar que a assinatura é falsificada.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "Nota: Esta chave expirou!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Não há indicação de que a assinatura pertence ao dono.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "AVISO: Nós NÃO confiamos nesta chave!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " A assinatura é provavelmente uma FALSIFICAÇÃO.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "AVISO: Esta chave não está certificada com assinaturas suficientemente\n" " confiáveis!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Não se tem certeza de que a assinatura pertence ao dono.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, fuzzy, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: erro de leitura de bloco de chaves: %s\n" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1126,34 +1147,35 @@ msgstr "" "Você não especificou um ID de usuário. (pode-se usar \"-r\")\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "Digite o identificador de usuário: " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "Identificador de usuário inexistente.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 #, fuzzy msgid "Public key is disabled.\n" msgstr "a chave pública é %08lX\n" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: erro na verificação da chave: %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: erro de leitura de bloco de chaves: %s\n" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "nenhum endereço válido\n" @@ -1496,17 +1518,17 @@ msgstr "%s: imposs msgid "error creating passphrase: %s\n" msgstr "erro na criação da frase secreta: %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: AVISO: arquivo vazio\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "lendo de `%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s criptografado para: %s\n" @@ -1538,6 +1560,20 @@ msgstr "entradas demais no cache pk - desabilitado\n" msgid "too many entries in unk cache - disabled\n" msgstr "entradas demais no cache unk - desabilitado\n" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "chave %08lX: sem id de usuário\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "nenhuma chave secreta\n" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1641,7 +1677,7 @@ msgstr "chave %08lX: chave p msgid "no default public keyring\n" msgstr "sem chaveiro público padrão\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "escrevendo para `%s'\n" @@ -1771,12 +1807,12 @@ msgstr "chave %08lX: liga #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "chave %08lX: id de usuário ignorado '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "chave %08lX: id de usuário ignorado '" #: g10/import.c:821 @@ -2488,7 +2524,7 @@ 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:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpacote de tipo %d tem bit crítico ligado\n" @@ -2609,7 +2645,7 @@ msgstr "assumindo assinatura incorreta devido a um bit cr msgid "%s signature from: %s\n" msgstr "%s assinatura de: %s\n" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, c-format msgid "can't create %s: %s\n" msgstr "impossível criar %s: %s\n" @@ -2618,7 +2654,7 @@ msgstr "imposs msgid "signing:" msgstr "assinando:" -#: g10/sign.c:401 +#: g10/sign.c:404 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVISO: `%s' é um arquivo vazio\n" @@ -2856,11 +2892,6 @@ msgstr "chave %08lX: aceita como chave confi msgid "enumerate secret keys failed: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_dir falhou: %s\n" - #: g10/trustdb.c:877 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -3308,6 +3339,10 @@ msgstr "Nenhuma ajuda dispon msgid "No help available for `%s'" msgstr "Nenhuma ajuda disponível para `%s'" +#, fuzzy +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "tdbio_search_dir falhou: %s\n" + #~ msgid "print all message digests" #~ msgstr "imprime todos os \"digests\" de mensagens" diff --git a/po/ru.po b/po/ru.po index 2f4940165..1797d2658 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: 1999-07-23 14:25+0200\n" +"POT-Creation-Date: 1999-08-04 09:56+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck \n" @@ -330,7 +330,7 @@ msgstr "" "îÅÄÏÓÔÁÔÏÞÎÏ ÓÌÕÞÁÊÎÙÈ ÄÁÎÎÙÈ. ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÅÌÁÊÔÅ ÞÔÏ-ÎÉÂÕÄØ, ÞÔÏÂÙ\n" "ïó ÍÏÇÌÁ ÎÁÂÒÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÌÕÞÁÊÎÙÅ ÞÉÓÌÁ! (ÎÕÖÎÏ ÅÝÅ %d ÂÁÊÔ)\n" -#: g10/g10.c:183 +#: g10/g10.c:185 msgid "" "@Commands:\n" " " @@ -338,142 +338,142 @@ msgstr "" "@ëÏÍÁÎÄÙ:\n" " " -#: g10/g10.c:185 +#: g10/g10.c:187 #, fuzzy msgid "|[file]|make a signature" msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÐÏÄÐÉÓØ" -#: g10/g10.c:186 +#: g10/g10.c:188 #, fuzzy msgid "|[file]|make a clear text signature" msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "make a detached signature" msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ" -#: g10/g10.c:188 +#: g10/g10.c:190 msgid "encrypt data" msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ" -#: g10/g10.c:189 +#: g10/g10.c:191 msgid "encryption only with symmetric cipher" msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÓÉÍÍÅÔÒÉÞÎÙÍ ÁÌÇÏÒÉÔÍÏÍ" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "store only" msgstr "ÔÏÌØËÏ ÓÏÈÒÁÎÉÔØ" -#: g10/g10.c:191 +#: g10/g10.c:193 msgid "decrypt data (default)" msgstr "ÒÁÓÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ (ÐÏ ÕÍÏÌÞÁÎÉÀ)" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "verify a signature" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ" -#: g10/g10.c:193 +#: g10/g10.c:195 msgid "list keys" msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ" -#: g10/g10.c:195 +#: g10/g10.c:197 msgid "list keys and signatures" msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÐÏÄÐÉÓÅÊ" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "check key signatures" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "list keys and fingerprints" msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ Ó ÉÈ \"ÏÔÐÅÞÁÔËÁÍÉ ÐÁÌØÃÅ×\"" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "list secret keys" msgstr "ÓÐÉÓÏË ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "generate a new key pair" msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÕÀ ÐÁÒÕ ËÌÀÞÅÊ (ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ)" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "remove key from the public keyring" msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ" -#: g10/g10.c:201 +#: g10/g10.c:203 #, fuzzy msgid "sign a key" msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ" -#: g10/g10.c:202 +#: g10/g10.c:204 #, fuzzy msgid "sign a key locally" msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ" -#: g10/g10.c:203 +#: g10/g10.c:205 msgid "sign or edit a key" msgstr "ÐÏÄÐÉÓÁÔØ ÉÌÉ ÒÅÄÁËÔÉÒÏ×ÁÔØ ËÌÀÞ" -#: g10/g10.c:204 +#: g10/g10.c:206 msgid "generate a revocation certificate" msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ" -#: g10/g10.c:205 +#: g10/g10.c:207 msgid "export keys" msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ËÌÀÞÉ" -#: g10/g10.c:206 +#: g10/g10.c:208 msgid "export keys to a key server" msgstr "" -#: g10/g10.c:207 +#: g10/g10.c:209 msgid "import keys from a key server" msgstr "" -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "import/merge keys" msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ/ÄÏÂÁ×ÉÔØ ËÌÀÞÉ" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "list only the sequence of packets" msgstr "ÎÁÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÐÁËÅÔÏ×" -#: g10/g10.c:214 +#: g10/g10.c:216 #, fuzzy msgid "export the ownertrust values" msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n" -#: g10/g10.c:216 +#: g10/g10.c:218 #, fuzzy msgid "import ownertrust values" msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n" -#: g10/g10.c:218 +#: g10/g10.c:220 #, fuzzy msgid "update the trust database" msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "|[NAMES]|check the trust database" msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "fix a corrupted trust database" msgstr "ÉÓÐÒÁ×ÉÔØ ÒÁÚÒÕÛÅÎÎÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" -#: g10/g10.c:222 +#: g10/g10.c:224 msgid "De-Armor a file or stdin" msgstr "äÅËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ ÉÚ ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÑ" -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "En-Armor a file or stdin" msgstr "úÁËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÅ" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "|algo [files]|print message digests" msgstr "|algo [files]|ÎÁÐÅÞÁÔÁÔØ ÄÁÊÄÖÅÓÔ ÓÏÏÂÝÅÎÉÑ" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "" "@\n" "Options:\n" @@ -483,178 +483,178 @@ msgstr "" "ðÁÒÁÍÅÔÒÙ:\n" " " -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "create ascii armored output" msgstr "×Ù×ÏÄ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÉ" -#: g10/g10.c:231 +#: g10/g10.c:233 #, fuzzy msgid "|NAME|encrypt for NAME" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ" -#: g10/g10.c:234 +#: g10/g10.c:236 #, fuzzy msgid "|NAME|use NAME as default recipient" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "use this user-id to sign or decrypt" msgstr "" "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ ÉÌÉ ÒÁÓÛÉÆÒÏ×ËÉ" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "|N|set compress level N (0 disables)" msgstr "|N|ÕÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ (0 - ÎÅ ÓÖÉÍÁÔØ)" -#: g10/g10.c:243 +#: g10/g10.c:245 msgid "use canonical text mode" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ËÁÎÏÎÉÞÅÓËÉÊ ÔÅËÓÔÏ×ÙÊ ÒÅÖÉÍ" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "use as output file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ × ËÁÞÅÓÔ×Å ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: g10/g10.c:245 +#: g10/g10.c:247 msgid "verbose" msgstr "ÍÎÏÇÏÓÌÏ×ÎÙÊ" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:247 +#: g10/g10.c:249 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:250 #, fuzzy msgid "force v3 signatures" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ" -#: g10/g10.c:249 +#: g10/g10.c:251 #, fuzzy msgid "always use a MDC for encryption" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "do not make any changes" msgstr "Keine wirklichen Änderungen durchführen" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:252 +#: g10/g10.c:254 msgid "batch mode: never ask" msgstr "ÐÁËÅÔÎÙÊ ÒÅÖÉÍ: ÎÉÞÅÇÏ ÎÅ ÓÐÒÁÛÉ×ÁÔØ" -#: g10/g10.c:253 +#: g10/g10.c:255 msgid "assume yes on most questions" msgstr "ÏÔ×ÅÞÁÔØ \"ÄÁ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×" -#: g10/g10.c:254 +#: g10/g10.c:256 msgid "assume no on most questions" msgstr "ÏÔ×ÅÞÁÔØ \"ÎÅÔ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×" -#: g10/g10.c:255 +#: g10/g10.c:257 msgid "add this keyring to the list of keyrings" msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ" -#: g10/g10.c:256 +#: g10/g10.c:258 msgid "add this secret keyring to the list" msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ ÓÅËÒÅÔÎÕÀ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ" -#: g10/g10.c:257 +#: g10/g10.c:259 msgid "|NAME|use NAME as default secret key" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: g10/g10.c:258 +#: g10/g10.c:260 msgid "|HOST|use this keyserver to lookup keys" msgstr "" -#: g10/g10.c:259 +#: g10/g10.c:261 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ" -#: g10/g10.c:260 +#: g10/g10.c:262 msgid "read options from file" msgstr "ÞÉÔÁÔØ ÐÁÒÁÍÅÔÒÙ ÉÚ ÆÁÊÌÁ" -#: g10/g10.c:262 +#: g10/g10.c:264 msgid "set debugging flags" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÏÔÌÁÄÏÞÎÙÅ ÆÌÁÇÉ" -#: g10/g10.c:263 +#: g10/g10.c:265 msgid "enable full debugging" msgstr "ÒÁÚÒÅÛÉÔØ ×ÓÀ ÏÔÌÁÄËÕ" -#: g10/g10.c:264 +#: g10/g10.c:266 msgid "|FD|write status info to this FD" msgstr "|FD| ÚÁÐÉÓÙ×ÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÏÓÔÏÑÎÉÉ × ÄÅÓËÒÉÐÔÏÒ (FD)" -#: g10/g10.c:265 +#: g10/g10.c:267 msgid "do not write comment packets" msgstr "ÎÅ ÐÉÓÁÔØ ÐÁËÅÔÙ Ó ËÏÍÍÅÎÔÁÒÉÑÍÉ" -#: g10/g10.c:266 +#: g10/g10.c:268 msgid "(default is 1)" msgstr "(ÐÏ ÕÍÏÌÞÁÎÉÀ 1)" -#: g10/g10.c:267 +#: g10/g10.c:269 msgid "(default is 3)" msgstr "(ÐÏ ÕÍÏÌÞÁÎÉÀ 3)" -#: g10/g10.c:269 +#: g10/g10.c:271 #, fuzzy msgid "|FILE|load extension module FILE" msgstr "|æáêì|ÚÁÇÒÕÚÉÔØ æáêì Ó ÒÁÓÛÉÒÑÀÝÉÍÉ ÍÏÄÕÌÑÍÉ" -#: g10/g10.c:270 +#: g10/g10.c:272 msgid "emulate the mode described in RFC1991" msgstr "ÜÍÕÌÉÒÏ×ÁÔØ ÒÅÖÉÍ ÏÐÉÓÁÎÎÙÊ × RFC1991" -#: g10/g10.c:271 +#: g10/g10.c:273 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:272 +#: g10/g10.c:274 #, fuzzy msgid "|N|use passphrase mode N" msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ ÒÅÖÉÍÁ N\n" -#: g10/g10.c:274 +#: g10/g10.c:276 #, fuzzy msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ" -#: g10/g10.c:276 +#: g10/g10.c:278 #, fuzzy msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ" -#: g10/g10.c:277 +#: g10/g10.c:279 msgid "|NAME|use cipher algorithm NAME" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ" -#: g10/g10.c:278 +#: g10/g10.c:280 msgid "|NAME|use message digest algorithm NAME" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ" -#: g10/g10.c:279 +#: g10/g10.c:281 msgid "|N|use compress algorithm N" msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ ÓÖÁÔÉÑ N" -#: g10/g10.c:280 +#: g10/g10.c:282 msgid "throw keyid field of encrypted packets" msgstr "×ÙÂÒÁÓÙ×ÁÔØ ÐÏÌÅ keyid Õ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×" -#: g10/g10.c:281 +#: g10/g10.c:283 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:283 +#: g10/g10.c:285 #, fuzzy msgid "" "@\n" @@ -675,17 +675,17 @@ msgstr "" " --list-keys [names] ÐÏËÁÚÁÔØ ÓÐÉÓÏË ËÌÀÞÅÊ\n" " --fingerprint [names] ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔËÉ ÐÁÌØÃÅ×\" ËÌÀÞÅÊ\n" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "Please report bugs to .\n" msgstr "" "ðÏÖÁÌÕÊÓÔÁ, ÏÔÐÒÁ×ÌÑÊÔÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ÐÏ ÁÄÒÅÓÕ " ".\n" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ] (-h ÄÌÑ ÐÏÍÏÝÉ)" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -695,7 +695,7 @@ msgstr "" "ÐÏÄÐÉÓÙ×ÁÅÔ, ÐÒÏ×ÅÒÑÅÔ ÐÏÄÐÉÓÉ, ÛÉÆÒÕÅÔ ÉÌÉ ÒÁÓÛÉÆÒÏ×Ù×ÁÅÔ\n" "ÒÅÖÉÍ ÒÁÂÏÔÙ ÚÁ×ÉÓÉÔ ÏÔ ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ\n" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "" "\n" "Supported algorithms:\n" @@ -703,182 +703,198 @@ msgstr "" "\n" "ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÁÌÇÏÒÉÔÍÙ:\n" -#: g10/g10.c:452 +#: g10/g10.c:456 msgid "usage: gpg [options] " msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] " -#: g10/g10.c:505 +#: g10/g10.c:509 msgid "conflicting commands\n" msgstr "Widersprüchliche Kommandos\n" -#: g10/g10.c:640 +#: g10/g10.c:644 #, fuzzy, c-format msgid "NOTE: no default option file `%s'\n" msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n" -#: g10/g10.c:644 +#: g10/g10.c:648 #, c-format msgid "option file `%s': %s\n" msgstr "ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× `%s': %s\n" -#: g10/g10.c:651 +#: g10/g10.c:655 #, c-format msgid "reading options from `%s'\n" msgstr "ÞÉÔÁÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÉÚ `%s'\n" -#: g10/g10.c:831 +#: g10/g10.c:835 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n" -#: g10/g10.c:895 g10/g10.c:907 +#: g10/g10.c:892 g10/g10.c:901 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "" + +#: g10/g10.c:894 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "" + +#: g10/g10.c:897 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "" + +#: g10/g10.c:916 g10/g10.c:928 msgid "selected cipher algorithm is invalid\n" msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ\n" -#: g10/g10.c:901 g10/g10.c:913 +#: g10/g10.c:922 g10/g10.c:934 msgid "selected digest algorithm is invalid\n" msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÁÊÄÖÅÓÔ-ÁÌÇÏÒÉÔÍ\n" -#: g10/g10.c:917 +#: g10/g10.c:938 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:941 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ ÍÏÖÅÔ ÉÍÅÔØ ÚÎÁÞÅÎÉÑ ÏÔ %d ÄÏ %d\n" -#: g10/g10.c:922 +#: g10/g10.c:943 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 0\n" -#: g10/g10.c:924 +#: g10/g10.c:945 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 1\n" -#: g10/g10.c:926 +#: g10/g10.c:947 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:929 +#: g10/g10.c:950 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ÚÁÍÅÞÁÎÉÅ: ÐÒÏÓÔÏÊ S2K ÒÅÖÉÍ (0) ÏÞÅÎØ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ\n" -#: g10/g10.c:933 +#: g10/g10.c:954 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÒÅÖÉÍ S2K: ÄÏÌÖÅÎ ÂÙÔØ 0, 1 ÉÌÉ 3\n" -#: g10/g10.c:1010 +#: g10/g10.c:1031 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n" -#: g10/g10.c:1016 +#: g10/g10.c:1037 msgid "--store [filename]" msgstr "--store [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1023 +#: g10/g10.c:1044 msgid "--symmetric [filename]" msgstr "--symmetric [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1031 +#: g10/g10.c:1052 msgid "--encrypt [filename]" msgstr "--encrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1044 +#: g10/g10.c:1065 msgid "--sign [filename]" msgstr "--sign [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1057 +#: g10/g10.c:1078 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1071 +#: g10/g10.c:1092 msgid "--clearsign [filename]" msgstr "--clearsign [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1083 +#: g10/g10.c:1104 msgid "--decrypt [filename]" msgstr "--decrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1091 +#: g10/g10.c:1112 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1099 +#: g10/g10.c:1120 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/g10.c:1107 +#: g10/g10.c:1128 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/g10.c:1123 +#: g10/g10.c:1144 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/g10.c:1126 +#: g10/g10.c:1147 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366 +#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" -#: g10/g10.c:1161 -msgid "-k[v][v][v][c] [userid] [keyring]" +#: g10/g10.c:1182 +#, fuzzy +msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ] [Ó×ÑÚËÁ ËÌÀÞÅÊ]" -#: g10/g10.c:1222 +#: g10/g10.c:1243 #, c-format msgid "dearmoring failed: %s\n" msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n" -#: g10/g10.c:1230 +#: g10/g10.c:1251 #, c-format msgid "enarmoring failed: %s\n" msgstr "ÏÛÉÂËÁ ËÏÄÉÒÏ×ÁÎÉÑ: %s\n" -#: g10/g10.c:1298 +#: g10/g10.c:1319 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÈÜÛ-ÁÌÇÏÒÉÔÍ `%s'\n" -#: g10/g10.c:1379 +#: g10/g10.c:1400 msgid "[filename]" msgstr "[ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1383 +#: g10/g10.c:1404 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s'\n" -#: g10/g10.c:1555 +#: g10/g10.c:1576 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1561 +#: g10/g10.c:1582 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1567 +#: g10/g10.c:1588 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1575 +#: g10/g10.c:1596 msgid "a notation value must not use any control characters\n" msgstr "" @@ -965,14 +981,19 @@ msgstr "" msgid " Fingerprint:" msgstr "" +#: g10/pkclist.c:80 +#, fuzzy +msgid "Fingerprint:" +msgstr "ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔÏË ÐÁÌØÃÁ\"" + # valid user replies (not including 1..4) #. a string with valid answers -#: g10/pkclist.c:170 +#: g10/pkclist.c:197 #, fuzzy msgid "sSmMqQ" msgstr "sSmMqQ" -#: g10/pkclist.c:174 +#: g10/pkclist.c:201 #, fuzzy, c-format msgid "" "No trust value assigned to %lu:\n" @@ -981,7 +1002,7 @@ msgstr "" "îÅ ÏÐÒÅÄÅÌÅÎÙ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ ÄÌÑ %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:186 +#: g10/pkclist.c:213 #, fuzzy msgid "" "Please decide how far you trust this user to correctly\n" @@ -1006,23 +1027,23 @@ msgstr "" " 4 = ÷ÅÒÀ ÐÏÌÎÏÓÔØÀ\n" " s = ðÏÖÁÌÕÊÓÔÁ, ÐÏËÁÖÉÔÅ ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ\n" -#: g10/pkclist.c:195 +#: g10/pkclist.c:222 msgid " m = back to the main menu\n" msgstr " m = ÏÂÒÁÔÎÏ × ÇÌÁ×ÎÏÅ ÍÅÎÀ\n" -#: g10/pkclist.c:197 +#: g10/pkclist.c:224 msgid " q = quit\n" msgstr "" -#: g10/pkclist.c:203 +#: g10/pkclist.c:230 msgid "Your decision? " msgstr "÷ÁÛÅ ÒÅÛÅÎÉÅ? " -#: g10/pkclist.c:225 +#: g10/pkclist.c:252 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:296 +#: g10/pkclist.c:323 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" @@ -1033,70 +1054,70 @@ msgstr "" "ÎÅËÏÔÏÒÙÅ ÎÅÄÏÓÔÁÀÝÉÅ ÚÎÁÞÅÎÉÑ \"ÄÏ×ÅÒÉÑ ×ÌÁÄÅÌØÃÕ\"\n" "\n" -#: g10/pkclist.c:302 +#: g10/pkclist.c:329 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" -#: g10/pkclist.c:304 +#: g10/pkclist.c:331 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "" -#: g10/pkclist.c:306 +#: g10/pkclist.c:333 #, fuzzy msgid "" "No trust values changed.\n" "\n" msgstr "úÎÁÞÅÎÉÑ ÐÁÒÁÍÅÔÒÏ× ÄÏ×ÅÒÉÑ ÎÅ ÉÚÍÅÎÅÎÙ.\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:350 #, fuzzy, c-format msgid "key %08lX: key has been revoked!\n" msgstr "build_sigrecs: ËÌÀÞ ist widerrufen\n" -#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448 +#: g10/pkclist.c:356 g10/pkclist.c:366 g10/pkclist.c:475 msgid "Use this key anyway? " msgstr "÷ÓÅ ÒÁ×ÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÜÔÏÔ ËÌÀÞ?" -#: g10/pkclist.c:333 +#: g10/pkclist.c:360 #, fuzzy, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "build_sigrecs: ËÌÀÞ ist widerrufen\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:390 #, fuzzy, c-format msgid "%08lX: key has expired\n" msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n" -#: g10/pkclist.c:369 +#: g10/pkclist.c:396 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" -#: g10/pkclist.c:383 +#: g10/pkclist.c:410 #, fuzzy, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "÷îéíáîéå: íÙ îå ÄÏ×ÅÒÑÅÍ ÜÔÏÍÕ ËÌÀÞÕ!\n" -#: g10/pkclist.c:389 +#: g10/pkclist.c:416 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" "but it is accepted anyway\n" msgstr "" -#: g10/pkclist.c:395 +#: g10/pkclist.c:422 msgid "This key probably belongs to the owner\n" msgstr "" -#: g10/pkclist.c:400 +#: g10/pkclist.c:427 msgid "This key belongs to us\n" msgstr "" -#: g10/pkclist.c:443 +#: g10/pkclist.c:470 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -1107,65 +1128,65 @@ msgstr "" "ËÔÏ ÕËÁÚÁÎ ÅÇÏ ×ÌÁÄÅÌØÃÅÍ. ïÔ×ÅÞÁÊÔÅ \"ÄÁ\" ÎÁ ÓÌÅÄÕÀÝÉÊ ×ÏÐÒÏÓ,\n" "ÔÏÌØËÏ ÅÓÌÉ ×Ù *ÄÅÊÓÔ×ÉÔÅÌØÎÏ* ÐÏÎÉÍÁÅÔÅ ÞÔÏ ÄÅÌÁÅÔÅ.\n" -#: g10/pkclist.c:456 g10/pkclist.c:478 +#: g10/pkclist.c:484 g10/pkclist.c:507 msgid "WARNING: Using untrusted key!\n" msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n" -#: g10/pkclist.c:499 +#: g10/pkclist.c:528 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "÷îéíáîéå: ÷ÌÁÄÅÌÅà ËÌÀÞÁ ÕÖÅ ÏÔÏÚ×ÁÌ ÅÇÏ!\n" -#: g10/pkclist.c:500 +#: g10/pkclist.c:529 msgid " This could mean that the signature is forgery.\n" msgstr " üÔÏ ÍÏÖÅÔ ÏÚÎÁÞÁÔØ, ÞÔÏ ÐÏÄÐÉÓØ ÐÏÄÄÅÌØÎÁÑ.\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:533 #, fuzzy msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "÷îéíáîéå: ÷ÌÁÄÅÌÅà ËÌÀÞÁ ÕÖÅ ÏÔÏÚ×ÁÌ ÅÇÏ!\n" -#: g10/pkclist.c:525 +#: g10/pkclist.c:554 msgid "Note: This key has expired!\n" msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n" -#: g10/pkclist.c:532 +#: g10/pkclist.c:562 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "÷îéíáîéå: üÔÏÔ ËÌÀÞ ÎÅ ÚÁ×ÅÒÅÎ ÄÏ×ÅÒÅÎÎÏÊ ÐÏÄÐÉÓØÀ!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:564 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " îÅÔ ÎÉËÁËÉÈ ÕËÁÚÁÎÉÑ ÎÁ ÔÏ, ÞÔÏ ËÌÀÞ ÐÒÉÎÁÄÌÅÖÉÔ ÅÇÏ ×ÌÁÄÅÌØÃÕ.\n" -#: g10/pkclist.c:550 +#: g10/pkclist.c:581 msgid "WARNING: We do NOT trust this key!\n" msgstr "÷îéíáîéå: íÙ îå ÄÏ×ÅÒÑÅÍ ÜÔÏÍÕ ËÌÀÞÕ!\n" -#: g10/pkclist.c:551 +#: g10/pkclist.c:582 msgid " The signature is probably a FORGERY.\n" msgstr " ðÏÄÐÉÓØ ×ÅÒÏÑÔÎÏ -- ðïääåìëá.\n" -#: g10/pkclist.c:558 +#: g10/pkclist.c:589 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "÷îéíáîéå: üÔÏÔ ËÌÀÞ ÎÅ ÚÁ×ÅÒÅÎ ÄÏÓÔÁÔÏÞÎÏ ÄÏ×ÅÒÅÎÎÙÍÉ ÐÏÄÐÉÓÑÍÉ!\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:592 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " îÅÔ Õ×ÅÒÅÎÎÏÓÔÉ, ÞÔÏ ÐÏÄÐÉÓØ ÐÒÉÎÁÄÌÅÖÉÔ ×ÌÁÄÅÌØÃÕ.\n" -#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838 +#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n" -#: g10/pkclist.c:670 g10/pkclist.c:820 +#: g10/pkclist.c:702 g10/pkclist.c:852 #, c-format msgid "%s: skipped: public key already present\n" msgstr "" -#: g10/pkclist.c:697 +#: g10/pkclist.c:729 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1174,34 +1195,35 @@ msgstr "" "\"-r\").\n" "\n" -#: g10/pkclist.c:707 +#: g10/pkclist.c:739 msgid "Enter the user ID: " msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ: " -#: g10/pkclist.c:719 +#: g10/pkclist.c:751 msgid "No such user ID.\n" msgstr "îÅÔ ÔÁËÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ.\n" -#: g10/pkclist.c:739 +#: g10/pkclist.c:771 #, fuzzy msgid "Public key is disabled.\n" msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ" -#: g10/pkclist.c:768 -msgid "unknown default recipient `s'\n" -msgstr "" +#: g10/pkclist.c:800 +#, fuzzy, c-format +msgid "unknown default recipient `%s'\n" +msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n" -#: g10/pkclist.c:801 +#: g10/pkclist.c:833 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: ÏÛÉÂËÁ ÐÒÉ ÐÒÏ×ÅÒËÅ ËÌÀÞÁ: %s\n" -#: g10/pkclist.c:806 +#: g10/pkclist.c:838 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "" -#: g10/pkclist.c:844 +#: g10/pkclist.c:876 msgid "no valid addressees\n" msgstr "ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÁÄÒÅÓÏ×\n" @@ -1551,17 +1573,17 @@ msgstr "%s: msgid "error creating passphrase: %s\n" msgstr "ÏÛÉÂËÁ ÐÒÉ ÓÏÚÄÁÎÉÉ ËÌÀÞÅ×ÏÊ ÆÒÁÚÙ: %s\n" -#: g10/encode.c:167 g10/encode.c:287 +#: g10/encode.c:171 g10/encode.c:318 #, fuzzy, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n" -#: g10/encode.c:237 +#: g10/encode.c:265 #, c-format msgid "reading from `%s'\n" msgstr "þÉÔÁÅÔÓÑ ÉÚ `%s'\n" -#: g10/encode.c:431 +#: g10/encode.c:482 #, fuzzy, c-format msgid "%s/%s encrypted for: %s\n" msgstr "%s ÚÁÛÉÆÒÏ×ÁÎÏ ÄÌÑ: %s\n" @@ -1594,6 +1616,20 @@ msgstr "" msgid "too many entries in unk cache - disabled\n" msgstr "" +#: g10/getkey.c:1289 g10/getkey.c:1328 +msgid "RSA key cannot be used in this version\n" +msgstr "" + +#: g10/getkey.c:1291 g10/getkey.c:1330 +#, fuzzy +msgid "No key for user-id\n" +msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n" + +#: g10/getkey.c:1369 g10/getkey.c:1409 +#, fuzzy +msgid "No user-id for key\n" +msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" + #: g10/getkey.c:1565 g10/getkey.c:1621 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" @@ -1697,7 +1733,7 @@ msgstr " msgid "no default public keyring\n" msgstr "ÎÅÔ Ó×ÑÚËÉ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ ÐÏ ÕÍÏÌÞÁÎÉÀ\n" -#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580 #, c-format msgid "writing to `%s'\n" msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n" @@ -1827,12 +1863,12 @@ msgstr " #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed userid '" +msgid "key %08lX: accepted non self-signed user-id '" msgstr "ËÌÀÞ %08lX: ÐÒÏÐÕÝÅÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped userid '" +#, fuzzy, c-format +msgid "key %08lX: skipped user-id '" msgstr "ËÌÀÞ %08lX: ÐÒÏÐÕÝÅÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ '" #: g10/import.c:821 @@ -2566,7 +2602,7 @@ msgstr "" msgid "can't handle public key algorithm %d\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n" -#: g10/parse-packet.c:932 +#: g10/parse-packet.c:939 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" @@ -2690,7 +2726,7 @@ msgstr "" msgid "%s signature from: %s\n" msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \"" -#: g10/sign.c:263 g10/sign.c:554 +#: g10/sign.c:263 g10/sign.c:575 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" @@ -2700,7 +2736,7 @@ msgstr "%s: msgid "signing:" msgstr "ÐÏÄÐÉÓÁÔØ" -#: g10/sign.c:401 +#: g10/sign.c:404 #, fuzzy, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n" @@ -2935,11 +2971,6 @@ msgstr " msgid "enumerate secret keys failed: %s\n" msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n" -#: g10/trustdb.c:802 -#, fuzzy, c-format -msgid "tdbio_search_sdir failed: %s\n" -msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n" - #: g10/trustdb.c:877 #, fuzzy, c-format msgid "key %08lX.%lu: Good subkey binding\n" @@ -3409,6 +3440,10 @@ msgstr " msgid "No help available for `%s'" msgstr "ðÏÍÏÝØ ÄÌÑ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ." +#, fuzzy +#~ msgid "tdbio_search_sdir failed: %s\n" +#~ msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n" + #~ msgid "print all message digests" #~ msgstr "ÎÁÐÅÞÁÔÁÔØ ×ÓÅ ÄÁÊÄÖÅÓÔÙ ÓÏÏÂÝÅÎÉÑ" diff --git a/scripts/ChangeLog b/scripts/ChangeLog index e611a0228..f602ba426 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 4 10:34:18 CEST 1999 Werner Koch + + + * config.guess: Updated from gnu/common and applied my emx patch again. + * config.sub: Updated from gnu/common. + Wed Jul 14 19:42:08 CEST 1999 Werner Koch diff --git a/scripts/config.guess b/scripts/config.guess index 902daa009..46b3ea319 100755 --- a/scripts/config.guess +++ b/scripts/config.guess @@ -1,6 +1,7 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 +# Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -114,7 +115,13 @@ EOF esac fi rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 @@ -158,7 +165,7 @@ EOF SR2?01:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*) + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 @@ -414,7 +421,7 @@ EOF case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 ) + 9000/[678][0-9][0-9]) sed 's/^ //' << EOF >$dummy.c #include #include @@ -488,7 +495,7 @@ EOF 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; - *9??*:MPE*:*:*) + *9??*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) @@ -507,6 +514,9 @@ EOF parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -546,7 +556,7 @@ EOF echo cray2-cray-unicos exit 0 ;; F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; @@ -559,12 +569,12 @@ EOF hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; i?86:BSD/386:*:* | i?86:BSD/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; @@ -589,6 +599,15 @@ EOF i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i386-pc-interix + exit 0 ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit 0 ;; @@ -622,7 +641,36 @@ EOF sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; + elf32ppc) + # Determine Lib Version + cat >$dummy.c < +#if defined(__GLIBC__) +extern char __libc_version[]; +extern char __libc_release[]; +#endif +main(argc, argv) + int argc; + char *argv[]; +{ +#if defined(__GLIBC__) + printf("%s %s\n", __libc_version, __libc_release); +#else + printf("unkown\n"); +#endif + return 0; +} +EOF + LIBC="" + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null + if test "$?" = 0 ; then + ./$dummy | grep 1\.99 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi + rm -f $dummy.c $dummy + echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then @@ -755,6 +803,14 @@ EOF echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} fi exit 0 ;; + i?86:*:5:7*) + UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` + (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586 + (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} + exit 0 ;; i?86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 + (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i?86:UnixWare:*:*) - if /bin/uname -X 2>/dev/null >/dev/null ; then - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - fi - echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION} - exit 0 ;; pc:*:*:*) # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. @@ -862,7 +915,7 @@ EOF news*:NEWS-OS:*:6*) echo mips-sony-newsos6 exit 0 ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*) + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -993,7 +1046,7 @@ main () #endif #if defined(__EMX__) - printf ("i386-emx-os2"); exit(0); + printf ("i386-pc-os2_emx"); exit(0); #endif exit (1); diff --git a/scripts/config.sub b/scripts/config.sub index bc19a382f..2436b4534 100755 --- a/scripts/config.sub +++ b/scripts/config.sub @@ -1,6 +1,6 @@ #! /bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc. +# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc. # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -98,11 +98,21 @@ case $os in os= basic_machine=$1 ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=vxworks + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; -sco5) - os=sco3.2v5 + os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) @@ -121,6 +131,9 @@ case $os in os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -isc) os=-isc2.2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -152,14 +165,20 @@ case $basic_machine in tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w \ + | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp11 | mips64 | mipsel | mips64el \ + | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ - | sparc | sparclet | sparclite | sparc64 | v850) + | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ + | mips64vr5000 | miprs64vr5000el \ + | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ + | thumb | d10v) basic_machine=$basic_machine-unknown ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -175,26 +194,41 @@ case $basic_machine in vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ + | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ | xmp-* | ymp-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ - | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67] \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ + | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ + | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ | mipstx39-* | mipstx39el-* \ - | f301-* | armv*-*) + | f301-* | armv*-* | t3e-* \ + | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ + | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; alliant | fx80) basic_machine=fx80-alliant ;; @@ -224,6 +258,10 @@ case $basic_machine in basic_machine=m68k-apollo os=-sysv ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; aux) basic_machine=m68k-apple os=-aux @@ -300,6 +338,10 @@ case $basic_machine in encore | umax | mmax) basic_machine=ns32k-encore ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; fx2800) basic_machine=i860-alliant ;; @@ -318,6 +360,14 @@ case $basic_machine in basic_machine=h8300-hitachi os=-hms ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; harris) basic_machine=m88k-harris os=-sysv3 @@ -333,13 +383,30 @@ case $basic_machine in basic_machine=m68k-hp os=-hpux ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) basic_machine=m68k-hp ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) @@ -348,13 +415,13 @@ case $basic_machine in hppa-next) os=-nextstep3 ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - os=-mpeix + hppaosf) + basic_machine=hppa1.1-hp + os=-osf ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - os=-mpeix + hppro) + basic_machine=hppa1.1-hp + os=-proelf ;; i370-ibm* | ibm*) basic_machine=i370-ibm @@ -377,6 +444,22 @@ case $basic_machine in basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + i386-go32 | go32) + basic_machine=i386-unknown + os=-go32 + ;; + i386-mingw32 | mingw32) + basic_machine=i386-unknown + os=-mingw32 + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -405,6 +488,10 @@ case $basic_machine in miniframe) basic_machine=m68000-convergent ;; + *mint | *MiNT) + basic_machine=m68k-atari + os=-mint + ;; mipsel*-linux*) basic_machine=mipsel-unknown os=-linux-gnu @@ -419,10 +506,22 @@ case $basic_machine in mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + msdos) + basic_machine=i386-unknown + os=-msdos + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; netwinder) basic_machine=armv4l-corel os=-linux @@ -439,6 +538,10 @@ case $basic_machine in basic_machine=mips-sony os=-newsos ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; next | m*-next ) basic_machine=m68k-next case $os in @@ -464,9 +567,25 @@ case $basic_machine in basic_machine=i960-intel os=-nindy ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; np1) basic_machine=np1-gould ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -484,19 +603,19 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | nexen) + pentium | p5 | k5 | k6 | nexen) basic_machine=i586-pc ;; - pentiumpro | p6 | k6 | 6x86) + pentiumpro | p6 | 6x86) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i786-pc ;; - pentium-* | p5-* | k5-* | nexen-*) + pentium-* | p5-* | k5-* | k6-* | nexen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-* | k6-* | 6x86-*) + pentiumpro-* | p6-* | 6x86-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-*) @@ -520,12 +639,20 @@ case $basic_machine in ps2) basic_machine=i386-ibm ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; sequent) basic_machine=i386-sequent ;; @@ -533,6 +660,10 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sparclite-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; sps7) basic_machine=m68k-bull os=-sysv2 @@ -540,6 +671,13 @@ case $basic_machine in spur) basic_machine=spur-unknown ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; sun2) basic_machine=m68000-sun ;; @@ -584,6 +722,10 @@ case $basic_machine in basic_machine=i386-sequent os=-dynix ;; + t3e) + basic_machine=t3e-cray + os=-unicos + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -601,6 +743,10 @@ case $basic_machine in basic_machine=a29k-nyu os=-sym1 ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; vaxv) basic_machine=vax-dec os=-sysv @@ -624,6 +770,14 @@ case $basic_machine in basic_machine=a29k-wrs os=-vxworks ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; xmp) basic_machine=xmp-cray os=-unicos @@ -631,12 +785,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; - *mint | *MiNT) - basic_machine=m68k-atari - os=-mint - ;; - os2 ) - os=-os2 + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim ;; none) basic_machine=none-none @@ -645,6 +796,15 @@ case $basic_machine in # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; mips) if [ x$os = x-linux-gnu ]; then basic_machine=mips-unknown @@ -667,7 +827,7 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sparc) + sparc | sparcv9) basic_machine=sparc-sun ;; cydra) @@ -679,6 +839,16 @@ case $basic_machine in orion105) basic_machine=clipper-highlevel ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 @@ -732,14 +902,21 @@ case $os in | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \ - | -openstep* | -mpeix* | -oskit*) + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -764,6 +941,9 @@ case $os in -acis*) os=-aos ;; + -386bsd) + os=-bsd + ;; -ctix* | -uts*) os=-sysv ;; @@ -795,6 +975,12 @@ case $os in # This must come after -sysvr4. -sysv*) ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; -xenix) os=-xenix ;; @@ -850,6 +1036,15 @@ case $basic_machine in # default. # os=-sunos4 ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -862,6 +1057,15 @@ case $basic_machine in *-ibm) os=-aix ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; *-hp) os=-hpux ;; @@ -925,6 +1129,15 @@ case $basic_machine in f301-fujitsu) os=-uxpv ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; *-atari*) os=-mint ;; @@ -949,10 +1162,10 @@ case $basic_machine in -aix*) vendor=ibm ;; - -hpux*) - vendor=hp + -beos*) + vendor=be ;; - -mpeix*) + -hpux*) vendor=hp ;; -mpeix*) @@ -985,6 +1198,12 @@ case $basic_machine in -aux*) vendor=apple ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; -*mint | -*MiNT) vendor=atari ;; diff --git a/util/iobuf.c b/util/iobuf.c index 31dabace0..f2e621596 100644 --- a/util/iobuf.c +++ b/util/iobuf.c @@ -92,7 +92,7 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len) if( control == IOBUFCTRL_UNDERFLOW ) { assert( size ); /* need a buffer */ - if ( feof(fp)) { /* On terminals you could easiely read as many EOFs as you call */ + if ( feof(fp)) { /* On terminals you could easiely read as many EOFs as you call */ rc = -1; /* fread() or fgetc() repeatly. Every call will block until you press */ *ret_len = 0; /* CTRL-D. So we catch this case before we call fread() again. */ } @@ -425,7 +425,7 @@ print_chain( IOBUF a ) log_debug("iobuf chain: %d.%d `%s' filter_eof=%d start=%d len=%d\n", a->no, a->subno, desc, a->filter_eof, - a->d.start, a->d.len ); + (int)a->d.start, (int)a->d.len ); } }