-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 NotDashEscaped: You need GnuPG to verify this message This is a patch file against 0.9.8a. Please check the signature of this patch file: zcat somepath/gnupg-0.9.8b.diff.gz | gpg --verify Change to directory gnupg-0.9.8a (or however you renamed it) and give this command: zcat somepath/gnupg-0.9.8b.diff.gz | patch -p1 It is a good idea to rename your current directory to gnupg-0.9.8b now. Prereq: 0.9.8a diff -urN gnupg-0.9.8a/VERSION gnupg-0.9.8b/VERSION --- gnupg-0.9.8a/VERSION Sat Jun 26 14:02:23 1999 +++ gnupg-0.9.8b/VERSION Mon Jul 12 15:34:05 1999 @@ -1 +1 @@ -0.9.8a +0.9.8b diff -urN gnupg-0.9.8a/BUGS gnupg-0.9.8b/BUGS --- gnupg-0.9.8a/BUGS Sat Jun 26 12:02:43 1999 +++ gnupg-0.9.8b/BUGS Mon Jul 12 18:44:50 1999 @@ -49,6 +49,7 @@ [ **] #19 1999-06-11 "trustdb transaction too large" with about 500 signatures on a key FAEBD5FC. + FIX: 1999-07-12 (less memory requirement and increased the limit) Next #22 diff -urN gnupg-0.9.8a/Makefile.am gnupg-0.9.8b/Makefile.am --- gnupg-0.9.8a/Makefile.am Wed Jul 7 11:38:24 1999 +++ gnupg-0.9.8b/Makefile.am Mon Jul 12 17:06:24 1999 @@ -23,7 +23,7 @@ sed -e 's/@pkg_version@/$(VERSION)/g' \ $(top_srcdir)/scripts/gnupg.spec.in \ > $(distdir)/scripts/gnupg.spec - rm $(distdir)/gcrypt/*.[ch] + -rm $(distdir)/gcrypt/*.[ch] if MAINTAINER_MODE diff -urN gnupg-0.9.8a/Makefile.in gnupg-0.9.8b/Makefile.in --- gnupg-0.9.8a/Makefile.in Mon Jul 12 15:03:34 1999 +++ gnupg-0.9.8b/Makefile.in Wed Jul 14 11:50:11 1999 @@ -407,7 +407,7 @@ sed -e 's/@pkg_version@/$(VERSION)/g' \ $(top_srcdir)/scripts/gnupg.spec.in \ > $(distdir)/scripts/gnupg.spec - rm $(distdir)/gcrypt/*.[ch] + -rm $(distdir)/gcrypt/*.[ch] # This is only useful within my local environment (wk) @MAINTAINER_MODE_TRUE@cvs-get: diff -urN gnupg-0.9.8a/NEWS gnupg-0.9.8b/NEWS --- gnupg-0.9.8a/NEWS Thu Jul 8 16:20:24 1999 +++ gnupg-0.9.8b/NEWS Tue Jul 13 17:16:50 1999 @@ -11,6 +11,13 @@ * New script tools/lspgpot to help transferring assigned trustvalues from PGP to GnuPG. + * New commands --lsign-key and made --sign-key a shortcut for --edit + and sign. + + * New options (#122--124 ;-) --[no-]default-recipient[-self]. See the + man page. + + * Enhanced info output in case of multiple recipients and fixed exit code. Noteworthy changes in version 0.9.8 ----------------------------------- diff -urN gnupg-0.9.8a/README gnupg-0.9.8b/README --- gnupg-0.9.8a/README Sat Jun 26 12:14:31 1999 +++ gnupg-0.9.8b/README Wed Jul 14 09:30:16 1999 @@ -1,5 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- - GnuPG - The GNU Privacy Guard ------------------------------- Version 0.9.8 @@ -68,7 +66,7 @@ 3) "make install" - 4) You end up with a "gpg" binray in /usr/local/bin. + 4) You end up with a "gpg" binary in /usr/local/bin. Note: Because some programs rely on the existence of a binary named "gpgm"; you should install a symbolic link from gpgm to gpg: @@ -447,12 +445,3 @@ Have fun and remember: Echelon is looking at you kid. ------BEGIN PGP SIGNATURE----- -Version: GnuPG v0.9.7 (GNU/Linux) -Comment: For info see http://www.gnupg.org - -iQB1AwUBN3SoBh0Z9MEMmFelAQE+9wL/bOTFEPvkO0drlWAu8k2P7udEzwfGlKhE -Iyr6g75FSX4NnDkHB7RjyHYvQUkc8gicxYV8pBWe5c1bMYwrpe1cMvAu+BtUfDQc -oHUbx9ln7CZ2BkEgzT5bjypugwtc6o7g -=uTFn ------END PGP SIGNATURE----- diff -urN gnupg-0.9.8a/THANKS gnupg-0.9.8b/THANKS --- gnupg-0.9.8a/THANKS Tue Jun 15 10:02:06 1999 +++ gnupg-0.9.8b/THANKS Tue Jul 13 17:13:46 1999 @@ -20,6 +20,7 @@ Detlef Lannert lannert@lannert.rz.uni-duesseldorf.de Dirk Lattermann dlatt@t-online.de Ed Boraas ecxjo@esperanto.org +Enzo Michelangeli em@MailAndNews.com Ernst Molitor ernst.molitor@uni-bonn.de Fabio Coatti cova@felix.unife.it Felix von Leitner leitner@amdiv.de @@ -97,7 +98,7 @@ nbecker@hns.com Thanks to the German Unix User Group for providing FTP space, -Martin Hamilton for hosting the mailing list and hsp for +Martin Hamilton for hosting the mailing list and HSP for hosting gnupg.org. Many thanks to my wife Gerlinde for having so much patience with diff -urN gnupg-0.9.8a/TODO gnupg-0.9.8b/TODO --- gnupg-0.9.8a/TODO Mon Jul 12 14:54:55 1999 +++ gnupg-0.9.8b/TODO Tue Jul 13 11:24:10 1999 @@ -14,6 +14,8 @@ * find a way to allow the import of non-self-signed keys. This is needed for the IN ENCR/SIGN hack. + * add an option to use a OpenPGP packet as input (and don't build a literal + data packet) Nice to have ------------ @@ -39,4 +41,5 @@ * for messages created with "-t", it might make sense to append the verification status of the message to the output (i.e. write something to the --output file and not only to stderr. + * configure option where to find zlib diff -urN gnupg-0.9.8a/doc/DETAILS gnupg-0.9.8b/doc/DETAILS --- gnupg-0.9.8a/doc/DETAILS Wed Jun 30 09:47:31 1999 +++ gnupg-0.9.8b/doc/DETAILS Wed Jul 14 10:12:29 1999 @@ -14,24 +14,33 @@ fpr = fingerprint: (fingerprint is in field 10) pkd = public key data (special field format, see below) - 2. Field: A letter describing the calculated trust, see doc/FAQ - This is a single letter, but be prepared that additional - information may follow in some future versions. - (not used for secret keys) + 2. Field: A letter describing the calculated trust. This is a single + letter, but be prepared that additional information may follow + in some future versions. (not used for secret keys) + o = Unknown (this key is new to the system) + d = The key has been disabled + r = The key has been revoked + e = The key has expired + q = Undefined (no value assigned) + n = Don't trust this key at all + m = There is marginal trust in this key + f = The key is full trusted. + u = The key is ultimately trusted; this is only used for + keys for which the secret key is also available. 3. Field: length of key in bits. 4. Field: Algorithm: 1 = RSA 16 = ElGamal (encrypt only) 17 = DSA (sometimes called DH, sign only) 20 = ElGamal (sign and encrypt) + (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. - 8. Field: Local ID: record number of the dir record in the trustdb - this value is only valid as long as the trustdb is not - deleted. May be later used to lookup the key: You will be - able to use "# as the user id. This is needed - because keyids may not be unique - a program may use this - number to access keys later. + 8. Field: Local ID: record number of the dir record in the trustdb. + This value is only valid as long as the trustdb is not + deleted. You can use "# as the user id when + specifying a key. This is needed because keyids may not be + unique - a program may use this number to access keys later. 9. Field: Ownertrust (primary public keys only) This is a single letter, but be prepared that additional information may follow in some future versions. @@ -158,6 +167,14 @@ NO_SECKEY The key is not available + IMPORTED + The keyid and name of the signature just imported + + IMPORTED_RES + + Final statistics on import process (this is one long line) + + Key generation ============== @@ -196,7 +213,7 @@ The TrustDB is built from fixed length records, where the first byte describes the record type. All numeric values are stored in network byte order. The length of each record is 40 bytes. The first record of -the DB is always of type 2 and this is the only record of this type. +the DB is always of type 1 and this is the only record of this type. Record type 0: -------------- @@ -541,30 +558,28 @@ -Ich werde jetzt doch das HKP Protokoll implementieren: +Documentation on HKP (the http keyserver protocol): -Naja, die Doku ist so gut wie nichtexistent, da gebe ich Dir recht. -In kurzen Worten: +A minimalistic HTTP server on port 11371 recognizes a GET for /pks/lookup. +The standard http URL encoded query parameters are this (always key=value): -(Minimal-)HTTP-Server auf Port 11371, versteht ein GET auf /pks/lookup, -wobei die Query-Parameter (Key-Value-Paare mit = zwischen Key und -Value; die Paare sind hinter ? und durch & getrennt). GЭltige -Operationen sind: - -- - op (Operation) mit den MЖglichkeiten index (gleich wie -kv bei - PGP), vindex (-kvv) und get (-kxa) -- - search: Liste der Worte, die im Key vorkommen mЭssen. Worte sind - mit Worttrennzeichen wie Space, Punkt, @, ... getrennt, Worttrennzeichen - werden nicht betrachtet, die Reihenfolge der Worte ist egal. -- - exact: (on=aktiv, alles andere inaktiv) Nur die SchlЭssel - zurЭckgeben, die auch den "search"-String beinhalten (d.h. - Wortreihenfolge und Sonderzeichen sind wichtig) -- - fingerprint (Bei [v]index auch den Fingerprint ausgeben), "on" - fЭr aktiv, alles andere inaktiv +- op=index (like pgp -kv), op=vindex (like pgp -kvv) and op=get (like + pgp -kxa) -Neu (wird von GNUPG benutzt): - /pks/lookup/?op= +- search=. This is a list of words that must occur in the key. + The words are delimited with space, points, @ and so on. The delimiters + are not searched for and the order of the words doesn't matter (but see + next option). + +- exact=on. This switch tells the hkp server to only report exact mathing + keys back. In this case the order and the "delimiters" are important. + +- fingerprint=on. Also reports the fingerprints when used with 'index' or + 'vindex' -ZusДtzlich versteht der Keyserver auch ein POST auf /pks/add, womit -man Keys hochladen kann. +New (already used by GnuPG): + + /pks/lookup/?op= +The keyserver also recognizes http-POSTs to /pks/add. Use this to upload +keys. diff -urN gnupg-0.9.8a/doc/FAQ gnupg-0.9.8b/doc/FAQ --- gnupg-0.9.8a/doc/FAQ Thu Jul 8 16:18:43 1999 +++ gnupg-0.9.8b/doc/FAQ Wed Jul 14 09:29:31 1999 @@ -161,7 +161,7 @@ on a local computer (a disconnected laptop is probably the best choice) and if you need it on your connected box (I know: We all do this) be sure to have a strong password for your account and for your secret key - and trust your Root. + and that you can trust your system administrator. When I check GnuPG on a remote system via ssh (I have no Alpha here ;-) I have the same problem. It takes a *very* long time to create the @@ -178,7 +178,7 @@ You can see the validity (calculated trust value) using this command. - gpgm --list-keys --with-colons + gpg --list-keys --with-colons If the first field is "pub" or "uid", the second field shows you the trust: @@ -199,7 +199,7 @@ You can get a list of the assigned trust values (how much you trust the owner to correctly sign another person's key) - gpgm --list-ownertrust + gpg --list-ownertrust The first field is the fingerprint of the primary key, the second field is the assigned value: diff -urN gnupg-0.9.8a/doc/HACKING gnupg-0.9.8b/doc/HACKING --- gnupg-0.9.8a/doc/HACKING Mon Apr 26 20:13:48 1999 +++ gnupg-0.9.8b/doc/HACKING Wed Jul 14 09:43:23 1999 @@ -30,7 +30,10 @@ gnupg-commit-watchers-request@gnupg.org -Please run scripts/autogen.sh to create some required files. +You must run scripts/autogen.sh before doing the ./configure, +as this creates some needed while which are not in the CVS. +autogen.sh should checks that you have all required tools +installed. RSYNC access @@ -39,6 +42,17 @@ of the CVS head revision is also available. See rsync(1) and try "rsync ftp.gnupg.org::" to see available resources. + + +Special Tools +============= +Documention is based on the docbook DTD. Actually we have only the +man page for now. To build a man page you need the docbook-to-man +tool and all the other thinks needed for SGML processing. Debian +comes with the docbook tools and you only need this docbook-to-man +script which is comes with gtk-doc or download it from +ftp.openit.de:/pub/devel/sgml. If you don't have it everything +should still work fine but you will have only a dummy man page. RFCs diff -urN gnupg-0.9.8a/doc/Makefile.am gnupg-0.9.8b/doc/Makefile.am --- gnupg-0.9.8a/doc/Makefile.am Wed Jun 16 20:11:12 1999 +++ gnupg-0.9.8b/doc/Makefile.am Tue Jul 13 18:40:17 1999 @@ -7,17 +7,19 @@ %.1 : %.sgml if HAVE_DOCBOOK_TO_MAN - docbook-to-man $< >$@ + docbook-to-man $< >$@ else - : Warning: missing docbook-to-man, cannot make $@ + : Warning: missing docbook-to-man, cannot make $@ + echo ".TH $< 1" >$@ + echo "No man page due to missing docbook-to-man" >>$@ endif %.txt : %.sgml - sgml2txt -c latin $* + sgml2txt -c latin $* %.html : %.sgml - sgml2html -c latin $* + sgml2html -c latin $* %.dvi : %.sgml -rm $*.sgml.tmp diff -urN gnupg-0.9.8a/doc/Makefile.in gnupg-0.9.8b/doc/Makefile.in --- gnupg-0.9.8a/doc/Makefile.in Mon Jul 12 15:05:49 1999 +++ gnupg-0.9.8b/doc/Makefile.in Wed Jul 14 11:50:57 1999 @@ -256,14 +256,16 @@ %.1 : %.sgml -@HAVE_DOCBOOK_TO_MAN_TRUE@ docbook-to-man $< >$@ -@HAVE_DOCBOOK_TO_MAN_FALSE@ : Warning: missing docbook-to-man, cannot make $@ +@HAVE_DOCBOOK_TO_MAN_TRUE@ docbook-to-man $< >$@ +@HAVE_DOCBOOK_TO_MAN_FALSE@ : Warning: missing docbook-to-man, cannot make $@ +@HAVE_DOCBOOK_TO_MAN_FALSE@ echo ".TH $< 1" >$@ +@HAVE_DOCBOOK_TO_MAN_FALSE@ echo "No man page due to missing docbook-to-man" >>$@ %.txt : %.sgml - sgml2txt -c latin $* + sgml2txt -c latin $* %.html : %.sgml - sgml2html -c latin $* + sgml2html -c latin $* %.dvi : %.sgml -rm $*.sgml.tmp diff -urN gnupg-0.9.8a/doc/gpg.1 gnupg-0.9.8b/doc/gpg.1 --- gnupg-0.9.8a/doc/gpg.1 Mon Jul 12 15:05:46 1999 +++ gnupg-0.9.8b/doc/gpg.1 Tue Jul 13 18:39:48 1999 @@ -1,607 +1,2 @@ -...\" $Header: /usr/src/docbook-to-man/cmd/RCS/docbook-to-man.sh,v 1.3 1996/06/17 03:36:49 fld Exp $ -...\" -...\" transcript compatibility for postscript use. -...\" -...\" synopsis: .P! -...\" -.de P! -.fl -\!!1 setgray -.fl -\\&.\" -.fl -\!!0 setgray -.fl \" force out current output buffer -\!!save /psv exch def currentpoint translate 0 0 moveto -\!!/showpage{}def -.fl \" prolog -.sy sed -e 's/^/!/' \\$1\" bring in postscript file -\!!psv restore -. -.de pF -.ie \\*(f1 .ds f1 \\n(.f -.el .ie \\*(f2 .ds f2 \\n(.f -.el .ie \\*(f3 .ds f3 \\n(.f -.el .ie \\*(f4 .ds f4 \\n(.f -.el .tm ? font overflow -.ft \\$1 -.. -.de fP -.ie !\\*(f4 \{\ -. ft \\*(f4 -. ds f4\" -' br \} -.el .ie !\\*(f3 \{\ -. ft \\*(f3 -. ds f3\" -' br \} -.el .ie !\\*(f2 \{\ -. ft \\*(f2 -. ds f2\" -' br \} -.el .ie !\\*(f1 \{\ -. ft \\*(f1 -. ds f1\" -' br \} -.el .tm ? font underflow -.. -.ds f1\" -.ds f2\" -.ds f3\" -.ds f4\" -.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n -.TH "gpg" "1" -.SH "NAME" -gpg \(em encryption and signing tool -.SH "SYNOPSIS" -.PP -.nf -\fBgpg\fP [--homedir \fBname\fR] [--options \fBfile\fR] [\fBoptions\fR] \fBcommand\fR [\fBargs\fR] -.fi -.SH "DESCRIPTION" -.PP -\fBgpg\fP is the main program for the GnuPG system\&. - -.SH "COMMANDS" -.PP -\fBgpg\fP recognizes these commands: -.IP "-s, --sign" 10 -Make a signature\&. This command may be combined -with --encrypt\&. -.IP "--clearsign" 10 -Make a clear text signature\&. -.IP "-b, --detach-sign" 10 -Make a detached signature\&. -.IP "-e, --encrypt" 10 -Encrypt data\&. This option may be combined with --sign\&. -.IP "-c, --symmetric" 10 -Encrypt with symmetric cipher only -This command asks for a passphrase\&. -.IP "--store" 10 -Store only (make a simple RFC1991 packet)\&. -.IP "--decrypt [\fBfile\fR]" 10 -Decrypt \fBfile\fR (or stdin if no file is specified) and -write it to stdout (or the file specified with ---output)\&. If the decrypted file is signed, the -signature is also verified\&. This command differs -from the default operation, as it never writes to the -filename which is included in the file and it -rejects files which don\&'t begin with an encrypted -message\&. -.IP "--verify [[\fBsigfile\fR] [\fBsigned-files\fR]]" 10 -Assume that \fBsigfile\fR is a signature and verify it -without generating any output\&. With no arguments, -the signature packet is read from stdin (it may be a -detached signature when not used in batch mode)\&. If -only a sigfile is given, it may be a complete -signature or a detached signature, in which case -the signed stuff is expected in a file without the -"\&.sig" or "\&.asc" extension (if such a file does -not exist it is expected at stdin; use a single dash ("-") as -filename to force a read from stdin)\&. With more than -1 argument, the first should be a detached signature -and the remaining files are the signed stuff\&. -.IP "--list-keys [\fBnames\fR]" 10 -.IP "--list-public-keys [\fBnames\fR]" 10 -List all keys from the public keyrings, or just the -ones given on the command line\&. -.IP "--list-secret-keys [\fBnames\fR]" 10 -List all keys from the secret keyrings, or just the -ones given on the command line\&. -.IP "--list-sigs [\fBnames\fR]" 10 -Same as --list-keys, but the signatures are listed too\&. -.IP "--check-sigs [\fBnames\fR]" 10 -Same as --list-sigs, but the signatures are verified\&. -.IP "--fingerprint [\fBnames\fR]" 10 -List all keys with their fingerprints\&. This is the -same output as --list-keys but with the additional output -of a line with the fingerprint\&. May also be combined -with --list-sigs or --check-sigs\&. -If this command is given twice, the fingerprints of all -secondary keys are listed too\&. -.IP "--list-packets" 10 -List only the sequence of packets\&. This is mainly -useful for debugging\&. -.IP "--gen-key" 10 -Generate a new key pair\&. This command can only be -used interactive\&. -.IP "--edit-key \fBname\fR" 10 -Present a menu which enables you to do all key -related tasks: -.RS -.IP "sign" 10 -Make a signature on key of user \fBname\fR If the key is not yet signed by the default -user (or the users given with -u), the -program displays the information of the key -again, together with its fingerprint and -asks whether it should be signed\&. This -question is repeated for all users specified -with -u\&. -.IP "lsign" 10 -Same as --sign but the signature is marked as -non-exportbale and will therefore never be used -by others\&. This may be used to make keys valid -only in the local environment\&. -.IP "revsig" 10 -Revoke a signature\&. GnuPG asks for every -every signature which has been done by one of -the secret keys, whether a revocation -certificate should be generated\&. -.IP "trust" 10 -Change the owner trust value\&. This updates the -trust-db immediately and no save is required\&. -.IP "disable" 10 -.IP "enable" 10 -Disable or enable an entire key\&. A disabled key can normally not be used -for encryption\&. -.IP "adduid" 10 -Create an alternate user id\&. -.IP "deluid" 10 -Delete an user id\&. -.IP "addkey" 10 -Add a subkey to this key\&. -.IP "delkey" 10 -Remove a subkey\&. -.IP "revkey" 10 -Revoke a subkey\&. -.IP "expire" 10 -Change the key expiration time\&. If a key is -selected, the time of this key will be changed\&. -With no selection the key expiration of the -primary key is changed\&. -.IP "passwd" 10 -Change the passphrase of the secret key\&. -.IP "uid \fBn\fR" 10 -Toggle selection of user id with index \fBn\fR\&. -Use 0 to deselect all\&. -.IP "key \fBn\fR" 10 -Toggle selection of subkey with index \fBn\fR\&. -Use 0 to deselect all\&. -.IP "check" 10 -Check all selected user ids\&. -.IP "pref" 10 -List preferences\&. -.IP "toggle" 10 -Toggle between public and secret key listing\&. -.IP "save" 10 -Save all changes to the key rings and quit\&. -.IP "quit" 10 -Quit the program without updating the -key rings\&. -.RE -.IP "" 10 -The listing shows you the key with its secondary -keys and all user ids\&. Selected keys or user ids -are indicated by an asterisk\&. The trust value is -displayed with the primary key: the first is the -assigned owner trust and the second is the calculated -trust value\&. Letters are used for the values: -.RS -.IP "-" 10 -No ownertrust assigned / not yet calculated\&. -.IP "e" 10 -Trust calculation has failed\&. -.IP "q" 10 -Not enough information for calculation\&. -.IP "n" 10 -Never trust this key\&. -.IP "m" 10 -Marginally trusted\&. -.IP "f" 10 -Fully trusted\&. -.IP "u" 10 -Ultimately trusted\&. -.RE -.IP "--delete-key \fBname\fR" 10 -Remove key from the public keyring -.IP "--delete-secret-key \fBname\fR" 10 -Remove key from the secret and public keyring -.IP "--gen-revoke" 10 -Generate a revocation certificate for the complete key\&. To revoke -a subkey or a signature, use the --edit command\&. -.IP "--export [\fBnames\fR]" 10 -Either export all keys from all keyrings (default -keyrings and those registered via option --keyring), -or if at least one name is given, those of the given -name\&. The new keyring is written to stdout or to -the file given with option "output"\&. Use together -with --armor to mail those keys\&. -.IP "--send-keys [\fBnames\fR]" 10 -Same as --export but sends the keys to a keyserver\&. -Option --keyserver must be used to give the name -of this keyserver\&. Don\&'t send your complete keyring -to a keyserver - select only those keys which are new -or changed by you\&. -.IP "--export-all [\fBnames\fR]" 10 -Same as --export, but does also export keys which -are not compatible to OpenPGP\&. -.IP "--export-secret-keys [\fBnames\fR]" 10 -Same as --export, but does export the secret keys\&. -This is normally not very useful and a security risk\&. -.IP "--import [\fBfiles\fR]" 10 -.IP "--fast-import [\fBfiles\fR]" 10 -Import/merge keys\&. The fast version does not build -the trustdb; this can be done at any time with the -command --update-trustdb\&. -.IP "--recv-keys \fBkey IDs\fR" 10 -Import the keys with the given key IDs from a HKP -keyserver\&. Option --keyserver must be used to -give the name of this keyserver\&. -.IP "--export-ownertrust" 10 -List the assigned ownertrust values in ASCII format -for backup purposes -.IP "--import-ownertrust [\fBfiles\fR]" 10 -Update the trustdb with the ownertrust values stored -in \fBfiles\fR (or stdin if not given); existing -values will be overwritten\&. -.IP "--version" 10 -Print version information along with a list -of supported algorithms\&. -.IP "--warranty" 10 -Print warranty information\&. -.IP "-h, --help" 10 -Print usage information\&. This is a really long list even it does list -not all options\&. -.SH "OPTIONS" -.PP -Long options can be put in an options file (default "~/\&.gnupg/options")\&. -Do not write the 2 dashes, but simply the name of the option and any -required arguments\&. Lines with a hash as the first non-white-space -character are ignored\&. Commands may be put in this file too, but that -does not make sense\&. -.PP -\fBgpg\fP recognizes these options: -.IP "-a, --armor" 10 -Create ASCII armored output\&. -.IP "-o, --output \fBfile\fR" 10 -Write output to \fBfile\fR\&. -.IP "-u, --local-user \fBname\fR" 10 -Use \fBname\fR as the user ID to sign\&. -This option is silently ignored for the list commands, -so that it can be used in an options file\&. -.IP "--default-key \fBname\fR" 10 -Use \fBname\fR as default user ID for signatures\&. If this -is not used the default user ID is the first user ID -found in the secret keyring\&. -.IP "-r, --recipient \fBname\fR" 10 -.IP "" 10 -Encrypt for user id \fBname\fR\&. If this option is not -specified, GnuPG asks for the user id\&. -.IP "--encrypt-to \fBname\fR" 10 -Same as --recipient but this one is intended for -in the options file and may be used together with -an own user-id as an "encrypt-to-self"\&. These keys -are only used when there are other recipients given -either by use of --recipient or by the asked user id\&. -No trust checking is performed for these user ids and -even disabled keys can be used\&. -.IP "--no-encrypt-to" 10 -Disable the use of all --encrypt-to keys\&. -.IP "-v, --verbose" 10 -Give more information during processing\&. If used -twice, the input data is listed in detail\&. -.IP "-q, --quiet" 10 -Try to be as quiet as possible\&. -.IP "-z \fBn\fR" 10 -Set compression level to \fBn\fR\&. A value of 0 for \fBn\fR disables compression\&. Default is to use the default -compression level of zlib (normally 6)\&. -.IP "-t, --textmode" 10 -Use canonical text mode\&. If -t (but not ---textmode) is used together with armoring -and signing, this enables clearsigned messages\&. -This kludge is needed for PGP compatibility; -normally you would use --sign or --clearsign -to selected the type of the signature\&. -.IP "-n, --dry-run" 10 -Don\&'t make any changes (this is not completely implemented)\&. -.IP "-i, --interactive" 10 -Prompt before overwriting any files\&. -.IP "--batch" 10 -Use batch mode\&. Never ask, do not allow interactive -commands\&. -.IP "--no-batch" 10 -Disable batch mode\&. This may be of use if --batch -is enabled from an options file\&. -.IP "--yes" 10 -Assume "yes" on most questions\&. -.IP "--no" 10 - Assume "no" on most questions\&. -.IP "--keyserver \fBname\fR" 10 -Use \fBname\fR to lookup keys which are not yet in -your keyring\&. This is only done while verifying -messages with signatures\&. The option is also -required for the command --send-keys to -specify the keyserver to where the keys should -be send\&. All keyservers synchronize with each -other - so there is no need to send keys to more -than one server\&. Using the command -"host -l pgp\&.net | grep wwwkeys" gives you a -list of keyservers\&. Because there is load -balancing using round-robin DNS you may notice -that you get different key servers\&. -.IP "--keyring \fBfile\fR" 10 -Add \fBfile\fR to the list of keyrings\&. -If \fBfile\fR begins with a tilde and a slash, these -are replaced by the HOME directory\&. If the filename -does not contain a slash, it is assumed to be in the -home-directory ("~/\&.gnupg" if --homedir is not used)\&. -The filename may be prefixed with a scheme: -.IP "" 10 -"gnupg-ring:" is the default one\&. -.IP "" 10 -"gnupg-gdbm:" may be used for a GDBM ring\&. -.IP "" 10 -It might make sense to use it together with --no-default-keyring\&. -.IP "--secret-keyring \fBfile\fR" 10 -Same as --keyring but for the secret keyrings\&. -.IP "--homedir \fBdirectory\fR" 10 -Set the name of the home directory to \fBdirectory\fR If this -option is not used it defaults to "~/\&.gnupg"\&. It does -not make sense to use this in a options file\&. This -also overrides the environment variable "GNUPGHOME"\&. -.IP "--charset \fBname\fR" 10 -Set the name of the native character set\&. This is used -to convert some strings to proper UTF-8 encoding\&. -Valid values for \fBname\fR are: -.RS -.IP "iso-8859-1" 10 -This is the default Latin 1 set\&. -.IP "iso-8859-2" 10 -The Latin 2 set\&. -.IP "koi8-r" 10 -The usual Russian set (rfc1489)\&. -.RE -.IP "--utf8-strings" 10 -.IP "--no-utf8-strings" 10 -Assume that the arguments are already given as UTF8 strings\&. The default -(--no-utf8-strings) -is to assume that arguments are encoded in the character set as specified -by --charset\&. These options effects all following arguments\&. Both options may -used multiple times\&. -.IP "--options \fBfile\fR" 10 -Read options from \fBfile\fR and do not try to read -them from the default options file in the homedir -(see --homedir)\&. This option is ignored if used -in an options file\&. -.IP "--no-options" 10 -Shortcut for "--options /dev/null"\&. This option is -detected before an attempt to open an option file\&. -.IP "--load-extension \fBname\fR" 10 -Load an extension module\&. If \fBname\fR does not -contain a slash it is searched in "/usr/local/lib/gnupg" -See the manual for more information about extensions\&. -.IP "--debug \fBflags\fR" 10 -Set debugging flags\&. All flags are or-ed and \fBflags\fR may -be given in C syntax (e\&.g\&. 0x0042)\&. -.IP "--debug-all" 10 - Set all useful debugging flags\&. -.IP "--status-fd \fBn\fR" 10 -Write special status strings to the file descriptor \fBn\fR\&. -See the file DETAILS in the documentation for a listing of them\&. -.IP "--logger-fd \fBn\fR" 10 -Write log output to file descriptor \fBn\fR and not to stderr\&. -.IP "--no-comment" 10 -Do not write comment packets\&. This option affects only -the generation of secret keys\&. Output of option packets -is disabled since version 0\&.4\&.2\&. -.IP "--comment \fBstring\fR" 10 -Use \fBstring\fR as comment string in clear text signatures\&. -.IP "--default-comment" 10 -Force to write the standard comment string in clear -text signatures\&. Use this to overwrite a --comment -from a config file\&. -.IP "--no-version" 10 -Omit the version string in clear text signatures\&. -.IP "--emit-version" 10 -Force to write the version string in clear text -signatures\&. Use this to overwrite a previous ---no-version from a config file\&. -.IP "-N, --notation-data \fBname=value\fR" 10 -Put the name value pair into the signature as notation data\&. -\fBname\fR must consists only of alphanumeric characters, digits -or the underscore; the first character must not be a digit\&. -\fBvalue\fR may be any printable string; it will encoded in UTF8, -so sou should have check that your --charset is set right\&. -If you prefix \fBname\fR with an exclamation mark, the notation -data will be flagged as critical (rfc2440:5\&.2\&.3\&.15)\&. -.IP "--set-policy-url \fBstring\fR" 10 -Use \fBstring\fR as Policy URL for signatures (rfc2440:5\&.2\&.3\&.19)\&. -If you prefix it with an exclamation mark, the policy URL -packet will be flagged as critical\&. -.IP "--set-filename \fBstring\fR" 10 -Use \fBstring\fR as the name of file which is stored in -messages\&. -.IP "--completes-needed \fBn\fR" 10 -Number of completely trusted users to introduce a new -key signer (defaults to 1)\&. -.IP "--marginals-needed \fBn\fR" 10 -Number of marginally trusted users to introduce a new -key signer (defaults to 3) -.IP "--max-cert-depth \fBn\fR" 10 -Maximum depth of a certification chain (default is 5)\&. -.IP "--cipher-algo \fBname\fR" 10 -Use \fBname\fR as cipher algorithm\&. Running the program -with the command --version yields a list of supported -algorithms\&. If this is not used the cipher algorithm is -selected from the preferences stored with the key\&. -.IP "--digest-algo \fBname\fR" 10 -Use \fBname\fR as message digest algorithm\&. Running the -program with the command --version yields a list of -supported algorithms\&. Please note that using this -option may violate the OpenPGP requirement, that a -160 bit hash is to be used for DSA\&. -.IP "--s2k-cipher-algo \fBname\fR" 10 -Use \fBname\fR as the cipher algorithm used to protect secret -keys\&. The default cipher is BLOWFISH\&. This cipher is -also used for conventional encryption if --cipher-algo -is not given\&. -.IP "--s2k-digest-algo \fBname\fR" 10 -Use \fBname\fR as the digest algorithm used to mangle the -passphrases\&. The default algorithm is RIPE-MD-160\&. -This digest algorithm is also used for conventional -encryption if --digest-algo is not given\&. -.IP "--s2k-mode \fBn\fR" 10 -Selects how passphrases are mangled\&. If \fBn\fR is 0 -a plain passphrase (which is not recommended) will be used, -a 1 (default) adds a salt to the passphrase and -a 3 iterates the whole process a couple of times\&. -Unless --rfc1991 is used, this mode is also used -for conventional encryption\&. -.IP "--compress-algo \fBn\fR" 10 -Use compress algorithm \fBn\fR\&. Default is 2 which is -RFC1950 compression\&. You may use 1 to use the old zlib -version which is used by PGP\&. The default algorithm may -give better results because the window size is not limited -to 8K\&. If this is not used the OpenPGP behavior is used, -i\&.e\&. the compression algorithm is selected from the -preferences; note, that this can\&'t be done if you do -not encrypt the data\&. -.IP "--throw-keyid" 10 -Do not put the keyid into encrypted packets\&. This option -hides the receiver of the message and is a countermeasure -against traffic analysis\&. It may slow down the decryption -process because all available secret keys are tried\&. -.IP "--not-dash-escaped" 10 -This option changes the behavior of cleartext signatures -so that they can be used for patch files\&. You should not -send such an armored file via email because all spaces -and line endings are hashed too\&. You can not use this -option for data which has 5 dashes at the beginning of a -line, patch files don\&'t have this\&. A special armor header -line tells GnuPG about this cleartext signature option\&. -.IP "--escape-from-lines" 10 -Because some mailers change lines starting with "From " -to " + +--sign-key &ParmName; + +Sign a public key with you secret key. This is a shortcut version +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. + --delete-key &ParmName; @@ -452,6 +465,34 @@ +--print-md algo &OptParmFiles; + +Print message digest og algorithm ALGO for all given files of stdin. +If "*" is used for the algorithm, digests for all available algorithms +are printed. + + + + +--gen-random 0|1|2 + count + +Emit COUNT random bytes of the given quality level. If count is not given +or zero, an endless sequenece of random bytes will be emitted. +PLEASE, don't use this command unless you know waht you are doing, it may +remove precious entropy from the system! + + + +--gen-prime mode + bits + qbits + +Use the source, Luke :-). The output format is still subject to change. + + + + --version Print version information along with a list @@ -531,9 +572,30 @@ Encrypt for user id &ParmName;. If this option is not -specified, GnuPG asks for the user id. +specified, GnuPG asks for the user-id unless --default-recipient is given + + + +--default-recipient &ParmName; + +Use &ParmName; as default recipient if option --recipient is not used and +don't ask if this is a valid one. &ParmName; must be a non empty. + +--default-recipient-self + +Use the default key as default recipient if option --recipient is not used and +don't ask if this is a valid one. The default key is the first one from the +secret keyring or the one set with --default-key. + + + + +--no-default-recipient + +Reset --default-recipient and --default-recipient-self. + --encrypt-to &ParmName; diff -urN gnupg-0.9.8a/g10/ChangeLog gnupg-0.9.8b/g10/ChangeLog --- gnupg-0.9.8a/g10/ChangeLog Mon Jul 12 14:55:39 1999 +++ gnupg-0.9.8b/g10/ChangeLog Tue Jul 13 17:39:29 1999 @@ -1,3 +1,22 @@ +Tue Jul 13 17:39:25 CEST 1999 Werner Koch + + + * pkclist.c (do_edit_ownertrust): Changed the way help works. + (build_pk_list): Implemented default recipient stuff. + * g10.c: New options --default-recipient[-self] + (main): Suppress greeting in most cases, entering a passphrase or + a missing value is not considered to be interactive use. + Merged --print-md and --print-mds; the latter is now obsolete. + Changed the way --gen-random works and documented it. + Changed the way --gen-prime works and add a man entry. + * g10.c (MAINTAINER_OPTIONS): Removed. + +Mon Jul 12 18:45:57 CEST 1999 Werner Koch + + + * keyedit.c (keyedit_menu): Add arg sign_mode and changed callers + * g10.c (main): New command --lsign-key. + Mon Jul 12 14:55:34 CEST 1999 Werner Koch diff -urN gnupg-0.9.8a/g10/OPTIONS gnupg-0.9.8b/g10/OPTIONS --- gnupg-0.9.8a/g10/OPTIONS Sun Oct 18 11:59:07 1998 +++ gnupg-0.9.8b/g10/OPTIONS Tue Jul 13 10:38:01 1999 @@ -19,13 +19,6 @@ #----------------------------------------------- # With some exceptions, these cannot be combined -print-md algo -# print the message digest of algorithm ALGO for stdin or all -# given filenames - -print-mds -# print all message digests of all give filenames - store # simply packs the input data into a rfc1991 packet format diff -urN gnupg-0.9.8a/g10/g10.c gnupg-0.9.8b/g10/g10.c --- gnupg-0.9.8a/g10/g10.c Mon Jul 12 14:47:31 1999 +++ gnupg-0.9.8b/g10/g10.c Wed Jul 14 09:37:00 1999 @@ -26,7 +26,6 @@ #include #include -#define MAINTAINER_OPTIONS #include "packet.h" #include "iobuf.h" @@ -70,6 +69,7 @@ aKeygen, aSignEncr, aSignKey, + aLSignKey, aListPackets, aEditKey, aDeleteKey, @@ -111,6 +111,9 @@ oKeyring, oSecretKeyring, oDefaultKey, + oDefRecipient, + oDefRecipientSelf, + oNoDefRecipient, oOptions, oDebug, oDebugAll, @@ -190,9 +193,11 @@ { aCheckKeys, "check-sigs",256, N_("check key signatures")}, { oFingerprint, "fingerprint", 256, N_("list keys and fingerprints")}, { aListSecretKeys, "list-secret-keys", 256, N_("list secret keys")}, - { aKeygen, "gen-key", 256, N_("generate a new key pair")}, + { aKeygen, "gen-key", 256, N_("generate a new key pair")}, { aDeleteKey, "delete-key",256, N_("remove key from the public keyring")}, - { aEditKey, "edit-key" ,256, N_("sign or edit a key")}, + { aSignKey, "sign-key" ,256, N_("sign a key")}, + { aLSignKey, "lsign-key" ,256, N_("sign a key locally")}, + { aEditKey, "edit-key" ,256, N_("sign or edit a key")}, { aGenRevoke, "gen-revoke",256, N_("generate a revocation certificate")}, { aExport, "export" , 256, N_("export keys") }, { aSendKeys, "send-keys" , 256, N_("export keys to a key server") }, @@ -207,24 +212,26 @@ { aImportOwnerTrust, "import-ownertrust", 256 , N_("import ownertrust values")}, { aUpdateTrustDB, - "update-trustdb",0 , N_("|[NAMES]|update the trust database")}, + "update-trustdb",0 , N_("update the trust database")}, { aCheckTrustDB, "check-trustdb",0 , N_("|[NAMES]|check the trust database")}, { aFixTrustDB, "fix-trustdb",0 , N_("fix a corrupted trust database")}, { aDeArmor, "dearmor", 256, N_("De-Armor a file or stdin") }, { aEnArmor, "enarmor", 256, N_("En-Armor a file or stdin") }, { aPrintMD, "print-md" , 256, N_("|algo [files]|print message digests")}, - { aPrintMDs, "print-mds" , 256, N_("print all message digests")}, - #ifdef MAINTAINER_OPTIONS { aPrimegen, "gen-prime" , 256, "@" }, { aGenRandom, "gen-random" , 256, "@" }, - #endif { 301, NULL, 0, N_("@\nOptions:\n ") }, { oArmor, "armor", 0, N_("create ascii armored output")}, { oRecipient, "recipient", 2, N_("|NAME|encrypt for NAME")}, { oRecipient, "remote-user", 2, "@"}, /* old option name */ + { oDefRecipient, "default-recipient" ,2, + N_("|NAME|use NAME as default recipient")}, + { oDefRecipientSelf, "default-recipient-self" ,0, + N_("use the default key as default recipient")}, + { oNoDefRecipient, "no-default-recipient", 0, "@" }, { oEncryptTo, "encrypt-to", 2, "@" }, { oNoEncryptTo, "no-encrypt-to", 0, "@" }, { oUser, "local-user",2, N_("use this user-id to sign or decrypt")}, @@ -279,11 +286,11 @@ /* hidden options */ { aExportOwnerTrust, "list-ownertrust",0 , "@"}, /* alias */ + { aPrintMDs, "print-mds" , 256, "@"}, /* old */ { aListTrustDB, "list-trustdb",0 , "@"}, { aListTrustPath, "list-trust-path",0, "@"}, { oKOption, NULL, 0, "@"}, { oPasswdFD, "passphrase-fd",1, "@" }, - { aSignKey, "sign-key" ,256, "@" }, /* alias for edit-key */ { aDeleteSecretKey, "delete-secret-key",0, "@" }, { oQuickRandom, "quick-random", 0, "@"}, { oNoVerbose, "no-verbose", 0, "@"}, @@ -518,7 +525,7 @@ int parse_debug = 0; int default_config =1; int default_keyring = 1; - int greeting = 1; + int greeting = 0; enum cmd_and_opt_values cmd = 0; const char *trustdb_name = NULL; char *def_cipher_string = NULL; @@ -652,25 +659,25 @@ case aListKeys: set_cmd( &cmd, aListKeys); break; case aListSigs: set_cmd( &cmd, aListSigs); break; case aExportSecret: set_cmd( &cmd, aExportSecret); break; - case aDeleteSecretKey: set_cmd( &cmd, aDeleteSecretKey); break; - case aDeleteKey: set_cmd( &cmd, aDeleteKey); break; + case aDeleteSecretKey: set_cmd( &cmd, aDeleteSecretKey); + greeting=1; break; + case aDeleteKey: set_cmd( &cmd, aDeleteKey); greeting=1; break; case aDetachedSign: detached_sig = 1; set_cmd( &cmd, aSign ); break; case aSym: set_cmd( &cmd, aSym); break; case aDecrypt: set_cmd( &cmd, aDecrypt); break; case aEncr: set_cmd( &cmd, aEncr); break; case aSign: set_cmd( &cmd, aSign ); break; - case aKeygen: set_cmd( &cmd, aKeygen); break; + case aKeygen: set_cmd( &cmd, aKeygen); greeting=1; break; case aSignKey: set_cmd( &cmd, aSignKey); break; + case aLSignKey: set_cmd( &cmd, aLSignKey); break; case aStore: set_cmd( &cmd, aStore); break; - case aEditKey: set_cmd( &cmd, aEditKey); break; + case aEditKey: set_cmd( &cmd, aEditKey); greeting=1; break; case aClearsign: set_cmd( &cmd, aClearsign); break; case aGenRevoke: set_cmd( &cmd, aGenRevoke); break; case aVerify: set_cmd( &cmd, aVerify); break; - #ifdef MAINTAINER_OPTIONS case aPrimegen: set_cmd( &cmd, aPrimegen); break; case aGenRandom: set_cmd( &cmd, aGenRandom); break; - #endif case aPrintMD: set_cmd( &cmd, aPrintMD); break; case aPrintMDs: set_cmd( &cmd, aPrintMDs); break; case aListTrustDB: set_cmd( &cmd, aListTrustDB); break; @@ -678,8 +685,8 @@ case aUpdateTrustDB: set_cmd( &cmd, aUpdateTrustDB); break; case aFixTrustDB: set_cmd( &cmd, aFixTrustDB); break; case aListTrustPath: set_cmd( &cmd, aListTrustPath); break; - case aDeArmor: set_cmd( &cmd, aDeArmor); greeting = 0; break; - case aEnArmor: set_cmd( &cmd, aEnArmor); greeting = 0; break; + case aDeArmor: set_cmd( &cmd, aDeArmor); break; + case aEnArmor: set_cmd( &cmd, aEnArmor); break; case aExportOwnerTrust: set_cmd( &cmd, aExportOwnerTrust); break; case aImportOwnerTrust: set_cmd( &cmd, aImportOwnerTrust); break; @@ -727,6 +734,18 @@ case oMaxCertDepth: opt.max_cert_depth = pargs.r.ret_int; break; case oTrustDBName: trustdb_name = pargs.r.ret_str; break; case oDefaultKey: opt.def_secret_key = pargs.r.ret_str; break; + case oDefRecipient: + if( *pargs.r.ret_str ) + opt.def_recipient = make_username(pargs.r.ret_str); + break; + case oDefRecipientSelf: + m_free(opt.def_recipient); opt.def_recipient = NULL; + opt.def_recipient_self = 1; + break; + case oNoDefRecipient: + m_free(opt.def_recipient); opt.def_recipient = NULL; + opt.def_recipient_self = 0; + break; case oNoOptions: break; /* no-options */ case oHomedir: opt.homedir = pargs.r.ret_str; break; case oNoBatch: opt.batch = 0; break; @@ -831,10 +850,11 @@ fprintf(stderr, "%s %s; %s\n", strusage(11), strusage(13), strusage(14) ); fprintf(stderr, "%s\n", strusage(15) ); - #ifdef IS_DEVELOPMENT_VERSION - log_info("NOTE: this is a development version!\n"); - #endif } + #ifdef IS_DEVELOPMENT_VERSION + if( !opt.batch ) + log_info("NOTE: this is a development version!\n"); + #endif if( opt.batch ) tty_batchmode( 1 ); @@ -1044,26 +1064,43 @@ case aSignKey: /* sign the key given as argument */ + if( argc != 1 ) + wrong_args(_("--sign-key user-id")); + username = make_username( fname ); + keyedit_menu(fname, locusr, NULL, 1 ); + m_free(username); + break; + + case aLSignKey: + if( argc != 1 ) + wrong_args(_("--lsign-key user-id")); + username = make_username( fname ); + keyedit_menu(fname, locusr, NULL, 2 ); + m_free(username); + break; + case aEditKey: /* Edit a key signature */ if( !argc ) - wrong_args(_("--edit-key username [commands]")); + wrong_args(_("--edit-key user-id [commands]")); + username = make_username( fname ); if( argc > 1 ) { sl = NULL; for( argc--, argv++ ; argc; argc--, argv++ ) - append_to_strlist2( &sl, *argv, utf8_strings ); - keyedit_menu( fname, locusr, sl ); + append_to_strlist( &sl, *argv ); + keyedit_menu( username, locusr, sl, 0 ); free_strlist(sl); } else - keyedit_menu(fname, locusr, NULL ); + keyedit_menu(username, locusr, NULL, 0 ); + m_free(username); break; case aDeleteSecretKey: if( argc != 1 ) - wrong_args(_("--delete-secret-key username")); + wrong_args(_("--delete-secret-key user-id")); case aDeleteKey: if( argc != 1 ) - wrong_args(_("--delete-key username")); + wrong_args(_("--delete-key user-id")); username = make_username( fname ); if( (rc = delete_key(username, cmd==aDeleteSecretKey)) ) log_error("%s: delete key failed: %s\n", username, g10_errstr(rc) ); @@ -1171,68 +1208,70 @@ break; - #ifdef MAINTAINER_OPTIONS case aPrimegen: - if( argc == 1 ) { - mpi_print( stdout, generate_public_prime( atoi(argv[0]) ), 1); - putchar('\n'); - } - else if( argc == 2 ) { - mpi_print( stdout, generate_elg_prime( 0, atoi(argv[0]), - atoi(argv[1]), NULL,NULL ), 1); - putchar('\n'); - } - else if( argc == 3 ) { - MPI g = mpi_alloc(1); - mpi_print( stdout, generate_elg_prime( 0, atoi(argv[0]), - atoi(argv[1]), g, NULL ), 1); - printf("\nGenerator: "); - mpi_print( stdout, g, 1 ); - putchar('\n'); - mpi_free(g); - } - else if( argc == 4 ) { - mpi_print( stdout, generate_elg_prime( 1, atoi(argv[0]), - atoi(argv[1]), NULL,NULL ), 1); + { int mode = argc < 2 ? 0 : atoi(*argv); + + if( mode == 1 && argc == 2 ) { + mpi_print( stdout, generate_public_prime( atoi(argv[1]) ), 1); + } + else if( mode == 2 && argc == 3 ) { + mpi_print( stdout, generate_elg_prime( + 0, atoi(argv[1]), + atoi(argv[2]), NULL,NULL ), 1); + } + else if( mode == 3 && argc == 3 ) { + MPI *factors; + mpi_print( stdout, generate_elg_prime( + 1, atoi(argv[1]), + atoi(argv[2]), NULL,&factors ), 1); + putchar('\n'); + mpi_print( stdout, factors[0], 1 ); /* print q */ + } + else if( mode == 4 && argc == 3 ) { + MPI g = mpi_alloc(1); + mpi_print( stdout, generate_elg_prime( + 0, atoi(argv[1]), + atoi(argv[2]), g, NULL ), 1); + putchar('\n'); + mpi_print( stdout, g, 1 ); + mpi_free(g); + } + else + wrong_args("--gen-prime mode bits [qbits] "); putchar('\n'); } - else - usage(1); break; - #endif /* MAINTAINER OPTIONS */ - #ifdef MAINTAINER_OPTIONS case aGenRandom: - if( argc < 1 || argc > 2 ) - wrong_args("--gen-random level [hex]"); { - int c; - int level = atoi(*argv); - for(;;) { + int level = argc ? atoi(*argv):0; + int count = argc > 1 ? atoi(argv[1]): 0; + int endless = !count; + + if( argc < 1 || argc > 2 || level < 0 || level > 2 || count < 0 ) + wrong_args("--gen-random 0|1|2 [count]"); + + while( endless || count ) { byte *p; - if( argc == 2 ) { - p = get_random_bits( 8, level, 0); - printf("%02x", *p ); - fflush(stdout); - } - else { - p = get_random_bits( 800, level, 0); - for(c=0; c < 100; c++ ) - putchar( p[c] ); - } + size_t n = !endless && count < 100? count : 100; + + p = get_random_bits( n*8, level, 0); + fwrite( p, n, 1, stdout ); m_free(p); + if( !endless ) + count -= n; } } break; - #endif /* MAINTAINER OPTIONS */ case aPrintMD: if( argc < 1) - wrong_args("--print-md algo [file]"); - else { - int algo = string_to_digest_algo(*argv); + wrong_args("--print-md algo [files]"); + { + int all_algos = (**argv=='*' && !(*argv)[1]); + int algo = all_algos? 0 : string_to_digest_algo(*argv); - if( !algo ) + if( !algo && !all_algos ) log_error(_("invalid hash algorithm `%s'\n"), *argv ); else { argc--; argv++; @@ -1246,7 +1285,7 @@ } break; - case aPrintMDs: + case aPrintMDs: /* old option */ if( !argc ) print_mds(NULL,0); else { @@ -1290,7 +1329,7 @@ case aListTrustPath: if( !argc ) - wrong_args("--list-trust-path "); + wrong_args("--list-trust-path "); for( ; argc; argc--, argv++ ) { username = make_username( *argv ); list_trust_path( username ); diff -urN gnupg-0.9.8a/g10/import.c gnupg-0.9.8b/g10/import.c --- gnupg-0.9.8a/g10/import.c Thu Jul 1 11:22:35 1999 +++ gnupg-0.9.8b/g10/import.c Wed Jul 14 10:15:39 1999 @@ -34,6 +34,7 @@ #include "trustdb.h" #include "main.h" #include "i18n.h" +#include "status.h" static struct { @@ -199,6 +200,24 @@ log_info(_(" secret keys unchanged: %lu\n"), stats.secret_dups ); } + if( is_status_enabled() ) { + char buf[12*16]; + sprintf(buf, "%lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", + count, + stats.no_user_id, + stats.imported, + stats.imported_rsa, + stats.unchanged, + stats.n_uids, + stats.n_subk, + stats.n_sigs, + stats.n_revoc, + stats.secret_read, + stats.secret_imported, + stats.secret_dups); + write_status_text( STATUS_IMPORT_RES, buf ); + } + return rc; } @@ -385,6 +404,11 @@ /* we are ready */ if( !opt.quiet ) log_info( _("key %08lX: public key imported\n"), (ulong)keyid[1]); + if( is_status_enabled() ) { + char *us = get_long_user_id_string( keyid ); + write_status_text( STATUS_IMPORTED, us ); + m_free(us); + } stats.imported++; if( is_RSA( pk->pubkey_algo ) ) stats.imported_rsa++; diff -urN gnupg-0.9.8a/g10/keyedit.c gnupg-0.9.8b/g10/keyedit.c --- gnupg-0.9.8a/g10/keyedit.c Tue Jul 6 13:59:27 1999 +++ gnupg-0.9.8b/g10/keyedit.c Mon Jul 12 18:28:21 1999 @@ -538,13 +538,15 @@ } /**************** - * Menu driven key editor + * Menu driven key editor. If sign_mode is true semi-automatical signing + * will be performed. commands are ignore in this case * * Note: to keep track of some selection we use node->mark MARKBIT_xxxx. */ void -keyedit_menu( const char *username, STRLIST locusr, STRLIST commands ) +keyedit_menu( const char *username, STRLIST locusr, STRLIST commands, + int sign_mode ) { enum cmdids { cmdNONE = 0, cmdQUIT, cmdHELP, cmdFPR, cmdLIST, cmdSELUID, cmdCHECK, cmdSIGN, @@ -552,44 +554,45 @@ cmdDEBUG, cmdSAVE, cmdADDUID, cmdDELUID, cmdADDKEY, cmdDELKEY, cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF, cmdEXPIRE, cmdENABLEKEY, cmdDISABLEKEY, - cmdNOP }; + cmdINVCMD, cmdNOP }; static struct { const char *name; enum cmdids id; int need_sk; + int signmode; const char *desc; } cmds[] = { - { N_("quit") , cmdQUIT , 0, N_("quit this menu") }, - { N_("q") , cmdQUIT , 0, NULL }, - { N_("save") , cmdSAVE , 0, N_("save and quit") }, - { N_("help") , cmdHELP , 0, N_("show this help") }, - { "?" , cmdHELP , 0, NULL }, - { N_("fpr") , cmdFPR , 0, N_("show fingerprint") }, - { N_("list") , cmdLIST , 0, N_("list key and user ids") }, - { N_("l") , cmdLIST , 0, NULL }, - { N_("uid") , cmdSELUID , 0, N_("select user id N") }, - { N_("key") , cmdSELKEY , 0, N_("select secondary key N") }, - { N_("check") , cmdCHECK , 0, N_("list signatures") }, - { N_("c") , cmdCHECK , 0, NULL }, - { N_("sign") , cmdSIGN , 0, N_("sign the key") }, - { N_("s") , cmdSIGN , 0, NULL }, - { N_("lsign") , cmdLSIGN , 0, N_("sign the key locally") }, - { N_("debug") , cmdDEBUG , 0, NULL }, - { N_("adduid") , cmdADDUID , 1, N_("add a user id") }, - { N_("deluid") , cmdDELUID , 0, N_("delete user id") }, - { N_("addkey") , cmdADDKEY , 1, N_("add a secondary key") }, - { N_("delkey") , cmdDELKEY , 0, N_("delete a secondary key") }, - { N_("delsig") , cmdDELSIG , 0, N_("delete signatures") }, - { N_("expire") , cmdEXPIRE , 1, N_("change the expire date") }, - { N_("toggle") , cmdTOGGLE , 1, N_("toggle between secret " - "and public key listing") }, - { N_("t" ) , cmdTOGGLE , 1, NULL }, - { N_("pref") , cmdPREF , 0, N_("list preferences") }, - { N_("passwd") , cmdPASSWD , 1, N_("change the passphrase") }, - { N_("trust") , cmdTRUST , 0, N_("change the ownertrust") }, - { N_("revsig") , cmdREVSIG , 0, N_("revoke signatures") }, - { N_("revkey") , cmdREVKEY , 1, N_("revoke a secondary key") }, - { N_("disable") , cmdDISABLEKEY , 0, N_("disable a key") }, - { N_("enable") , cmdENABLEKEY , 0, N_("enable a key") }, + { N_("quit") , cmdQUIT , 0,1, N_("quit this menu") }, + { N_("q") , cmdQUIT , 0,1, NULL }, + { N_("save") , cmdSAVE , 0,1, N_("save and quit") }, + { N_("help") , cmdHELP , 0,1, N_("show this help") }, + { "?" , cmdHELP , 0,1, NULL }, + { N_("fpr") , cmdFPR , 0,1, N_("show fingerprint") }, + { N_("list") , cmdLIST , 0,1, N_("list key and user ids") }, + { N_("l") , cmdLIST , 0,1, NULL }, + { N_("uid") , cmdSELUID , 0,1, N_("select user id N") }, + { N_("key") , cmdSELKEY , 0,0, N_("select secondary key N") }, + { N_("check") , cmdCHECK , 0,1, N_("list signatures") }, + { N_("c") , cmdCHECK , 0,1, NULL }, + { N_("sign") , cmdSIGN , 0,1, N_("sign the key") }, + { N_("s") , cmdSIGN , 0,1, NULL }, + { N_("lsign") , cmdLSIGN , 0,1, N_("sign the key locally") }, + { N_("debug") , cmdDEBUG , 0,0, NULL }, + { N_("adduid") , cmdADDUID , 1,0, N_("add a user id") }, + { N_("deluid") , cmdDELUID , 0,0, N_("delete user id") }, + { N_("addkey") , cmdADDKEY , 1,0, N_("add a secondary key") }, + { N_("delkey") , cmdDELKEY , 0,0, N_("delete a secondary key") }, + { N_("delsig") , cmdDELSIG , 0,0, N_("delete signatures") }, + { N_("expire") , cmdEXPIRE , 1,0, N_("change the expire date") }, + { N_("toggle") , cmdTOGGLE , 1,0, N_("toggle between secret " + "and public key listing") }, + { N_("t" ) , cmdTOGGLE , 1,0, NULL }, + { N_("pref") , cmdPREF , 0,0, N_("list preferences") }, + { N_("passwd") , cmdPASSWD , 1,0, N_("change the passphrase") }, + { N_("trust") , cmdTRUST , 0,0, N_("change the ownertrust") }, + { N_("revsig") , cmdREVSIG , 0,0, N_("revoke signatures") }, + { N_("revkey") , cmdREVKEY , 1,0, N_("revoke a secondary key") }, + { N_("disable") , cmdDISABLEKEY, 0,0, N_("disable a key") }, + { N_("enable") , cmdENABLEKEY , 0,0, N_("enable a key") }, { NULL, cmdNONE } }; enum cmdids cmd = 0; @@ -612,18 +615,27 @@ goto leave; } - /* first try to locate it as secret key */ - rc = find_secret_keyblock_byname( &sec_keyblockpos, username ); - if( !rc ) { - rc = read_keyblock( &sec_keyblockpos, &sec_keyblock ); - if( rc ) { - log_error("%s: secret keyblock read problem: %s\n", - username, g10_errstr(rc)); - goto leave; + if( sign_mode ) { + commands = NULL; + append_to_strlist( &commands, sign_mode == 1? "sign":"lsign" ); + have_commands = 1; + } + + + if( !sign_mode ) { + /* first try to locate it as secret key */ + rc = find_secret_keyblock_byname( &sec_keyblockpos, username ); + if( !rc ) { + rc = read_keyblock( &sec_keyblockpos, &sec_keyblock ); + if( rc ) { + log_error("%s: secret keyblock read problem: %s\n", + username, g10_errstr(rc)); + goto leave; + } + merge_keys_and_selfsig( sec_keyblock ); + if( fix_keyblock( sec_keyblock ) ) + sec_modified++; } - merge_keys_and_selfsig( sec_keyblock ); - if( fix_keyblock( sec_keyblock ) ) - sec_modified++; } /* and now get the public key */ @@ -636,7 +648,7 @@ modified++; if( sec_keyblock ) { /* check that they match */ - /* FIXME: check that they both match */ + /* fixme: check that they both match */ tty_printf(_("Secret key is available.\n")); } @@ -689,10 +701,13 @@ arg_number = atoi(p); } - for(i=0; cmds[i].name; i++ ) + for(i=0; cmds[i].name; i++ ) { if( !stricmp( answer, cmds[i].name ) ) break; - if( cmds[i].need_sk && !sec_keyblock ) { + } + if( sign_mode && !cmds[i].signmode ) + cmd = cmdINVCMD; + else if( cmds[i].need_sk && !sec_keyblock ) { tty_printf(_("Need the secret key to do this.\n")); cmd = cmdNOP; } @@ -702,53 +717,15 @@ switch( cmd ) { case cmdHELP: for(i=0; cmds[i].name; i++ ) { - if( cmds[i].need_sk && !sec_keyblock ) + if( sign_mode && !cmds[i].signmode ) + ; + else if( cmds[i].need_sk && !sec_keyblock ) ; /* skip if we do not have the secret key */ else if( cmds[i].desc ) tty_printf("%-10s %s\n", cmds[i].name, _(cmds[i].desc) ); } break; - case cmdQUIT: - if( have_commands ) - goto leave; - if( !modified && !sec_modified ) - goto leave; - if( !cpr_get_answer_is_yes("keyedit.save.okay", - _("Save changes? ")) ) { - if( cpr_enabled() - || cpr_get_answer_is_yes("keyedit.cancel.okay", - _("Quit without saving? ")) ) - goto leave; - break; - } - /* fall thru */ - case cmdSAVE: - if( modified || sec_modified ) { - if( modified ) { - rc = update_keyblock( &keyblockpos, keyblock ); - if( rc ) { - log_error(_("update failed: %s\n"), g10_errstr(rc) ); - break; - } - } - if( sec_modified ) { - rc = update_keyblock( &sec_keyblockpos, sec_keyblock ); - if( rc ) { - log_error(_("update secret failed: %s\n"), - g10_errstr(rc) ); - break; - } - } - } - else - tty_printf(_("Key not changed so no update needed.\n")); - rc = update_trust_record( keyblock, 0, NULL ); - if( rc ) - log_error(_("update of trustdb failed: %s\n"), - g10_errstr(rc) ); - goto leave; - case cmdLIST: redisplay = 1; break; @@ -783,7 +760,9 @@ break; } } - sign_uids( keyblock, locusr, &modified, cmd == cmdLSIGN ); + if( !sign_uids( keyblock, locusr, &modified, cmd == cmdLSIGN ) + && sign_mode ) + goto do_cmd_save; break; case cmdDEBUG: @@ -944,6 +923,53 @@ } break; + case cmdQUIT: + if( have_commands ) + goto leave; + if( !modified && !sec_modified ) + goto leave; + if( !cpr_get_answer_is_yes("keyedit.save.okay", + _("Save changes? ")) ) { + if( cpr_enabled() + || cpr_get_answer_is_yes("keyedit.cancel.okay", + _("Quit without saving? ")) ) + goto leave; + break; + } + /* fall thru */ + case cmdSAVE: + do_cmd_save: + if( modified || sec_modified ) { + if( modified ) { + rc = update_keyblock( &keyblockpos, keyblock ); + if( rc ) { + log_error(_("update failed: %s\n"), g10_errstr(rc) ); + break; + } + } + if( sec_modified ) { + rc = update_keyblock( &sec_keyblockpos, sec_keyblock ); + if( rc ) { + log_error(_("update secret failed: %s\n"), + g10_errstr(rc) ); + break; + } + } + } + else + tty_printf(_("Key not changed so no update needed.\n")); + /* TODO: we should keep track whether we have changed + * something relevant to the trustdb */ + if( !modified && sign_mode ) + rc = 0; /* we can skip at least in this case */ + else + rc = update_trust_record( keyblock, 0, NULL ); + if( rc ) + log_error(_("update of trustdb failed: %s\n"), + g10_errstr(rc) ); + goto leave; + + case cmdINVCMD: default: tty_printf("\n"); tty_printf(_("Invalid command (try \"help\")\n")); diff -urN gnupg-0.9.8a/g10/main.h gnupg-0.9.8b/g10/main.h --- gnupg-0.9.8a/g10/main.h Thu Jul 1 13:11:12 1999 +++ gnupg-0.9.8b/g10/main.h Thu Jul 8 14:34:23 1999 @@ -87,7 +87,8 @@ int delete_key( const char *username, int secure ); /*-- keyedit.c --*/ -void keyedit_menu( const char *username, STRLIST locusr, STRLIST cmds ); +void keyedit_menu( const char *username, STRLIST locusr, STRLIST cmds, + int sign_mode ); /*-- keygen.c --*/ u32 ask_expiredate(void); diff -urN gnupg-0.9.8a/g10/options.h gnupg-0.9.8b/g10/options.h --- gnupg-0.9.8a/g10/options.h Wed Jun 30 10:03:27 1999 +++ gnupg-0.9.8b/g10/options.h Tue Jul 13 16:55:40 1999 @@ -50,6 +50,8 @@ int def_digest_algo; int def_compress_algo; const char *def_secret_key; + char *def_recipient; + int def_recipient_self; int no_comment; int no_version; int marginals_needed; diff -urN gnupg-0.9.8a/g10/options.skel gnupg-0.9.8b/g10/options.skel --- gnupg-0.9.8a/g10/options.skel Thu Mar 11 16:42:05 1999 +++ gnupg-0.9.8b/g10/options.skel Tue Jul 13 17:41:06 1999 @@ -1,6 +1,6 @@ These first three lines are not copied to the options file in the users home directory. -$Id: options.skel,v 1.10 1999/03/11 15:42:05 koch Exp $ +$Id: options.skel,v 1.11 1999/07/13 15:41:06 wkoch Exp $ # Options for GnuPG # # Unless you you specify which option file to use (with the @@ -22,6 +22,15 @@ # default-key 621CC013 +# If you do not pass a recipient to gpg, it will ask for one. +# Using this option you can encrypt to a default key. key validation +# will not be done in this case. +# The second form uses the default key as default recipient. + +# default-recipient some-user-id +# default-recipient-self + + # The next option is enabled because this one is needed for interoperation # with PGP 5 users. To enable full OpenPGP compliance you have to remove # this option. @@ -52,8 +61,11 @@ # every time it is needed - normally this is not needed. lock-once -# If you have configured GnuPG without a random gatherer, -# you have to uncomment one of the following lines. +# If you have configured GnuPG without a random gatherer +# (./configure --enable-static-rnd=none), you have to +# uncomment _one_ of the following lines. These +# extensions won't get used if you have a random gatherer +# compiled in (which is the default for GNU and xxxBSD systems) #load-extension rndlinux #load-extension rndunix #load-extension rndegd diff -urN gnupg-0.9.8a/g10/pkclist.c gnupg-0.9.8b/g10/pkclist.c --- gnupg-0.9.8a/g10/pkclist.c Thu Jul 1 11:23:06 1999 +++ gnupg-0.9.8b/g10/pkclist.c Tue Jul 13 17:02:06 1999 @@ -108,7 +108,7 @@ * Returns true if an ownertrust has changed. */ static int -do_edit_ownertrust( ulong lid, int mode, unsigned *new_trust ) +do_edit_ownertrust( ulong lid, int mode, unsigned *new_trust, int defer_help ) { char *p; int rc; @@ -118,6 +118,7 @@ int changed=0; int quit=0; int show=0; + int did_help=defer_help; rc = keyid_from_lid( lid, keyid ); if( rc ) { @@ -133,17 +134,23 @@ return 0; } - if( !mode ) { - tty_printf(_("No trust value assigned to %lu:\n" - "%4u%c/%08lX %s \""), lid, - nbits_from_pk( pk ), pubkey_letter( pk->pubkey_algo ), - (ulong)keyid[1], datestr_from_pk( pk ) ); - p = get_user_id( keyid, &n ); - tty_print_string( p, n ), - m_free(p); - tty_printf("\"\n\n"); - } - tty_printf(_( + + for(;;) { + /* a string with valid answers */ + char *ans = _("sSmMqQ"); + + if( !did_help ) { + if( !mode ) { + tty_printf(_("No trust value assigned to %lu:\n" + "%4u%c/%08lX %s \""), lid, + nbits_from_pk( pk ), pubkey_letter( pk->pubkey_algo ), + (ulong)keyid[1], datestr_from_pk( pk ) ); + p = get_user_id( keyid, &n ); + tty_print_string( p, n ), + m_free(p); + tty_printf("\"\n\n"); + } + tty_printf(_( "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" "checking fingerprints from different sources...)?\n\n" @@ -152,22 +159,21 @@ " 3 = I trust marginally\n" " 4 = I trust fully\n" " s = please show me more information\n") ); - if( mode ) - tty_printf(_(" m = back to the main menu\n")); - else - tty_printf(_(" q = quit\n")); - tty_printf("\n"); - - for(;;) { - /* a string with valid answers */ - char *ans = _("sSmMqQ"); - + if( mode ) + tty_printf(_(" m = back to the main menu\n")); + else + tty_printf(_(" q = quit\n")); + tty_printf("\n"); + did_help = 1; + } if( strlen(ans) != 6 ) BUG(); p = cpr_get("edit_ownertrust.value",_("Your decision? ")); trim_spaces(p); cpr_kill_prompt(); - if( *p && p[1] ) + if( !*p ) + did_help = 0; + else if( *p && p[1] ) ; else if( !p[1] && (*p >= '1' && *p <= '4') ) { unsigned trust; @@ -207,13 +213,15 @@ edit_ownertrust( ulong lid, int mode ) { unsigned int trust; + int no_help = 0; for(;;) { - switch( do_edit_ownertrust( lid, mode, &trust ) ) { + switch( do_edit_ownertrust( lid, mode, &trust, no_help ) ) { case -1: return 0; case -2: show_paths( lid, 1 ); + no_help = 1; break; case 1: trust &= ~TRUST_FLAG_DISABLED; @@ -231,7 +239,7 @@ add_ownertrust_cb( ulong lid ) { unsigned trust; - int rc = do_edit_ownertrust( lid, 0, &trust ); + int rc = do_edit_ownertrust( lid, 0, &trust, 0 ); if( rc == 1 ) return trust & TRUST_MASK; @@ -560,6 +568,42 @@ return -1; } + +/**************** + * Return a malloced string with a default reciepient if there is any + */ +static char * +default_recipient(void) +{ + PKT_secret_key *sk; + byte fpr[MAX_FINGERPRINT_LEN+1]; + size_t n; + char *p; + int i; + + if( opt.def_recipient ) + return m_strdup( opt.def_recipient ); + if( !opt.def_recipient_self ) + return NULL; + sk = m_alloc_clear( sizeof *sk ); + i = get_seckey_byname( sk, NULL, 0 ); + if( i ) { + free_secret_key( sk ); + return NULL; + } + n = MAX_FINGERPRINT_LEN; + fingerprint_from_sk( sk, fpr, &n ); + free_secret_key( sk ); + p = m_alloc( 2*n+3 ); + *p++ = '0'; + *p++ = 'x'; + for(i=0; i < n; i++ ) + sprintf( p+2*i, "%02X", fpr[i] ); + p -= 2; + return p; +} + + int build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use ) { @@ -568,6 +612,7 @@ int rc=0; int any_recipients=0; STRLIST rov; + char *def_rec = NULL; /* check whether there are any recipients in the list and build the * list of the encrypt-to ones (we always trust them) */ @@ -608,16 +653,26 @@ if( !any_recipients && !opt.batch ) { /* ask */ char *answer=NULL; + int have_def_rec; - tty_printf(_( + def_rec = default_recipient(); + have_def_rec = !!def_rec; + if( !have_def_rec ) + tty_printf(_( "You did not specify a user ID. (you may use \"-r\")\n\n")); for(;;) { rc = 0; m_free(answer); - answer = cpr_get_utf8("pklist.user_id.enter", - _("Enter the user ID: ")); - trim_spaces(answer); - cpr_kill_prompt(); + if( have_def_rec ) { + answer = def_rec; + def_rec = NULL; + } + else { + answer = cpr_get_utf8("pklist.user_id.enter", + _("Enter the user ID: ")); + trim_spaces(answer); + cpr_kill_prompt(); + } if( !*answer ) break; if( pk ) @@ -628,20 +683,8 @@ if( rc ) tty_printf(_("No such user ID.\n")); else if( !(rc=check_pubkey_algo2(pk->pubkey_algo, use)) ) { - int trustlevel; - - rc = check_trust( pk, &trustlevel, NULL, NULL, NULL ); - if( rc ) { - log_error("error checking pk of `%s': %s\n", - answer, g10_errstr(rc) ); - } - else if( (trustlevel & TRUST_FLAG_DISABLED) ) { - tty_printf(_("Public key is disabled.\n") ); - } - else if( do_we_trust_pre( pk, trustlevel ) ) { - PK_LIST r; - - r = m_alloc( sizeof *r ); + if( have_def_rec ) { + PK_LIST r = m_alloc( sizeof *r ); r->pk = pk; pk = NULL; r->next = pk_list; r->mark = 0; @@ -649,13 +692,58 @@ any_recipients = 1; break; } + else { + int trustlevel; + + rc = check_trust( pk, &trustlevel, NULL, NULL, NULL ); + if( rc ) { + log_error("error checking pk of `%s': %s\n", + answer, g10_errstr(rc) ); + } + else if( (trustlevel & TRUST_FLAG_DISABLED) ) { + tty_printf(_("Public key is disabled.\n") ); + } + else if( do_we_trust_pre( pk, trustlevel ) ) { + PK_LIST r; + + r = m_alloc( sizeof *r ); + r->pk = pk; pk = NULL; + r->next = pk_list; + r->mark = 0; + pk_list = r; + any_recipients = 1; + break; + } + } } + m_free(def_rec); def_rec = NULL; + have_def_rec = 0; } m_free(answer); if( pk ) { free_public_key( pk ); pk = NULL; } + } + else if( !any_recipients && (def_rec = default_recipient()) ) { + pk = m_alloc_clear( sizeof *pk ); + pk->pubkey_usage = use; + rc = get_pubkey_byname( NULL, pk, def_rec, NULL ); + if( rc ) + log_error(_("unknown default recipient `s'\n"), def_rec ); + else if( !(rc=check_pubkey_algo2(pk->pubkey_algo, use)) ) { + PK_LIST r = m_alloc( sizeof *r ); + r->pk = pk; pk = NULL; + r->next = pk_list; + r->mark = 0; + pk_list = r; + any_recipients = 1; + } + if( pk ) { + free_public_key( pk ); + pk = NULL; + } + m_free(def_rec); def_rec = NULL; } else { any_recipients = 0; diff -urN gnupg-0.9.8a/g10/sig-check.c gnupg-0.9.8b/g10/sig-check.c --- gnupg-0.9.8a/g10/sig-check.c Thu Jul 1 13:23:03 1999 +++ gnupg-0.9.8b/g10/sig-check.c Mon Jul 12 18:25:31 1999 @@ -433,9 +433,11 @@ sig = node->pkt->pkt.signature; algo = sig->digest_algo; + #if 0 /* I am not sure whether this is a good thing to do */ if( sig->flags.checked ) log_debug("check_key_signature: already checked: %s\n", sig->flags.valid? "good":"bad" ); + #endif if( (rc=check_digest_algo(algo)) ) return rc; diff -urN gnupg-0.9.8a/g10/status.c gnupg-0.9.8b/g10/status.c --- gnupg-0.9.8a/g10/status.c Tue Jun 29 21:38:54 1999 +++ gnupg-0.9.8b/g10/status.c Wed Jul 14 10:12:29 1999 @@ -115,6 +115,8 @@ case STATUS_GOODMDC : s = "GOODMDC\n"; break; case STATUS_BADMDC : s = "BADMDC\n"; break; case STATUS_ERRMDC : s = "ERRMDC\n"; break; + case STATUS_IMPORTED : s = "IMPORTED\n"; break; + case STATUS_IMPORT_RES : s = "IMPORT_RES\n"; break; default: s = "?\n"; break; } diff -urN gnupg-0.9.8a/g10/status.h gnupg-0.9.8b/g10/status.h --- gnupg-0.9.8a/g10/status.h Thu May 27 09:01:06 1999 +++ gnupg-0.9.8b/g10/status.h Wed Jul 14 10:14:41 1999 @@ -63,6 +63,9 @@ #define STATUS_GOODMDC 33 #define STATUS_BADMDC 34 #define STATUS_ERRMDC 35 +#define STATUS_IMPORTED 36 +#define STATUS_IMPORT_RES 37 + /*-- status.c --*/ void set_status_fd ( int fd ); diff -urN gnupg-0.9.8a/g10/trustdb.c gnupg-0.9.8b/g10/trustdb.c --- gnupg-0.9.8a/g10/trustdb.c Thu Jul 8 15:15:09 1999 +++ gnupg-0.9.8b/g10/trustdb.c Tue Jul 13 10:24:42 1999 @@ -1624,7 +1624,7 @@ ulong count=0, err_count=0, new_count=0; while( !(rc = enum_keyblocks( 1, &kbpos, &keyblock )) ) { - int modified; + /*int modified;*/ TRUSTREC drec; PKT_public_key *pk = find_kbnode( keyblock, PKT_PUBLIC_KEY ) ->pkt->pkt.public_key; diff -urN gnupg-0.9.8a/mpi/Makefile.am gnupg-0.9.8b/mpi/Makefile.am --- gnupg-0.9.8a/mpi/Makefile.am Wed Jul 7 12:27:37 1999 +++ gnupg-0.9.8b/mpi/Makefile.am Wed Jul 14 11:43:39 1999 @@ -1,5 +1,6 @@ ## Process this file with automake to produce Makefile.in + INCLUDES = -I$(top_srcdir)/include CFLAGS = @CFLAGS@ @MPI_OPT_FLAGS@ SFLAGS = @MPI_SFLAGS@ @@ -9,10 +10,8 @@ mpih-lshift.S mpih-rshift.S mpih-sub1.S asm-syntax.h sysdep.h CLEANFILES = tmp-*.s - noinst_LTLIBRARIES = libmpi.la - libmpi_la_LDFLAGS = libmpi_la_SOURCES = longlong.h \ mpi-add.c \ @@ -48,20 +47,11 @@ libmpi_la_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ libmpi_la_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ -SUFFIXES = .S - .S.o: - $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >tmp-$*.s - $(CC) $(CFLAGS) $(SFLAGS) -c tmp-$*.s - mv tmp-$*.o $@ - rm -f tmp-$*.s .S.lo: - $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >tmp-$*.s - if test -f tmp-$*.lo; then rm tmp-$*.lo; fi - if test -f tmp-$*.o ; then rm tmp-$*.o ; fi - $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(SFLAGS) -c tmp-$*.s - if test -f tmp-$*.lo; then mv tmp-$*.lo $*.lo; fi - if test -f tmp-$*.o ; then mv tmp-$*.o $*.o ; fi - rm -f tmp-$*.s + +.S.s: + $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >$*.s + diff -urN gnupg-0.9.8a/mpi/Makefile.in gnupg-0.9.8b/mpi/Makefile.in --- gnupg-0.9.8a/mpi/Makefile.in Mon Jul 12 15:04:13 1999 +++ gnupg-0.9.8b/mpi/Makefile.in Wed Jul 14 11:50:26 1999 @@ -130,8 +130,6 @@ libmpi_la_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ libmpi_la_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ - -SUFFIXES = .S mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -391,19 +389,11 @@ .S.o: - $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >tmp-$*.s - $(CC) $(CFLAGS) $(SFLAGS) -c tmp-$*.s - mv tmp-$*.o $@ - rm -f tmp-$*.s .S.lo: - $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >tmp-$*.s - if test -f tmp-$*.lo; then rm tmp-$*.lo; fi - if test -f tmp-$*.o ; then rm tmp-$*.o ; fi - $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(SFLAGS) -c tmp-$*.s - if test -f tmp-$*.lo; then mv tmp-$*.lo $*.lo; fi - if test -f tmp-$*.o ; then mv tmp-$*.o $*.o ; fi - rm -f tmp-$*.s + +.S.s: + $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >$*.s # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN gnupg-0.9.8a/po/ChangeLog gnupg-0.9.8b/po/ChangeLog --- gnupg-0.9.8a/po/ChangeLog Tue Jun 29 21:44:30 1999 +++ gnupg-0.9.8b/po/ChangeLog Tue Jul 13 17:39:29 1999 @@ -1,5 +1,9 @@ -Tue Jun 29 21:44:25 CEST 1999 Werner Koch +Tue Jul 13 17:39:25 CEST 1999 Werner Koch + + * de.po: Updated (Walter) + +Tue Jun 29 21:44:25 CEST 1999 Werner Koch * it.po: Updated (Marco). diff -urN gnupg-0.9.8a/po/cat-id-tbl.c gnupg-0.9.8b/po/cat-id-tbl.c --- gnupg-0.9.8a/po/cat-id-tbl.c Mon Jul 12 15:05:28 1999 +++ gnupg-0.9.8b/po/cat-id-tbl.c Wed Jul 14 11:48:10 1999 @@ -94,64 +94,67 @@ {"list secret keys", 75}, {"generate a new key pair", 76}, {"remove key from the public keyring", 77}, - {"sign or edit a key", 78}, - {"generate a revocation certificate", 79}, - {"export keys", 80}, - {"export keys to a key server", 81}, - {"import keys from a key server", 82}, - {"import/merge keys", 83}, - {"list only the sequence of packets", 84}, - {"export the ownertrust values", 85}, - {"import ownertrust values", 86}, - {"|[NAMES]|update the trust database", 87}, - {"|[NAMES]|check the trust database", 88}, - {"fix a corrupted trust database", 89}, - {"De-Armor a file or stdin", 90}, - {"En-Armor a file or stdin", 91}, - {"|algo [files]|print message digests", 92}, - {"print all message digests", 93}, + {"sign a key", 78}, + {"sign a key locally", 79}, + {"sign or edit a key", 80}, + {"generate a revocation certificate", 81}, + {"export keys", 82}, + {"export keys to a key server", 83}, + {"import keys from a key server", 84}, + {"import/merge keys", 85}, + {"list only the sequence of packets", 86}, + {"export the ownertrust values", 87}, + {"import ownertrust values", 88}, + {"update the trust database", 89}, + {"|[NAMES]|check the trust database", 90}, + {"fix a corrupted trust database", 91}, + {"De-Armor a file or stdin", 92}, + {"En-Armor a file or stdin", 93}, + {"|algo [files]|print message digests", 94}, {"\ @\n\ Options:\n\ - ", 94}, - {"create ascii armored output", 95}, - {"|NAME|encrypt for NAME", 96}, - {"use this user-id to sign or decrypt", 97}, - {"|N|set compress level N (0 disables)", 98}, - {"use canonical text mode", 99}, - {"use as output file", 100}, - {"verbose", 101}, - {"be somewhat more quiet", 102}, - {"don't use the terminal at all", 103}, - {"force v3 signatures", 104}, - {"always use a MDC for encryption", 105}, - {"do not make any changes", 106}, - {"batch mode: never ask", 107}, - {"assume yes on most questions", 108}, - {"assume no on most questions", 109}, - {"add this keyring to the list of keyrings", 110}, - {"add this secret keyring to the list", 111}, - {"|NAME|use NAME as default secret key", 112}, - {"|HOST|use this keyserver to lookup keys", 113}, - {"|NAME|set terminal charset to NAME", 114}, - {"read options from file", 115}, - {"set debugging flags", 116}, - {"enable full debugging", 117}, - {"|FD|write status info to this FD", 118}, - {"do not write comment packets", 119}, - {"(default is 1)", 120}, - {"(default is 3)", 121}, - {"|FILE|load extension module FILE", 122}, - {"emulate the mode described in RFC1991", 123}, - {"set all packet, cipher and digest options to OpenPGP behavior", 124}, - {"|N|use passphrase mode N", 125}, - {"|NAME|use message digest algorithm NAME for passphrases", 126}, - {"|NAME|use cipher algorithm NAME for passphrases", 127}, - {"|NAME|use cipher algorithm NAME", 128}, - {"|NAME|use message digest algorithm NAME", 129}, - {"|N|use compress algorithm N", 130}, - {"throw keyid field of encrypted packets", 131}, - {"|NAME=VALUE|use this notation data", 132}, + ", 95}, + {"create ascii armored output", 96}, + {"|NAME|encrypt for NAME", 97}, + {"|NAME|use NAME as default recipient", 98}, + {"use the default key as default recipient", 99}, + {"use this user-id to sign or decrypt", 100}, + {"|N|set compress level N (0 disables)", 101}, + {"use canonical text mode", 102}, + {"use as output file", 103}, + {"verbose", 104}, + {"be somewhat more quiet", 105}, + {"don't use the terminal at all", 106}, + {"force v3 signatures", 107}, + {"always use a MDC for encryption", 108}, + {"do not make any changes", 109}, + {"batch mode: never ask", 110}, + {"assume yes on most questions", 111}, + {"assume no on most questions", 112}, + {"add this keyring to the list of keyrings", 113}, + {"add this secret keyring to the list", 114}, + {"|NAME|use NAME as default secret key", 115}, + {"|HOST|use this keyserver to lookup keys", 116}, + {"|NAME|set terminal charset to NAME", 117}, + {"read options from file", 118}, + {"set debugging flags", 119}, + {"enable full debugging", 120}, + {"|FD|write status info to this FD", 121}, + {"do not write comment packets", 122}, + {"(default is 1)", 123}, + {"(default is 3)", 124}, + {"|FILE|load extension module FILE", 125}, + {"emulate the mode described in RFC1991", 126}, + {"set all packet, cipher and digest options to OpenPGP behavior", 127}, + {"|N|use passphrase mode N", 128}, + {"|NAME|use message digest algorithm NAME for passphrases", 129}, + {"|NAME|use cipher algorithm NAME for passphrases", 130}, + {"|NAME|use cipher algorithm NAME", 131}, + {"|NAME|use message digest algorithm NAME", 132}, + {"|N|use compress algorithm N", 133}, + {"throw keyid field of encrypted packets", 134}, + {"|NAME=VALUE|use this notation data", 135}, {"\ @\n\ Examples:\n\ @@ -160,78 +163,81 @@ --clearsign [file] make a clear text signature\n\ --detach-sign [file] make a detached signature\n\ --list-keys [names] show keys\n\ - --fingerprint [names] show fingerprints\n", 133}, - {"Please report bugs to .\n", 134}, - {"Usage: gpg [options] [files] (-h for help)", 135}, + --fingerprint [names] show fingerprints\n", 136}, + {"Please report bugs to .\n", 137}, + {"Usage: gpg [options] [files] (-h for help)", 138}, {"\ Syntax: gpg [options] [files]\n\ sign, check, encrypt or decrypt\n\ -default operation depends on the input data\n", 136}, +default operation depends on the input data\n", 139}, {"\ \n\ -Supported algorithms:\n", 137}, - {"usage: gpg [options] ", 138}, - {"conflicting commands\n", 139}, - {"NOTE: no default option file `%s'\n", 140}, - {"option file `%s': %s\n", 141}, - {"reading options from `%s'\n", 142}, - {"%s is not a valid character set\n", 143}, - {"selected cipher algorithm is invalid\n", 144}, - {"selected digest algorithm is invalid\n", 145}, - {"the given policy URL is invalid\n", 146}, - {"compress algorithm must be in range %d..%d\n", 147}, - {"completes-needed must be greater than 0\n", 148}, - {"marginals-needed must be greater than 1\n", 149}, - {"max-cert-depth must be in range 1 to 255\n", 150}, - {"NOTE: simple S2K mode (0) is strongly discouraged\n", 151}, - {"invalid S2K mode; must be 0, 1 or 3\n", 152}, - {"failed to initialize the TrustDB: %s\n", 153}, - {"--store [filename]", 154}, - {"--symmetric [filename]", 155}, - {"--encrypt [filename]", 156}, - {"--sign [filename]", 157}, - {"--sign --encrypt [filename]", 158}, - {"--clearsign [filename]", 159}, - {"--decrypt [filename]", 160}, - {"--edit-key username [commands]", 161}, - {"--delete-secret-key username", 162}, - {"--delete-key username", 163}, - {"can't open %s: %s\n", 164}, - {"-k[v][v][v][c] [userid] [keyring]", 165}, - {"dearmoring failed: %s\n", 166}, - {"enarmoring failed: %s\n", 167}, - {"invalid hash algorithm `%s'\n", 168}, - {"[filename]", 169}, - {"Go ahead and type your message ...\n", 170}, - {"can't open `%s'\n", 171}, +Supported algorithms:\n", 140}, + {"usage: gpg [options] ", 141}, + {"conflicting commands\n", 142}, + {"NOTE: no default option file `%s'\n", 143}, + {"option file `%s': %s\n", 144}, + {"reading options from `%s'\n", 145}, + {"%s is not a valid character set\n", 146}, + {"selected cipher algorithm is invalid\n", 147}, + {"selected digest algorithm is invalid\n", 148}, + {"the given policy URL is invalid\n", 149}, + {"compress algorithm must be in range %d..%d\n", 150}, + {"completes-needed must be greater than 0\n", 151}, + {"marginals-needed must be greater than 1\n", 152}, + {"max-cert-depth must be in range 1 to 255\n", 153}, + {"NOTE: simple S2K mode (0) is strongly discouraged\n", 154}, + {"invalid S2K mode; must be 0, 1 or 3\n", 155}, + {"failed to initialize the TrustDB: %s\n", 156}, + {"--store [filename]", 157}, + {"--symmetric [filename]", 158}, + {"--encrypt [filename]", 159}, + {"--sign [filename]", 160}, + {"--sign --encrypt [filename]", 161}, + {"--clearsign [filename]", 162}, + {"--decrypt [filename]", 163}, + {"--sign-key user-id", 164}, + {"--lsign-key user-id", 165}, + {"--edit-key user-id [commands]", 166}, + {"--delete-secret-key user-id", 167}, + {"--delete-key user-id", 168}, + {"can't open %s: %s\n", 169}, + {"-k[v][v][v][c] [userid] [keyring]", 170}, + {"dearmoring failed: %s\n", 171}, + {"enarmoring failed: %s\n", 172}, + {"invalid hash algorithm `%s'\n", 173}, + {"[filename]", 174}, + {"Go ahead and type your message ...\n", 175}, + {"can't open `%s'\n", 176}, {"\ -the first character of a notation name must be a letter or an underscore\n", 172}, +the first character of a notation name must be a letter or an underscore\n", 177}, {"\ a notation name must have only letters, digits, dots or underscores and end \ -with an '='\n", 173}, - {"dots in a notation name must be surrounded by other characters\n", 174}, - {"a notation value must not use any control characters\n", 175}, - {"armor: %s\n", 176}, - {"invalid armor header: ", 177}, - {"armor header: ", 178}, - {"invalid clearsig header\n", 179}, - {"nested clear text signatures\n", 180}, - {"invalid dash escaped line: ", 181}, - {"unexpected armor:", 182}, - {"invalid radix64 character %02x skipped\n", 183}, - {"premature eof (no CRC)\n", 184}, - {"premature eof (in CRC)\n", 185}, - {"malformed CRC\n", 186}, - {"CRC error; %06lx - %06lx\n", 187}, - {"premature eof (in Trailer)\n", 188}, - {"error in trailer line\n", 189}, - {"no valid OpenPGP data found.\n", 190}, - {"invalid armor: line longer than %d characters\n", 191}, +with an '='\n", 178}, + {"dots in a notation name must be surrounded by other characters\n", 179}, + {"a notation value must not use any control characters\n", 180}, + {"armor: %s\n", 181}, + {"invalid armor header: ", 182}, + {"armor header: ", 183}, + {"invalid clearsig header\n", 184}, + {"nested clear text signatures\n", 185}, + {"invalid dash escaped line: ", 186}, + {"unexpected armor:", 187}, + {"invalid radix64 character %02x skipped\n", 188}, + {"premature eof (no CRC)\n", 189}, + {"premature eof (in CRC)\n", 190}, + {"malformed CRC\n", 191}, + {"CRC error; %06lx - %06lx\n", 192}, + {"premature eof (in Trailer)\n", 193}, + {"error in trailer line\n", 194}, + {"no valid OpenPGP data found.\n", 195}, + {"invalid armor: line longer than %d characters\n", 196}, {"\ -quoted printable character in armor - probably a buggy MTA has been used\n", 192}, +quoted printable character in armor - probably a buggy MTA has been used\n", 197}, + {"sSmMqQ", 198}, {"\ No trust value assigned to %lu:\n\ -%4u%c/%08lX %s \"", 193}, +%4u%c/%08lX %s \"", 199}, {"\ Please decide how far you trust this user to correctly\n\ verify other users' keys (by looking at passports,\n\ @@ -241,561 +247,561 @@ 2 = I do NOT trust\n\ 3 = I trust marginally\n\ 4 = I trust fully\n\ - s = please show me more information\n", 194}, - {" m = back to the main menu\n", 195}, - {" q = quit\n", 196}, - {"sSmMqQ", 197}, - {"Your decision? ", 198}, - {"Certificates leading to an ultimately trusted key:\n", 199}, + s = please show me more information\n", 200}, + {" m = back to the main menu\n", 201}, + {" q = quit\n", 202}, + {"Your decision? ", 203}, + {"Certificates leading to an ultimately trusted key:\n", 204}, {"\ Could not find a valid trust path to the key. Let's see whether we\n\ can assign some missing owner trust values.\n\ -\n", 200}, +\n", 205}, {"\ No path leading to one of our keys found.\n\ -\n", 201}, +\n", 206}, {"\ No certificates with undefined trust found.\n\ -\n", 202}, +\n", 207}, {"\ No trust values changed.\n\ -\n", 203}, - {"key %08lX: key has been revoked!\n", 204}, - {"Use this key anyway? ", 205}, - {"key %08lX: subkey has been revoked!\n", 206}, - {"%08lX: key has expired\n", 207}, - {"%08lX: no info to calculate a trust probability\n", 208}, - {"%08lX: We do NOT trust this key\n", 209}, +\n", 208}, + {"key %08lX: key has been revoked!\n", 209}, + {"Use this key anyway? ", 210}, + {"key %08lX: subkey has been revoked!\n", 211}, + {"%08lX: key has expired\n", 212}, + {"%08lX: no info to calculate a trust probability\n", 213}, + {"%08lX: We do NOT trust this key\n", 214}, {"\ %08lX: It is not sure that this key really belongs to the owner\n\ -but it is accepted anyway\n", 210}, - {"This key probably belongs to the owner\n", 211}, - {"This key belongs to us\n", 212}, +but it is accepted anyway\n", 215}, + {"This key probably belongs to the owner\n", 216}, + {"This key belongs to us\n", 217}, {"\ It is NOT certain that the key belongs to its owner.\n\ If you *really* know what you are doing, you may answer\n\ the next question with yes\n\ -\n", 213}, - {"WARNING: Using untrusted key!\n", 214}, - {"WARNING: This key has been revoked by its owner!\n", 215}, - {" This could mean that the signature is forgery.\n", 216}, - {"WARNING: This subkey has been revoked by its owner!\n", 217}, - {"Note: This key has expired!\n", 218}, - {"WARNING: This key is not certified with a trusted signature!\n", 219}, - {"\ - There is no indication that the signature belongs to the owner.\n", 220}, - {"WARNING: We do NOT trust this key!\n", 221}, - {" The signature is probably a FORGERY.\n", 222}, - {"\ -WARNING: This key is not certified with sufficiently trusted signatures!\n", 223}, - {" It is not certain that the signature belongs to the owner.\n", 224}, - {"%s: skipped: %s\n", 225}, - {"%s: skipped: public key already present\n", 226}, +\n", 218}, + {"WARNING: Using untrusted key!\n", 219}, + {"WARNING: This key has been revoked by its owner!\n", 220}, + {" This could mean that the signature is forgery.\n", 221}, + {"WARNING: This subkey has been revoked by its owner!\n", 222}, + {"Note: This key has expired!\n", 223}, + {"WARNING: This key is not certified with a trusted signature!\n", 224}, + {"\ + There is no indication that the signature belongs to the owner.\n", 225}, + {"WARNING: We do NOT trust this key!\n", 226}, + {" The signature is probably a FORGERY.\n", 227}, + {"\ +WARNING: This key is not certified with sufficiently trusted signatures!\n", 228}, + {" It is not certain that the signature belongs to the owner.\n", 229}, + {"%s: skipped: %s\n", 230}, + {"%s: skipped: public key already present\n", 231}, {"\ You did not specify a user ID. (you may use \"-r\")\n\ -\n", 227}, - {"Enter the user ID: ", 228}, - {"No such user ID.\n", 229}, - {"Public key is disabled.\n", 230}, - {"%s: error checking key: %s\n", 231}, - {"%s: skipped: public key is disabled\n", 232}, - {"no valid addressees\n", 233}, - {"writing self signature\n", 234}, - {"writing key binding signature\n", 235}, - {"Please select what kind of key you want:\n", 236}, - {" (%d) DSA and ElGamal (default)\n", 237}, - {" (%d) DSA (sign only)\n", 238}, - {" (%d) ElGamal (encrypt only)\n", 239}, - {" (%d) ElGamal (sign and encrypt)\n", 240}, - {" (%d) ElGamal in a v3 packet\n", 241}, - {"Your selection? ", 242}, - {"Do you really want to create a sign and encrypt key? ", 243}, - {"Invalid selection.\n", 244}, +\n", 232}, + {"Enter the user ID: ", 233}, + {"No such user ID.\n", 234}, + {"Public key is disabled.\n", 235}, + {"unknown default recipient `s'\n", 236}, + {"%s: error checking key: %s\n", 237}, + {"%s: skipped: public key is disabled\n", 238}, + {"no valid addressees\n", 239}, + {"writing self signature\n", 240}, + {"writing key binding signature\n", 241}, + {"Please select what kind of key you want:\n", 242}, + {" (%d) DSA and ElGamal (default)\n", 243}, + {" (%d) DSA (sign only)\n", 244}, + {" (%d) ElGamal (encrypt only)\n", 245}, + {" (%d) ElGamal (sign and encrypt)\n", 246}, + {" (%d) ElGamal in a v3 packet\n", 247}, + {"Your selection? ", 248}, + {"Do you really want to create a sign and encrypt key? ", 249}, + {"Invalid selection.\n", 250}, {"\ About to generate a new %s keypair.\n\ minimum keysize is 768 bits\n\ default keysize is 1024 bits\n\ - highest suggested keysize is 2048 bits\n", 245}, - {"What keysize do you want? (1024) ", 246}, - {"DSA only allows keysizes from 512 to 1024\n", 247}, - {"keysize too small; 768 is smallest value allowed.\n", 248}, - {"keysize too large; %d is largest value allowed.\n", 249}, + highest suggested keysize is 2048 bits\n", 251}, + {"What keysize do you want? (1024) ", 252}, + {"DSA only allows keysizes from 512 to 1024\n", 253}, + {"keysize too small; 768 is smallest value allowed.\n", 254}, + {"keysize too large; %d is largest value allowed.\n", 255}, {"\ Keysizes larger than 2048 are not suggested because\n\ -computations take REALLY long!\n", 250}, - {"Are you sure that you want this keysize? ", 251}, +computations take REALLY long!\n", 256}, + {"Are you sure that you want this keysize? ", 257}, {"\ Okay, but keep in mind that your monitor and keyboard radiation is also very \ -vulnerable to attacks!\n", 252}, - {"Do you really need such a large keysize? ", 253}, - {"Requested keysize is %u bits\n", 254}, - {"rounded up to %u bits\n", 255}, +vulnerable to attacks!\n", 258}, + {"Do you really need such a large keysize? ", 259}, + {"Requested keysize is %u bits\n", 260}, + {"rounded up to %u bits\n", 261}, {"\ Please specify how long the key should be valid.\n\ 0 = key does not expire\n\ = key expires in n days\n\ w = key expires in n weeks\n\ m = key expires in n months\n\ - y = key expires in n years\n", 256}, - {"Key is valid for? (0) ", 257}, - {"invalid value\n", 258}, - {"Key does not expire at all\n", 259}, - {"Key expires at %s\n", 260}, - {"Is this correct (y/n)? ", 261}, + y = key expires in n years\n", 262}, + {"Key is valid for? (0) ", 263}, + {"invalid value\n", 264}, + {"Key does not expire at all\n", 265}, + {"Key expires at %s\n", 266}, + {"Is this correct (y/n)? ", 267}, {"\ \n\ You need a User-ID to identify your key; the software constructs the user \ id\n\ from Real Name, Comment and Email Address in this form:\n\ \"Heinrich Heine (Der Dichter) \"\n\ -\n", 262}, - {"Real name: ", 263}, - {"Invalid character in name\n", 264}, - {"Name may not start with a digit\n", 265}, - {"Name must be at least 5 characters long\n", 266}, - {"Email address: ", 267}, - {"Not a valid email address\n", 268}, - {"Comment: ", 269}, - {"Invalid character in comment\n", 270}, - {"You are using the `%s' character set.\n", 271}, +\n", 268}, + {"Real name: ", 269}, + {"Invalid character in name\n", 270}, + {"Name may not start with a digit\n", 271}, + {"Name must be at least 5 characters long\n", 272}, + {"Email address: ", 273}, + {"Not a valid email address\n", 274}, + {"Comment: ", 275}, + {"Invalid character in comment\n", 276}, + {"You are using the `%s' character set.\n", 277}, {"\ You selected this USER-ID:\n\ \"%s\"\n\ -\n", 272}, - {"NnCcEeOoQq", 273}, - {"Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? ", 274}, +\n", 278}, + {"NnCcEeOoQq", 279}, + {"Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? ", 280}, {"\ You need a Passphrase to protect your secret key.\n\ -\n", 275}, - {"passphrase not correctly repeated; try again.\n", 276}, +\n", 281}, + {"passphrase not correctly repeated; try again.\n", 282}, {"\ You don't want a passphrase - this is probably a *bad* idea!\n\ I will do it anyway. You can change your passphrase at any time,\n\ using this program with the option \"--edit-key\".\n\ -\n", 277}, +\n", 283}, {"\ We need to generate a lot of random bytes. It is a good idea to perform\n\ some other action (type on the keyboard, move the mouse, utilize the\n\ disks) during the prime generation; this gives the random number\n\ -generator a better chance to gain enough entropy.\n", 278}, - {"Key generation can only be used in interactive mode\n", 279}, - {"DSA keypair will have 1024 bits.\n", 280}, - {"Key generation canceled.\n", 281}, - {"writing public certificate to `%s'\n", 282}, - {"writing secret certificate to `%s'\n", 283}, - {"public and secret key created and signed.\n", 284}, +generator a better chance to gain enough entropy.\n", 284}, + {"Key generation can only be used in interactive mode\n", 285}, + {"DSA keypair will have 1024 bits.\n", 286}, + {"Key generation canceled.\n", 287}, + {"writing public certificate to `%s'\n", 288}, + {"writing secret certificate to `%s'\n", 289}, + {"public and secret key created and signed.\n", 290}, {"\ Note that this key cannot be used for encryption. You may want to use\n\ -the command \"--edit-key\" to generate a secondary key for this purpose.\n", 285}, - {"Key generation failed: %s\n", 286}, +the command \"--edit-key\" to generate a secondary key for this purpose.\n", 291}, + {"Key generation failed: %s\n", 292}, {"\ -key has been created %lu second in future (time warp or clock problem)\n", 287}, +key has been created %lu second in future (time warp or clock problem)\n", 293}, {"\ -key has been created %lu seconds in future (time warp or clock problem)\n", 288}, - {"Really create? ", 289}, - {"%s: can't open: %s\n", 290}, - {"error creating passphrase: %s\n", 291}, - {"%s: WARNING: empty file\n", 292}, - {"reading from `%s'\n", 293}, - {"%s/%s encrypted for: %s\n", 294}, - {"%s: user not found: %s\n", 295}, - {"certificate read problem: %s\n", 296}, - {"key %08lX: not a rfc2440 key - skipped\n", 297}, - {"WARNING: nothing exported\n", 298}, - {"too many entries in pk cache - disabled\n", 299}, - {"too many entries in unk cache - disabled\n", 300}, - {"using secondary key %08lX instead of primary key %08lX\n", 301}, - {"can't open `%s': %s\n", 302}, - {"skipping block of type %d\n", 303}, - {"%lu keys so far processed\n", 304}, - {"error reading `%s': %s\n", 305}, - {"Total number processed: %lu\n", 306}, - {" w/o user IDs: %lu\n", 307}, - {" imported: %lu", 308}, - {" unchanged: %lu\n", 309}, - {" new user IDs: %lu\n", 310}, - {" new subkeys: %lu\n", 311}, - {" new signatures: %lu\n", 312}, - {" new key revocations: %lu\n", 313}, - {" secret keys read: %lu\n", 314}, - {" secret keys imported: %lu\n", 315}, - {" secret keys unchanged: %lu\n", 316}, - {"key %08lX: no user id\n", 317}, - {"key %08lX: no valid user ids\n", 318}, - {"this may be caused by a missing self-signature\n", 319}, - {"key %08lX: public key not found: %s\n", 320}, - {"no default public keyring\n", 321}, - {"writing to `%s'\n", 322}, - {"can't lock keyring `%s': %s\n", 323}, - {"error writing keyring `%s': %s\n", 324}, - {"key %08lX: public key imported\n", 325}, - {"key %08lX: doesn't match our copy\n", 326}, - {"key %08lX: can't locate original keyblock: %s\n", 327}, - {"key %08lX: can't read original keyblock: %s\n", 328}, - {"key %08lX: 1 new user-id\n", 329}, - {"key %08lX: %d new user-ids\n", 330}, - {"key %08lX: 1 new signature\n", 331}, - {"key %08lX: %d new signatures\n", 332}, - {"key %08lX: 1 new subkey\n", 333}, - {"key %08lX: %d new subkeys\n", 334}, - {"key %08lX: not changed\n", 335}, - {"key %08lX: secret key imported\n", 336}, - {"key %08lX: already in secret keyring\n", 337}, - {"key %08lX: secret key not found: %s\n", 338}, - {"key %08lX: no public key - can't apply revocation certificate\n", 339}, - {"key %08lX: invalid revocation certificate: %s - rejected\n", 340}, - {"key %08lX: revocation certificate imported\n", 341}, - {"key %08lX: no user-id for signature\n", 342}, - {"key %08lX: unsupported public key algorithm\n", 343}, - {"key %08lX: invalid self-signature\n", 344}, - {"key %08lX: no subkey for key binding\n", 345}, - {"key %08lX: invalid subkey binding\n", 346}, - {"key %08lX: skipped userid '", 347}, - {"key %08lX: skipped subkey\n", 348}, - {"key %08lX: non exportable signature (class %02x) - skipped\n", 349}, - {"key %08lX: revocation certificate at wrong place - skipped\n", 350}, - {"key %08lX: invalid revocation certificate: %s - skipped\n", 351}, - {"key %08lX: duplicated user ID detected - merged\n", 352}, - {"key %08lX: revocation certificate added\n", 353}, - {"key %08lX: our copy has no self-signature\n", 354}, - {"%s: user not found\n", 355}, - {"[revocation]", 356}, - {"[self-signature]", 357}, - {"1 bad signature\n", 358}, - {"%d bad signatures\n", 359}, - {"1 signature not checked due to a missing key\n", 360}, - {"%d signatures not checked due to missing keys\n", 361}, - {"1 signature not checked due to an error\n", 362}, - {"%d signatures not checked due to errors\n", 363}, - {"1 user id without valid self-signature detected\n", 364}, - {"%d user ids without valid self-signatures detected\n", 365}, - {"Already signed by key %08lX\n", 366}, - {"Nothing to sign with key %08lX\n", 367}, +key has been created %lu seconds in future (time warp or clock problem)\n", 294}, + {"Really create? ", 295}, + {"%s: can't open: %s\n", 296}, + {"error creating passphrase: %s\n", 297}, + {"%s: WARNING: empty file\n", 298}, + {"reading from `%s'\n", 299}, + {"%s/%s encrypted for: %s\n", 300}, + {"%s: user not found: %s\n", 301}, + {"certificate read problem: %s\n", 302}, + {"key %08lX: not a rfc2440 key - skipped\n", 303}, + {"WARNING: nothing exported\n", 304}, + {"too many entries in pk cache - disabled\n", 305}, + {"too many entries in unk cache - disabled\n", 306}, + {"using secondary key %08lX instead of primary key %08lX\n", 307}, + {"can't open `%s': %s\n", 308}, + {"skipping block of type %d\n", 309}, + {"%lu keys so far processed\n", 310}, + {"error reading `%s': %s\n", 311}, + {"Total number processed: %lu\n", 312}, + {" w/o user IDs: %lu\n", 313}, + {" imported: %lu", 314}, + {" unchanged: %lu\n", 315}, + {" new user IDs: %lu\n", 316}, + {" new subkeys: %lu\n", 317}, + {" new signatures: %lu\n", 318}, + {" new key revocations: %lu\n", 319}, + {" secret keys read: %lu\n", 320}, + {" secret keys imported: %lu\n", 321}, + {" secret keys unchanged: %lu\n", 322}, + {"key %08lX: no user id\n", 323}, + {"key %08lX: no valid user ids\n", 324}, + {"this may be caused by a missing self-signature\n", 325}, + {"key %08lX: public key not found: %s\n", 326}, + {"no default public keyring\n", 327}, + {"writing to `%s'\n", 328}, + {"can't lock keyring `%s': %s\n", 329}, + {"error writing keyring `%s': %s\n", 330}, + {"key %08lX: public key imported\n", 331}, + {"key %08lX: doesn't match our copy\n", 332}, + {"key %08lX: can't locate original keyblock: %s\n", 333}, + {"key %08lX: can't read original keyblock: %s\n", 334}, + {"key %08lX: 1 new user-id\n", 335}, + {"key %08lX: %d new user-ids\n", 336}, + {"key %08lX: 1 new signature\n", 337}, + {"key %08lX: %d new signatures\n", 338}, + {"key %08lX: 1 new subkey\n", 339}, + {"key %08lX: %d new subkeys\n", 340}, + {"key %08lX: not changed\n", 341}, + {"key %08lX: secret key imported\n", 342}, + {"key %08lX: already in secret keyring\n", 343}, + {"key %08lX: secret key not found: %s\n", 344}, + {"key %08lX: no public key - can't apply revocation certificate\n", 345}, + {"key %08lX: invalid revocation certificate: %s - rejected\n", 346}, + {"key %08lX: revocation certificate imported\n", 347}, + {"key %08lX: no user-id for signature\n", 348}, + {"key %08lX: unsupported public key algorithm\n", 349}, + {"key %08lX: invalid self-signature\n", 350}, + {"key %08lX: no subkey for key binding\n", 351}, + {"key %08lX: invalid subkey binding\n", 352}, + {"key %08lX: skipped userid '", 353}, + {"key %08lX: skipped subkey\n", 354}, + {"key %08lX: non exportable signature (class %02x) - skipped\n", 355}, + {"key %08lX: revocation certificate at wrong place - skipped\n", 356}, + {"key %08lX: invalid revocation certificate: %s - skipped\n", 357}, + {"key %08lX: duplicated user ID detected - merged\n", 358}, + {"key %08lX: revocation certificate added\n", 359}, + {"key %08lX: our copy has no self-signature\n", 360}, + {"%s: user not found\n", 361}, + {"[revocation]", 362}, + {"[self-signature]", 363}, + {"1 bad signature\n", 364}, + {"%d bad signatures\n", 365}, + {"1 signature not checked due to a missing key\n", 366}, + {"%d signatures not checked due to missing keys\n", 367}, + {"1 signature not checked due to an error\n", 368}, + {"%d signatures not checked due to errors\n", 369}, + {"1 user id without valid self-signature detected\n", 370}, + {"%d user ids without valid self-signatures detected\n", 371}, + {"Already signed by key %08lX\n", 372}, + {"Nothing to sign with key %08lX\n", 373}, {"\ Are you really sure that you want to sign this key\n\ -with your key: \"", 368}, +with your key: \"", 374}, {"\ The signature will be marked as non-exportable.\n\ -\n", 369}, - {"Really sign? ", 370}, - {"signing failed: %s\n", 371}, - {"This key is not protected.\n", 372}, - {"Key is protected.\n", 373}, - {"Can't edit this key: %s\n", 374}, +\n", 375}, + {"Really sign? ", 376}, + {"signing failed: %s\n", 377}, + {"This key is not protected.\n", 378}, + {"Key is protected.\n", 379}, + {"Can't edit this key: %s\n", 380}, {"\ Enter the new passphrase for this secret key.\n\ -\n", 375}, +\n", 381}, {"\ You don't want a passphrase - this is probably a *bad* idea!\n\ -\n", 376}, - {"Do you really want to do this? ", 377}, - {"moving a key signature to the correct place\n", 378}, - {"quit this menu", 379}, - {"q", 380}, - {"save", 381}, - {"save and quit", 382}, - {"help", 383}, - {"show this help", 384}, - {"fpr", 385}, - {"show fingerprint", 386}, - {"list", 387}, - {"list key and user ids", 388}, - {"l", 389}, - {"uid", 390}, - {"select user id N", 391}, - {"key", 392}, - {"select secondary key N", 393}, - {"check", 394}, - {"list signatures", 395}, - {"c", 396}, - {"sign", 397}, - {"sign the key", 398}, - {"s", 399}, - {"lsign", 400}, - {"sign the key locally", 401}, - {"debug", 402}, - {"adduid", 403}, - {"add a user id", 404}, - {"deluid", 405}, - {"delete user id", 406}, - {"addkey", 407}, - {"add a secondary key", 408}, - {"delkey", 409}, - {"delete a secondary key", 410}, - {"delsig", 411}, - {"delete signatures", 412}, - {"expire", 413}, - {"change the expire date", 414}, - {"toggle", 415}, - {"toggle between secret and public key listing", 416}, - {"t", 417}, - {"pref", 418}, - {"list preferences", 419}, - {"passwd", 420}, - {"change the passphrase", 421}, - {"trust", 422}, - {"change the ownertrust", 423}, - {"revsig", 424}, - {"revoke signatures", 425}, - {"revkey", 426}, - {"revoke a secondary key", 427}, - {"disable", 428}, - {"disable a key", 429}, - {"enable", 430}, - {"enable a key", 431}, - {"can't do that in batchmode\n", 432}, - {"Secret key is available.\n", 433}, - {"Command> ", 434}, - {"Need the secret key to do this.\n", 435}, - {"Save changes? ", 436}, - {"Quit without saving? ", 437}, - {"update failed: %s\n", 438}, - {"update secret failed: %s\n", 439}, - {"Key not changed so no update needed.\n", 440}, - {"update of trustdb failed: %s\n", 441}, +\n", 382}, + {"Do you really want to do this? ", 383}, + {"moving a key signature to the correct place\n", 384}, + {"quit this menu", 385}, + {"q", 386}, + {"save", 387}, + {"save and quit", 388}, + {"help", 389}, + {"show this help", 390}, + {"fpr", 391}, + {"show fingerprint", 392}, + {"list", 393}, + {"list key and user ids", 394}, + {"l", 395}, + {"uid", 396}, + {"select user id N", 397}, + {"key", 398}, + {"select secondary key N", 399}, + {"check", 400}, + {"list signatures", 401}, + {"c", 402}, + {"sign", 403}, + {"sign the key", 404}, + {"s", 405}, + {"lsign", 406}, + {"sign the key locally", 407}, + {"debug", 408}, + {"adduid", 409}, + {"add a user id", 410}, + {"deluid", 411}, + {"delete user id", 412}, + {"addkey", 413}, + {"add a secondary key", 414}, + {"delkey", 415}, + {"delete a secondary key", 416}, + {"delsig", 417}, + {"delete signatures", 418}, + {"expire", 419}, + {"change the expire date", 420}, + {"toggle", 421}, + {"toggle between secret and public key listing", 422}, + {"t", 423}, + {"pref", 424}, + {"list preferences", 425}, + {"passwd", 426}, + {"change the passphrase", 427}, + {"trust", 428}, + {"change the ownertrust", 429}, + {"revsig", 430}, + {"revoke signatures", 431}, + {"revkey", 432}, + {"revoke a secondary key", 433}, + {"disable", 434}, + {"disable a key", 435}, + {"enable", 436}, + {"enable a key", 437}, + {"can't do that in batchmode\n", 438}, + {"Secret key is available.\n", 439}, + {"Command> ", 440}, + {"Need the secret key to do this.\n", 441}, {"Really sign all user ids? ", 442}, {"Hint: Select the user ids to sign\n", 443}, - {"You must select at least one user id.\n", 444}, - {"You can't delete the last user id!\n", 445}, - {"Really remove all selected user ids? ", 446}, - {"Really remove this user id? ", 447}, - {"You must select at least one key.\n", 448}, - {"Do you really want to delete the selected keys? ", 449}, - {"Do you really want to delete this key? ", 450}, - {"Do you really want to revoke the selected keys? ", 451}, - {"Do you really want to revoke this key? ", 452}, - {"Invalid command (try \"help\")\n", 453}, - {"This key has been disabled", 454}, - {"Delete this good signature? (y/N/q)", 455}, - {"Delete this invalid signature? (y/N/q)", 456}, - {"Delete this unknown signature? (y/N/q)", 457}, - {"Really delete this self-signature? (y/N)", 458}, - {"Deleted %d signature.\n", 459}, - {"Deleted %d signatures.\n", 460}, - {"Nothing deleted.\n", 461}, - {"Please remove selections from the secret keys.\n", 462}, - {"Please select at most one secondary key.\n", 463}, - {"Changing expiration time for a secondary key.\n", 464}, - {"Changing expiration time for the primary key.\n", 465}, - {"You can't change the expiration date of a v3 key\n", 466}, - {"No corresponding signature in secret ring\n", 467}, - {"No user id with index %d\n", 468}, - {"No secondary key with index %d\n", 469}, - {"user ID: \"", 470}, + {"update of trustdb failed: %s\n", 444}, + {"You must select at least one user id.\n", 445}, + {"You can't delete the last user id!\n", 446}, + {"Really remove all selected user ids? ", 447}, + {"Really remove this user id? ", 448}, + {"You must select at least one key.\n", 449}, + {"Do you really want to delete the selected keys? ", 450}, + {"Do you really want to delete this key? ", 451}, + {"Do you really want to revoke the selected keys? ", 452}, + {"Do you really want to revoke this key? ", 453}, + {"Save changes? ", 454}, + {"Quit without saving? ", 455}, + {"update failed: %s\n", 456}, + {"update secret failed: %s\n", 457}, + {"Key not changed so no update needed.\n", 458}, + {"Invalid command (try \"help\")\n", 459}, + {"This key has been disabled", 460}, + {"Delete this good signature? (y/N/q)", 461}, + {"Delete this invalid signature? (y/N/q)", 462}, + {"Delete this unknown signature? (y/N/q)", 463}, + {"Really delete this self-signature? (y/N)", 464}, + {"Deleted %d signature.\n", 465}, + {"Deleted %d signatures.\n", 466}, + {"Nothing deleted.\n", 467}, + {"Please remove selections from the secret keys.\n", 468}, + {"Please select at most one secondary key.\n", 469}, + {"Changing expiration time for a secondary key.\n", 470}, + {"Changing expiration time for the primary key.\n", 471}, + {"You can't change the expiration date of a v3 key\n", 472}, + {"No corresponding signature in secret ring\n", 473}, + {"No user id with index %d\n", 474}, + {"No secondary key with index %d\n", 475}, + {"user ID: \"", 476}, {"\ \"\n\ -signed with your key %08lX at %s\n", 471}, - {"Create a revocation certificate for this signature? (y/N)", 472}, - {"Really create the revocation certificates? (y/N)", 473}, - {"no secret key\n", 474}, - {"public key is %08lX\n", 475}, - {"public key encrypted data: good DEK\n", 476}, - {"encrypted with %u-bit %s key, ID %08lX, created %s\n", 477}, - {"encrypted with %s key, ID %08lX\n", 478}, - {"no secret key for decryption available\n", 479}, - {"public key decryption failed: %s\n", 480}, - {"decryption okay\n", 481}, - {"WARNING: encrypted message has been manipulated!\n", 482}, - {"decryption failed: %s\n", 483}, - {"NOTE: sender requested \"for-your-eyes-only\"\n", 484}, - {"original file name='%.*s'\n", 485}, - {"WARNING: invalid notation data found\n", 486}, - {"Notation: ", 487}, - {"Policy: ", 488}, - {"signature verification suppressed\n", 489}, - {"Signature made %.*s using %s key ID %08lX\n", 490}, - {"BAD signature from \"", 491}, - {"Good signature from \"", 492}, - {" aka \"", 493}, - {"Can't check signature: %s\n", 494}, - {"old style (PGP 2.x) signature\n", 495}, - {"invalid root packet detected in proc_tree()\n", 496}, - {"can't disable core dumps: %s\n", 497}, - {"WARNING: program may create a core file!\n", 498}, - {"Experimental algorithms should not be used!\n", 499}, +signed with your key %08lX at %s\n", 477}, + {"Create a revocation certificate for this signature? (y/N)", 478}, + {"Really create the revocation certificates? (y/N)", 479}, + {"no secret key\n", 480}, + {"public key is %08lX\n", 481}, + {"public key encrypted data: good DEK\n", 482}, + {"encrypted with %u-bit %s key, ID %08lX, created %s\n", 483}, + {"encrypted with %s key, ID %08lX\n", 484}, + {"no secret key for decryption available\n", 485}, + {"public key decryption failed: %s\n", 486}, + {"decryption okay\n", 487}, + {"WARNING: encrypted message has been manipulated!\n", 488}, + {"decryption failed: %s\n", 489}, + {"NOTE: sender requested \"for-your-eyes-only\"\n", 490}, + {"original file name='%.*s'\n", 491}, + {"WARNING: invalid notation data found\n", 492}, + {"Notation: ", 493}, + {"Policy: ", 494}, + {"signature verification suppressed\n", 495}, + {"Signature made %.*s using %s key ID %08lX\n", 496}, + {"BAD signature from \"", 497}, + {"Good signature from \"", 498}, + {" aka \"", 499}, + {"Can't check signature: %s\n", 500}, + {"old style (PGP 2.x) signature\n", 501}, + {"invalid root packet detected in proc_tree()\n", 502}, + {"can't disable core dumps: %s\n", 503}, + {"WARNING: program may create a core file!\n", 504}, + {"Experimental algorithms should not be used!\n", 505}, {"\ RSA keys are deprecated; please consider creating a new key and use this key \ -in the future\n", 500}, - {"this cipher algorithm is depreciated; please use a more standard one!\n", 501}, - {"can't handle public key algorithm %d\n", 502}, - {"subpacket of type %d has critical bit set\n", 503}, +in the future\n", 506}, + {"this cipher algorithm is depreciated; please use a more standard one!\n", 507}, + {"can't handle public key algorithm %d\n", 508}, + {"subpacket of type %d has critical bit set\n", 509}, {"\ \n\ You need a passphrase to unlock the secret key for\n\ -user: \"", 504}, - {"%u-bit %s key, ID %08lX, created %s", 505}, - {" (main key ID %08lX)", 506}, - {"can't query password in batchmode\n", 507}, - {"Enter passphrase: ", 508}, - {"Repeat passphrase: ", 509}, - {"data not saved; use option \"--output\" to save it\n", 510}, - {"Please enter name of data file: ", 511}, - {"reading stdin ...\n", 512}, - {"can't open signed data `%s'\n", 513}, - {"anonymous receiver; trying secret key %08lX ...\n", 514}, - {"okay, we are the anonymous recipient.\n", 515}, - {"old encoding of the DEK is not supported\n", 516}, - {"NOTE: cipher algorithm %d not found in preferences\n", 517}, - {"protection algorithm %d is not supported\n", 518}, - {"Invalid passphrase; please try again ...\n", 519}, - {"WARNING: Weak key detected - please change passphrase again.\n", 520}, - {"assuming bad MDC due to an unknown critical bit\n", 521}, - {"\ -this is a PGP generated ElGamal key which is NOT secure for signatures!\n", 522}, - {"public key is %lu second newer than the signature\n", 523}, - {"public key is %lu seconds newer than the signature\n", 524}, - {"NOTE: signature key expired %s\n", 525}, - {"assuming bad signature due to an unknown critical bit\n", 526}, - {"%s signature from: %s\n", 527}, - {"can't create %s: %s\n", 528}, - {"signing:", 529}, - {"WARNING: `%s' is an empty file\n", 530}, - {"can't handle text lines longer than %d characters\n", 531}, - {"input line longer than %d characters\n", 532}, - {"trustdb rec %lu: lseek failed: %s\n", 533}, - {"trustdb rec %lu: write failed (n=%d): %s\n", 534}, - {"trustdb transaction too large\n", 535}, - {"%s: can't access: %s\n", 536}, - {"%s: can't create directory: %s\n", 537}, - {"%s: directory created\n", 538}, - {"%s: directory does not exist!\n", 539}, - {"%s: can't create: %s\n", 540}, - {"%s: can't create lock\n", 541}, - {"%s: failed to create version record: %s", 542}, - {"%s: invalid trustdb created\n", 543}, - {"%s: trustdb created\n", 544}, - {"%s: invalid trustdb\n", 545}, - {"%s: failed to create hashtable: %s\n", 546}, - {"%s: error updating version record: %s\n", 547}, - {"%s: error reading version record: %s\n", 548}, - {"%s: error writing version record: %s\n", 549}, - {"trustdb: lseek failed: %s\n", 550}, - {"trustdb: read failed (n=%d): %s\n", 551}, - {"%s: not a trustdb file\n", 552}, - {"%s: version record with recnum %lu\n", 553}, - {"%s: invalid file version %d\n", 554}, - {"%s: error reading free record: %s\n", 555}, - {"%s: error writing dir record: %s\n", 556}, - {"%s: failed to zero a record: %s\n", 557}, - {"%s: failed to append a record: %s\n", 558}, - {"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n", 559}, - {"trust record %lu, req type %d: read failed: %s\n", 560}, - {"trust record %lu, type %d: write failed: %s\n", 561}, - {"trust record %lu: delete failed: %s\n", 562}, - {"trustdb: sync failed: %s\n", 563}, - {"error reading dir record for LID %lu: %s\n", 564}, - {"lid %lu: expected dir record, got type %d\n", 565}, - {"no primary key for LID %lu\n", 566}, - {"error reading primary key for LID %lu: %s\n", 567}, - {"get_dir_record: search_record failed: %s\n", 568}, - {"NOTE: secret key %08lX is NOT protected.\n", 569}, - {"key %08lX: secret key without public key - skipped\n", 570}, - {"key %08lX: secret and public key don't match\n", 571}, - {"key %08lX: can't put it into the trustdb\n", 572}, - {"key %08lX: query record failed\n", 573}, - {"key %08lX: already in trusted key table\n", 574}, - {"key %08lX: accepted as trusted key.\n", 575}, - {"enumerate secret keys failed: %s\n", 576}, - {"tdbio_search_sdir failed: %s\n", 577}, - {"key %08lX.%lu: Good subkey binding\n", 578}, - {"key %08lX.%lu: Invalid subkey binding: %s\n", 579}, - {"key %08lX.%lu: Valid key revocation\n", 580}, - {"key %08lX.%lu: Invalid key revocation: %s\n", 581}, - {"key %08lX.%lu: Valid subkey revocation\n", 582}, - {"Good self-signature", 583}, - {"Invalid self-signature", 584}, - {"Valid user ID revocation skipped due to a newer self signature", 585}, - {"Valid user ID revocation", 586}, - {"Invalid user ID revocation", 587}, - {"Valid certificate revocation", 588}, - {"Good certificate", 589}, - {"Invalid certificate revocation", 590}, - {"Invalid certificate", 591}, - {"sig record %lu[%d] points to wrong record.\n", 592}, - {"duplicated certificate - deleted", 593}, - {"tdbio_search_dir failed: %s\n", 594}, - {"lid ?: insert failed: %s\n", 595}, - {"lid %lu: insert failed: %s\n", 596}, - {"lid %lu: inserted\n", 597}, - {"error reading dir record: %s\n", 598}, - {"%lu keys processed\n", 599}, - {"\t%lu keys with errors\n", 600}, - {"\t%lu keys inserted\n", 601}, - {"enumerate keyblocks failed: %s\n", 602}, - {"lid %lu: dir record w/o key - skipped\n", 603}, - {"\t%lu keys skipped\n", 604}, - {"\t%lu keys updated\n", 605}, - {"Ooops, no keys\n", 606}, - {"Ooops, no user ids\n", 607}, - {"check_trust: search dir record failed: %s\n", 608}, - {"key %08lX: insert trust record failed: %s\n", 609}, - {"key %08lX.%lu: inserted into trustdb\n", 610}, - {"key %08lX.%lu: created in future (time warp or clock problem)\n", 611}, - {"key %08lX.%lu: expired at %s\n", 612}, - {"key %08lX.%lu: trust check failed: %s\n", 613}, - {"user '%s' not found: %s\n", 614}, - {"problem finding '%s' in trustdb: %s\n", 615}, - {"user '%s' not in trustdb - inserting\n", 616}, - {"failed to put '%s' into trustdb: %s\n", 617}, - {"WARNING: can't yet handle long pref records\n", 618}, - {"%s: can't create keyring: %s\n", 619}, - {"%s: keyring created\n", 620}, - {"WARNING: 2 files with confidential information exists.\n", 621}, - {"%s is the unchanged one\n", 622}, - {"%s is the new one\n", 623}, - {"Please fix this possible security flaw\n", 624}, - {"key is not flagged as insecure - can't use it with the faked RNG!\n", 625}, - {"skipped `%s': %s\n", 626}, +user: \"", 510}, + {"%u-bit %s key, ID %08lX, created %s", 511}, + {" (main key ID %08lX)", 512}, + {"can't query password in batchmode\n", 513}, + {"Enter passphrase: ", 514}, + {"Repeat passphrase: ", 515}, + {"data not saved; use option \"--output\" to save it\n", 516}, + {"Please enter name of data file: ", 517}, + {"reading stdin ...\n", 518}, + {"can't open signed data `%s'\n", 519}, + {"anonymous receiver; trying secret key %08lX ...\n", 520}, + {"okay, we are the anonymous recipient.\n", 521}, + {"old encoding of the DEK is not supported\n", 522}, + {"NOTE: cipher algorithm %d not found in preferences\n", 523}, + {"protection algorithm %d is not supported\n", 524}, + {"Invalid passphrase; please try again ...\n", 525}, + {"WARNING: Weak key detected - please change passphrase again.\n", 526}, + {"assuming bad MDC due to an unknown critical bit\n", 527}, + {"\ +this is a PGP generated ElGamal key which is NOT secure for signatures!\n", 528}, + {"public key is %lu second newer than the signature\n", 529}, + {"public key is %lu seconds newer than the signature\n", 530}, + {"NOTE: signature key expired %s\n", 531}, + {"assuming bad signature due to an unknown critical bit\n", 532}, + {"%s signature from: %s\n", 533}, + {"can't create %s: %s\n", 534}, + {"signing:", 535}, + {"WARNING: `%s' is an empty file\n", 536}, + {"can't handle text lines longer than %d characters\n", 537}, + {"input line longer than %d characters\n", 538}, + {"trustdb rec %lu: lseek failed: %s\n", 539}, + {"trustdb rec %lu: write failed (n=%d): %s\n", 540}, + {"trustdb transaction too large\n", 541}, + {"%s: can't access: %s\n", 542}, + {"%s: can't create directory: %s\n", 543}, + {"%s: directory created\n", 544}, + {"%s: directory does not exist!\n", 545}, + {"%s: can't create: %s\n", 546}, + {"%s: can't create lock\n", 547}, + {"%s: failed to create version record: %s", 548}, + {"%s: invalid trustdb created\n", 549}, + {"%s: trustdb created\n", 550}, + {"%s: invalid trustdb\n", 551}, + {"%s: failed to create hashtable: %s\n", 552}, + {"%s: error updating version record: %s\n", 553}, + {"%s: error reading version record: %s\n", 554}, + {"%s: error writing version record: %s\n", 555}, + {"trustdb: lseek failed: %s\n", 556}, + {"trustdb: read failed (n=%d): %s\n", 557}, + {"%s: not a trustdb file\n", 558}, + {"%s: version record with recnum %lu\n", 559}, + {"%s: invalid file version %d\n", 560}, + {"%s: error reading free record: %s\n", 561}, + {"%s: error writing dir record: %s\n", 562}, + {"%s: failed to zero a record: %s\n", 563}, + {"%s: failed to append a record: %s\n", 564}, + {"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n", 565}, + {"trust record %lu, req type %d: read failed: %s\n", 566}, + {"trust record %lu, type %d: write failed: %s\n", 567}, + {"trust record %lu: delete failed: %s\n", 568}, + {"trustdb: sync failed: %s\n", 569}, + {"error reading dir record for LID %lu: %s\n", 570}, + {"lid %lu: expected dir record, got type %d\n", 571}, + {"no primary key for LID %lu\n", 572}, + {"error reading primary key for LID %lu: %s\n", 573}, + {"get_dir_record: search_record failed: %s\n", 574}, + {"NOTE: secret key %08lX is NOT protected.\n", 575}, + {"key %08lX: secret key without public key - skipped\n", 576}, + {"key %08lX: secret and public key don't match\n", 577}, + {"key %08lX: can't put it into the trustdb\n", 578}, + {"key %08lX: query record failed\n", 579}, + {"key %08lX: already in trusted key table\n", 580}, + {"key %08lX: accepted as trusted key.\n", 581}, + {"enumerate secret keys failed: %s\n", 582}, + {"tdbio_search_sdir failed: %s\n", 583}, + {"key %08lX.%lu: Good subkey binding\n", 584}, + {"key %08lX.%lu: Invalid subkey binding: %s\n", 585}, + {"key %08lX.%lu: Valid key revocation\n", 586}, + {"key %08lX.%lu: Invalid key revocation: %s\n", 587}, + {"key %08lX.%lu: Valid subkey revocation\n", 588}, + {"Good self-signature", 589}, + {"Invalid self-signature", 590}, + {"Valid user ID revocation skipped due to a newer self signature", 591}, + {"Valid user ID revocation", 592}, + {"Invalid user ID revocation", 593}, + {"Valid certificate revocation", 594}, + {"Good certificate", 595}, + {"Invalid certificate revocation", 596}, + {"Invalid certificate", 597}, + {"sig record %lu[%d] points to wrong record.\n", 598}, + {"duplicated certificate - deleted", 599}, + {"tdbio_search_dir failed: %s\n", 600}, + {"lid ?: insert failed: %s\n", 601}, + {"lid %lu: insert failed: %s\n", 602}, + {"lid %lu: inserted\n", 603}, + {"error reading dir record: %s\n", 604}, + {"%lu keys processed\n", 605}, + {"\t%lu keys with errors\n", 606}, + {"\t%lu keys inserted\n", 607}, + {"enumerate keyblocks failed: %s\n", 608}, + {"lid %lu: dir record w/o key - skipped\n", 609}, + {"\t%lu keys skipped\n", 610}, + {"\t%lu keys updated\n", 611}, + {"Ooops, no keys\n", 612}, + {"Ooops, no user ids\n", 613}, + {"check_trust: search dir record failed: %s\n", 614}, + {"key %08lX: insert trust record failed: %s\n", 615}, + {"key %08lX.%lu: inserted into trustdb\n", 616}, + {"key %08lX.%lu: created in future (time warp or clock problem)\n", 617}, + {"key %08lX.%lu: expired at %s\n", 618}, + {"key %08lX.%lu: trust check failed: %s\n", 619}, + {"user '%s' not found: %s\n", 620}, + {"problem finding '%s' in trustdb: %s\n", 621}, + {"user '%s' not in trustdb - inserting\n", 622}, + {"failed to put '%s' into trustdb: %s\n", 623}, + {"WARNING: can't yet handle long pref records\n", 624}, + {"%s: can't create keyring: %s\n", 625}, + {"%s: keyring created\n", 626}, + {"WARNING: 2 files with confidential information exists.\n", 627}, + {"%s is the unchanged one\n", 628}, + {"%s is the new one\n", 629}, + {"Please fix this possible security flaw\n", 630}, + {"key is not flagged as insecure - can't use it with the faked RNG!\n", 631}, + {"skipped `%s': %s\n", 632}, {"\ skipped `%s': this is a PGP generated ElGamal key which is not secure for \ -signatures!\n", 627}, - {"File `%s' exists. ", 628}, - {"Overwrite (y/N)? ", 629}, - {"%s: unknown suffix\n", 630}, - {"Enter new filename", 631}, - {"writing to stdout\n", 632}, - {"assuming signed data in `%s'\n", 633}, - {"%s: new options file created\n", 634}, - {"%s encrypted data\n", 635}, - {"encrypted with unknown algorithm %d\n", 636}, - {"\ -WARNING: message was encrypted with a weak key in the symmetric cipher.\n", 637}, - {"weak key created - retrying\n", 638}, - {"cannot avoid weak key for symmetric cipher; tried %d times!\n", 639}, - {"edit_ownertrust.value", 640}, - {"revoked_key.override", 641}, - {"untrusted_key.override", 642}, - {"pklist.user_id.enter", 643}, - {"keygen.algo", 644}, - {"keygen.algo.elg_se", 645}, - {"keygen.size", 646}, - {"keygen.size.huge.okay", 647}, - {"keygen.size.large.okay", 648}, - {"keygen.valid", 649}, - {"keygen.valid.okay", 650}, - {"keygen.name", 651}, - {"keygen.email", 652}, - {"keygen.comment", 653}, - {"keygen.userid.cmd", 654}, - {"keygen.sub.okay", 655}, - {"sign_uid.okay", 656}, - {"change_passwd.empty.okay", 657}, - {"keyedit.save.okay", 658}, - {"keyedit.cancel.okay", 659}, - {"keyedit.sign_all.okay", 660}, - {"keyedit.remove.uid.okay", 661}, - {"keyedit.remove.subkey.okay", 662}, - {"keyedit.delsig.valid", 663}, - {"keyedit.delsig.unknown", 664}, - {"keyedit.delsig.invalid", 665}, - {"keyedit.delsig.selfsig", 666}, - {"passphrase.enter", 667}, - {"passphrase.repeat", 668}, - {"detached_signature.filename", 669}, - {"openfile.overwrite.okay", 670}, - {"openfile.askoutname", 671}, - {"No help available", 672}, - {"No help available for `%s'", 673}, +signatures!\n", 633}, + {"File `%s' exists. ", 634}, + {"Overwrite (y/N)? ", 635}, + {"%s: unknown suffix\n", 636}, + {"Enter new filename", 637}, + {"writing to stdout\n", 638}, + {"assuming signed data in `%s'\n", 639}, + {"%s: new options file created\n", 640}, + {"%s encrypted data\n", 641}, + {"encrypted with unknown algorithm %d\n", 642}, + {"\ +WARNING: message was encrypted with a weak key in the symmetric cipher.\n", 643}, + {"weak key created - retrying\n", 644}, + {"cannot avoid weak key for symmetric cipher; tried %d times!\n", 645}, + {"edit_ownertrust.value", 646}, + {"revoked_key.override", 647}, + {"untrusted_key.override", 648}, + {"pklist.user_id.enter", 649}, + {"keygen.algo", 650}, + {"keygen.algo.elg_se", 651}, + {"keygen.size", 652}, + {"keygen.size.huge.okay", 653}, + {"keygen.size.large.okay", 654}, + {"keygen.valid", 655}, + {"keygen.valid.okay", 656}, + {"keygen.name", 657}, + {"keygen.email", 658}, + {"keygen.comment", 659}, + {"keygen.userid.cmd", 660}, + {"keygen.sub.okay", 661}, + {"sign_uid.okay", 662}, + {"change_passwd.empty.okay", 663}, + {"keyedit.save.okay", 664}, + {"keyedit.cancel.okay", 665}, + {"keyedit.sign_all.okay", 666}, + {"keyedit.remove.uid.okay", 667}, + {"keyedit.remove.subkey.okay", 668}, + {"keyedit.delsig.valid", 669}, + {"keyedit.delsig.unknown", 670}, + {"keyedit.delsig.invalid", 671}, + {"keyedit.delsig.selfsig", 672}, + {"passphrase.enter", 673}, + {"passphrase.repeat", 674}, + {"detached_signature.filename", 675}, + {"openfile.overwrite.okay", 676}, + {"openfile.askoutname", 677}, + {"No help available", 678}, + {"No help available for `%s'", 679}, }; -int _msg_tbl_length = 673; +int _msg_tbl_length = 679; diff -urN gnupg-0.9.8a/po/de.po gnupg-0.9.8b/po/de.po --- gnupg-0.9.8a/po/de.po Mon Jul 12 15:05:05 1999 +++ gnupg-0.9.8b/po/de.po Wed Jul 14 11:50:44 1999 @@ -3,8 +3,8 @@ # Walter Koch , 1998. msgid "" msgstr "" -"POT-Creation-Date: 1999-07-12 15:04+0200\n" -"PO-Revision-Date: 1999-05-30 21:56+0200\n" +"POT-Creation-Date: 1999-07-14 11:47+0200\n" +"PO-Revision-Date: 1999-07-12 21:56+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "yY" msgstr "jJyY" -#: g10/keyedit.c:561 util/miscutil.c:272 +#: g10/keyedit.c:564 util/miscutil.c:272 msgid "quit" msgstr "quit" @@ -274,7 +274,7 @@ "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte benЖtigt.)\n" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "" "@Commands:\n" " " @@ -282,131 +282,138 @@ "@Befehle:\n" " " -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|[file]|make a signature" msgstr "|[Datei]|Eine Unterschrift erzeugen" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "|[file]|make a clear text signature" msgstr "|[Datei]|Eine Klartextunterschrift erzeugen" -#: g10/g10.c:181 +#: g10/g10.c:184 msgid "make a detached signature" msgstr "Eine abgetrennte Unterschrift erzeugen" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "encrypt data" msgstr "Daten verschlЭsseln" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "encryption only with symmetric cipher" msgstr "Daten symmetrisch verschlЭsseln" -#: g10/g10.c:184 +#: g10/g10.c:187 msgid "store only" msgstr "Nur speichern" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "decrypt data (default)" msgstr "Daten entschlЭsseln (Voreinstellung)" -#: g10/g10.c:186 +#: g10/g10.c:189 msgid "verify a signature" msgstr "Signatur prЭfen" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "list keys" msgstr "Liste der SchlЭssel" -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "list keys and signatures" msgstr "Liste der SchlЭssel und ihrer Signaturen" -#: g10/g10.c:190 +#: g10/g10.c:193 msgid "check key signatures" msgstr "Signaturen der SchlЭssel prЭfen" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "list keys and fingerprints" msgstr "Liste der SchlЭssel und ihrer \"FingerabdrЭcke\"" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "list secret keys" msgstr "Liste der geheimen SchlЭssel" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "generate a new key pair" msgstr "Ein neues SchlЭsselpaar erzeugen" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "remove key from the public keyring" msgstr "SchlЭssel entfernen" -#: g10/g10.c:195 +#: g10/g10.c:198 +#, fuzzy +msgid "sign a key" +msgstr "Den SchlЭssel signieren" + +#: g10/g10.c:199 +#, fuzzy +msgid "sign a key locally" +msgstr "Den SchlЭssel nur auf diesem Rechner signieren" + +#: g10/g10.c:200 msgid "sign or edit a key" msgstr "Unterschreiben oder Bearbeiten eines SchlЭssels" -#: g10/g10.c:196 +#: g10/g10.c:201 msgid "generate a revocation certificate" msgstr "Ein SchlЭsselwiderruf-Zertifikat erzeugen" -#: g10/g10.c:197 +#: g10/g10.c:202 msgid "export keys" msgstr "SchlЭssel exportieren" -#: g10/g10.c:198 +#: g10/g10.c:203 msgid "export keys to a key server" msgstr "SchlЭssel zu einem SchlЭsselserver exportieren" -#: g10/g10.c:199 +#: g10/g10.c:204 msgid "import keys from a key server" msgstr "SchlЭssel von einem SchlЭsselserver importieren" -#: g10/g10.c:202 +#: g10/g10.c:207 msgid "import/merge keys" msgstr "SchlЭssel importieren/kombinieren" -#: g10/g10.c:204 +#: g10/g10.c:209 msgid "list only the sequence of packets" msgstr "Lediglich die Struktur der Datenpakete anzeigen" -#: g10/g10.c:206 +#: g10/g10.c:211 msgid "export the ownertrust values" msgstr "Exportieren der \"Owner trust\" Werte" -#: g10/g10.c:208 +#: g10/g10.c:213 msgid "import ownertrust values" msgstr "Importieren der \"Owner trust\" Werte" -#: g10/g10.c:210 -msgid "|[NAMES]|update the trust database" +#: g10/g10.c:215 +#, fuzzy +msgid "update the trust database" msgstr "|[NAMEN]|дndern der \"Trust\"-Datenbank" -#: g10/g10.c:212 +#: g10/g10.c:217 msgid "|[NAMES]|check the trust database" msgstr "|[NAMEN]|эberprЭfen der \"Trust\"-Datenbank" -#: g10/g10.c:213 +#: g10/g10.c:218 msgid "fix a corrupted trust database" msgstr "Reparieren einer beschДdigten \"Trust\"-Datenbank" -#: g10/g10.c:214 +#: g10/g10.c:219 msgid "De-Armor a file or stdin" msgstr "Datei oder stdin von der ASCII-HЭlle befreien" -#: g10/g10.c:215 +#: g10/g10.c:220 msgid "En-Armor a file or stdin" msgstr "Datei oder stdin in eine ASCII-HЭlle einpacken" -#: g10/g10.c:216 +#: g10/g10.c:221 msgid "|algo [files]|print message digests" msgstr "|algo [Dateien]|Message-Digests fЭr die Dateien ausgeben" -#: g10/g10.c:217 -msgid "print all message digests" -msgstr "Message-Digests fЭr die Eingabedaten ausgeben" - -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "" "@\n" "Options:\n" @@ -416,160 +423,171 @@ "Optionen:\n" " " -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-HЭlle versehen" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "|NAME|encrypt for NAME" msgstr "|NAME|VerschlЭsseln fЭr NAME" -#: g10/g10.c:230 +#: g10/g10.c:231 +#, fuzzy +msgid "|NAME|use NAME as default recipient" +msgstr "|NAME|NAME als voreingestellten SchlЭssel benutzen" + +#: g10/g10.c:233 +msgid "use the default key as default recipient" +msgstr "" + +#: g10/g10.c:237 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:231 +#: g10/g10.c:238 msgid "|N|set compress level N (0 disables)" msgstr "Kompressionsstufe auf N setzen (0=keine Kompr.)" -#: g10/g10.c:233 +#: g10/g10.c:240 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:234 +#: g10/g10.c:241 msgid "use as output file" msgstr "Als Ausgabedatei benutzen" -#: g10/g10.c:235 +#: g10/g10.c:242 msgid "verbose" msgstr "Detaillierte Informationen" -#: g10/g10.c:236 +#: g10/g10.c:243 msgid "be somewhat more quiet" msgstr "Etwas weniger Infos" -#: g10/g10.c:237 +#: g10/g10.c:244 msgid "don't use the terminal at all" -msgstr "" +msgstr "das Terminal gar nicht benutzen" -#: g10/g10.c:238 +#: g10/g10.c:245 msgid "force v3 signatures" msgstr "v3 Signaturen erzwingen" -#: g10/g10.c:239 +#: g10/g10.c:246 msgid "always use a MDC for encryption" msgstr "Beim VerschlЭsseln ein Siegel (MDC) verwenden" -#: g10/g10.c:240 +#: g10/g10.c:247 msgid "do not make any changes" msgstr "Keine wirklichen дnderungen durchfЭhren" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:242 +#: g10/g10.c:249 msgid "batch mode: never ask" msgstr "Stapelmodus: Keine Abfragen" -#: g10/g10.c:243 +#: g10/g10.c:250 msgid "assume yes on most questions" msgstr "\"Ja\" als Standardantwort annehmen" -#: g10/g10.c:244 +#: g10/g10.c:251 msgid "assume no on most questions" msgstr "\"Nein\" als Standardantwort annehmen" -#: g10/g10.c:245 +#: g10/g10.c:252 msgid "add this keyring to the list of keyrings" msgstr "Als Жffentlichen SchlЭsselbund mitbenutzen" -#: g10/g10.c:246 +#: g10/g10.c:253 msgid "add this secret keyring to the list" msgstr "Als geheimen SchlЭsselbund mitbenutzen" -#: g10/g10.c:247 +#: g10/g10.c:254 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|NAME als voreingestellten SchlЭssel benutzen" -#: g10/g10.c:248 +#: g10/g10.c:255 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|SchlЭssel bei diesem Server nachschlagen" -#: g10/g10.c:249 +#: g10/g10.c:256 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|Terminalzeichensatz NAME benutzen" -#: g10/g10.c:250 +#: g10/g10.c:257 msgid "read options from file" msgstr "Optionen aus der Datei lesen" -#: g10/g10.c:252 +#: g10/g10.c:259 msgid "set debugging flags" msgstr "Debug-Flags einschalten" -#: g10/g10.c:253 +#: g10/g10.c:260 msgid "enable full debugging" msgstr "Alle Debug-Flags einschalten" -#: g10/g10.c:254 +#: g10/g10.c:261 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben" -#: g10/g10.c:255 +#: g10/g10.c:262 msgid "do not write comment packets" msgstr "Keine Kommentarpakete schreiben" -#: g10/g10.c:256 +#: g10/g10.c:263 msgid "(default is 1)" msgstr "BenЖtigte Vollvertrauen (Voreinstellung 1)" -#: g10/g10.c:257 +#: g10/g10.c:264 msgid "(default is 3)" msgstr "BenЖtigte Teilvertrauen (Voreinstellung 3)" -#: g10/g10.c:259 +#: g10/g10.c:266 msgid "|FILE|load extension module FILE" msgstr "|DATEI|Erweiterungsmodul DATEI laden" -#: g10/g10.c:260 +#: g10/g10.c:267 msgid "emulate the mode described in RFC1991" msgstr "Den in RFC1991 beschriebenen Modus nachahmen" -#: g10/g10.c:261 +#: g10/g10.c:268 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" +"alle Paket-, VerschlЭsselungs- und Hashoptionen auf OpenPGP-Verhalten " +"einstellen" -#: g10/g10.c:262 +#: g10/g10.c:269 msgid "|N|use passphrase mode N" msgstr "|N|Verwenden des Mantra-Modus N" -#: g10/g10.c:264 +#: g10/g10.c:271 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|Das Hashverfahren NAME fЭr Mantras benutzen" -#: g10/g10.c:266 +#: g10/g10.c:273 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|Das VerschlЭ.verfahren NAME fЭr Mantras benutzen" -#: g10/g10.c:267 +#: g10/g10.c:274 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|Das VerschlЭ.verfahren NAME benutzen" -#: g10/g10.c:268 +#: g10/g10.c:275 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|Das Hashverfahren NAME benutzen" -#: g10/g10.c:269 +#: g10/g10.c:276 msgid "|N|use compress algorithm N" msgstr "|N|Die Komprimierverfahren N benutzen" -#: g10/g10.c:270 +#: g10/g10.c:277 msgid "throw keyid field of encrypted packets" msgstr "Entferne die Absender-ID verschlЭsselter Pakete" -#: g10/g10.c:271 +#: g10/g10.c:278 msgid "|NAME=VALUE|use this notation data" msgstr "|NAME=WERT|verwende diese \"notation\"-Daten" -#: g10/g10.c:273 +#: g10/g10.c:280 msgid "" "@\n" "Examples:\n" @@ -589,15 +607,15 @@ " --list-keys [Namen] SchlЭssel anzeigen\n" " --fingerprint [Namen] \"FingerabdrЭcke\" anzeigen\n" -#: g10/g10.c:353 +#: g10/g10.c:360 msgid "Please report bugs to .\n" msgstr "Berichte Эber Bugs (Programmfehler) bitte an .\n" -#: g10/g10.c:357 +#: g10/g10.c:364 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h fЭr Hilfe)" -#: g10/g10.c:360 +#: g10/g10.c:367 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -607,7 +625,7 @@ "Signieren, prЭfen, verschlЭsseln, entschlЭsseln\n" "Die voreingestellte Operation ist abhДngig von den Eingabedaten\n" -#: g10/g10.c:365 +#: g10/g10.c:372 msgid "" "\n" "Supported algorithms:\n" @@ -615,161 +633,173 @@ "\n" "UnterstЭtzte Verfahren:\n" -#: g10/g10.c:439 +#: g10/g10.c:446 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:492 +#: g10/g10.c:499 msgid "conflicting commands\n" msgstr "WidersprЭchliche Befehle\n" -#: g10/g10.c:626 +#: g10/g10.c:633 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:630 +#: g10/g10.c:637 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:637 +#: g10/g10.c:644 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:805 +#: g10/g10.c:824 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gЭltiger Zeichensatz.\n" -#: g10/g10.c:852 g10/g10.c:864 +#: g10/g10.c:872 g10/g10.c:884 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewДhlte VerschlЭsslungsverfahren ist ungЭltig\n" -#: g10/g10.c:858 g10/g10.c:870 +#: g10/g10.c:878 g10/g10.c:890 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewДhlte Hashverfahren ist ungЭltig\n" -#: g10/g10.c:874 +#: g10/g10.c:894 msgid "the given policy URL is invalid\n" msgstr "Die angegebene URL fЭr Richtlinien ist ungЭltig\n" -#: g10/g10.c:877 +#: g10/g10.c:897 #, 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:879 +#: g10/g10.c:899 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed mЭssen grЖъer als 0 sein\n" -#: g10/g10.c:881 +#: g10/g10.c:901 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed mЭssen grЖъer als 1 sein\n" -#: g10/g10.c:883 +#: g10/g10.c:903 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:886 +#: g10/g10.c:906 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:890 +#: g10/g10.c:910 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:967 +#: g10/g10.c:987 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:973 +#: g10/g10.c:993 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:980 +#: g10/g10.c:1000 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:988 +#: g10/g10.c:1008 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:1001 +#: g10/g10.c:1021 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:1014 +#: g10/g10.c:1034 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:1028 +#: g10/g10.c:1048 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:1040 +#: g10/g10.c:1060 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:1049 -msgid "--edit-key username [commands]" +#: g10/g10.c:1068 +msgid "--sign-key user-id" +msgstr "" + +#: g10/g10.c:1076 +#, fuzzy +msgid "--lsign-key user-id" +msgstr "--delete-key Benutzername" + +#: g10/g10.c:1084 +#, fuzzy +msgid "--edit-key user-id [commands]" msgstr "--edit-key Username [Befehle]" -#: g10/g10.c:1063 -msgid "--delete-secret-key username" +#: g10/g10.c:1100 +#, fuzzy +msgid "--delete-secret-key user-id" msgstr "--delete-secret-key Username" -#: g10/g10.c:1066 -msgid "--delete-key username" +#: g10/g10.c:1103 +#, fuzzy +msgid "--delete-key user-id" msgstr "--delete-key Benutzername" -#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366 +#: g10/encode.c:231 g10/g10.c:1127 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:1101 +#: g10/g10.c:1138 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [Benutzername] [Keyring]" -#: g10/g10.c:1162 +#: g10/g10.c:1199 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-HЭlle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1170 +#: g10/g10.c:1207 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-HЭlle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1236 +#: g10/g10.c:1275 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "UngЭltiges Hashverfahren '%s'\n" -#: g10/g10.c:1317 +#: g10/g10.c:1356 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:1321 +#: g10/g10.c:1360 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "'%s' kann nicht geЖffnet werden\n" -#: g10/g10.c:1493 +#: g10/g10.c:1532 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:1499 +#: g10/g10.c:1538 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -777,12 +807,12 @@ "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " "enthalten und muъ mit einem '=' enden\n" -#: g10/g10.c:1505 +#: g10/g10.c:1544 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:1513 +#: g10/g10.c:1552 msgid "a notation value must not use any control characters\n" msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" @@ -861,7 +891,13 @@ "\"quoted printable\" Zeichen in der ASCII-HЭlle gefunden - mЖglicherweise\n" " war ein fehlerhafter E-Mail-Transporter(\"MTA\") die Ursache\n" -#: g10/pkclist.c:137 +# valid user replies (not including 1..4) +#. a string with valid answers +#: g10/pkclist.c:140 +msgid "sSmMqQ" +msgstr "sSmMqQ" + +#: g10/pkclist.c:144 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -870,7 +906,7 @@ "Es ist kein \"Owner trust\" fЭr %lu definiert:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:147 +#: g10/pkclist.c:154 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -893,29 +929,23 @@ " 4 = Ich vertraue ihm vollstДndig\n" " s = Bitte weitere Information anzeigen\n" -#: g10/pkclist.c:156 +#: g10/pkclist.c:163 msgid " m = back to the main menu\n" msgstr " m = ZurЭck zum MenЭ\n" -#: g10/pkclist.c:158 +#: g10/pkclist.c:165 msgid " q = quit\n" msgstr " q = verlassen\n" -# valid user replies (not including 1..4) -#. a string with valid answers -#: g10/pkclist.c:163 -msgid "sSmMqQ" -msgstr "sSmMqQ" - -#: g10/pkclist.c:167 +#: g10/pkclist.c:171 msgid "Your decision? " msgstr "Ihre Auswahl? " -#: g10/pkclist.c:187 +#: g10/pkclist.c:193 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Zertifikate fЭhren zu einem letztlich vertrauenswЭrdigen SchlЭssel:\n" -#: g10/pkclist.c:256 +#: g10/pkclist.c:264 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" @@ -926,7 +956,7 @@ "ermitteln kЖnnen.\n" "\n" -#: g10/pkclist.c:262 +#: g10/pkclist.c:270 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -934,7 +964,7 @@ "Kein Pfad fЭhrt zu einen unserer SchlЭsseln.\n" "\n" -#: g10/pkclist.c:264 +#: g10/pkclist.c:272 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -942,7 +972,7 @@ "Keine Zertifikate mit undefinierten Vertrauen gefunden.\n" "\n" -#: g10/pkclist.c:266 +#: g10/pkclist.c:274 msgid "" "No trust values changed.\n" "\n" @@ -950,38 +980,38 @@ "Keine \"trust\" Werte geДndert.\n" "\n" -#: g10/pkclist.c:283 +#: g10/pkclist.c:291 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "SchlЭssel %08lX: SchlЭssel wurde widerrufen\n" -#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405 +#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413 msgid "Use this key anyway? " msgstr "Diesen SchlЭssel trotzdem benutzen?" -#: g10/pkclist.c:293 +#: g10/pkclist.c:301 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "SchlЭssel %08lX: UnterschlЭssel wurde widerrufen\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:331 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: SchlЭssel ist verfallen!\n" -#: g10/pkclist.c:329 +#: g10/pkclist.c:337 #, 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:343 +#: g10/pkclist.c:351 #, 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:349 +#: g10/pkclist.c:357 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -990,18 +1020,18 @@ "%08lX: Es ist nicht sicher, daъ dieser SchlЭssel wirklich dem vorgeblichen\n" "Besitzer gehЖrt, aber er wird trotzdem akzeptiert\n" -#: g10/pkclist.c:355 +#: g10/pkclist.c:363 msgid "This key probably belongs to the owner\n" msgstr "" "Dieser SchlЭssel gehЖrt hЖchstwahrscheinlich dem angegebenen Besitzer\n" -#: g10/pkclist.c:360 +#: g10/pkclist.c:368 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:400 +#: g10/pkclist.c:408 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" @@ -1012,69 +1042,69 @@ "Wenn Sie *wirklich* wissen, was Sie tun, kЖnnen Sie die nДchste\n" "Frage mit ja beantworten\n" -#: g10/pkclist.c:413 g10/pkclist.c:435 +#: g10/pkclist.c:421 g10/pkclist.c:443 msgid "WARNING: Using untrusted key!\n" msgstr "WARNUNG: Ein SchlЭssel ohne gesichertes Vertrauen wird benutzt!\n" -#: g10/pkclist.c:456 +#: g10/pkclist.c:464 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:457 +#: g10/pkclist.c:465 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:461 +#: g10/pkclist.c:469 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:482 +#: g10/pkclist.c:490 msgid "Note: This key has expired!\n" msgstr "Hinweis: Dieser SchlЭssel ist verfallen!\n" -#: g10/pkclist.c:489 +#: g10/pkclist.c:497 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:491 +#: g10/pkclist.c:499 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:507 +#: g10/pkclist.c:515 msgid "WARNING: We do NOT trust this key!\n" msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem SchlЭssel!\n" -#: g10/pkclist.c:508 +#: g10/pkclist.c:516 msgid " The signature is probably a FORGERY.\n" msgstr " Die Signatur ist wahrscheinlich eine FдLSCHUNG.\n" -#: g10/pkclist.c:515 +#: g10/pkclist.c:523 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:518 +#: g10/pkclist.c:526 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:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715 +#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: Эbersprungen: %s\n" -#: g10/pkclist.c:590 g10/pkclist.c:697 -#, fuzzy, c-format +#: g10/pkclist.c:635 g10/pkclist.c:785 +#, c-format msgid "%s: skipped: public key already present\n" -msgstr "%s: SchlЭsselblock Leseproblem: %s\n" +msgstr "%s: Эbersprungen: Жffentlicher SchlЭssel bereits vorhanden\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:662 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1082,30 +1112,34 @@ "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n" "\n" -#: g10/pkclist.c:618 +#: g10/pkclist.c:672 msgid "Enter the user ID: " msgstr "Geben Sie die User-ID ein: " -#: g10/pkclist.c:629 +#: g10/pkclist.c:684 msgid "No such user ID.\n" msgstr "Keine solche User-ID vorhanden.\n" -#: g10/pkclist.c:639 +#: g10/pkclist.c:704 #, fuzzy msgid "Public key is disabled.\n" msgstr "жffentlicher SchlЭssel ist %08lX\n" -#: g10/pkclist.c:678 +#: g10/pkclist.c:733 +msgid "unknown default recipient `s'\n" +msgstr "" + +#: g10/pkclist.c:766 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: Fehler beim PrЭfen des SchlЭssels: %s\n" -#: g10/pkclist.c:683 +#: g10/pkclist.c:771 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "%s: SchlЭsselblock Leseproblem: %s\n" +msgstr "%s: Эbersprungen: Жffentlicher SchlЭssel bereits vorhanden\n" -#: g10/pkclist.c:721 +#: g10/pkclist.c:809 msgid "no valid addressees\n" msgstr "Keine gЭltigen Adressaten\n" @@ -1388,7 +1422,6 @@ msgstr "Der DSA SchlЭssel wird 1024 Bits haben.\n" #: g10/keygen.c:871 -#, fuzzy msgid "Key generation canceled.\n" msgstr "SchlЭsselerzeugung abgebrochen.\n" @@ -1499,241 +1532,241 @@ msgstr "" "der ZweitschlЭssel %08lX wird anstelle des HauptschlЭssels %08lX verwendet\n" -#: g10/import.c:116 +#: g10/import.c:117 #, c-format msgid "can't open `%s': %s\n" msgstr "'%s' kann nicht geЖffnet werden: %s\n" -#: g10/import.c:160 +#: g10/import.c:161 #, c-format msgid "skipping block of type %d\n" msgstr "Эberspringe den Block vom Typ %d\n" -#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697 +#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu SchlЭssel bislang bearbeitet\n" -#: g10/import.c:172 +#: g10/import.c:173 #, c-format msgid "error reading `%s': %s\n" msgstr "Fehler beim Lesen von `%s': %s\n" -#: g10/import.c:175 +#: g10/import.c:176 #, c-format msgid "Total number processed: %lu\n" msgstr "Anzahl insgesamt bearbeiteter SchlЭssel: %lu\n" -#: g10/import.c:177 +#: g10/import.c:178 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ohne User-ID: %lu\n" -#: g10/import.c:179 +#: g10/import.c:180 #, c-format msgid " imported: %lu" msgstr " importiert: %lu" -#: g10/import.c:185 +#: g10/import.c:186 #, c-format msgid " unchanged: %lu\n" msgstr " unverДndert: %lu\n" -#: g10/import.c:187 +#: g10/import.c:188 #, c-format msgid " new user IDs: %lu\n" msgstr " neue User-IDs: %lu\n" -#: g10/import.c:189 +#: g10/import.c:190 #, c-format msgid " new subkeys: %lu\n" msgstr " neue UnterschlЭssel: %lu\n" -#: g10/import.c:191 +#: g10/import.c:192 #, c-format msgid " new signatures: %lu\n" msgstr " neue Signaturen: %lu\n" -#: g10/import.c:193 +#: g10/import.c:194 #, c-format msgid " new key revocations: %lu\n" msgstr "neue SchlЭsselwiderrufe: %lu\n" -#: g10/import.c:195 +#: g10/import.c:196 #, c-format msgid " secret keys read: %lu\n" msgstr " gelesene geheime Schl.: %lu\n" -#: g10/import.c:197 +#: g10/import.c:198 #, c-format msgid " secret keys imported: %lu\n" msgstr "geheime SchlЭssel importiert: %lu\n" -#: g10/import.c:199 +#: g10/import.c:200 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " unverДnderte geh.Schl.: %lu\n" -#: g10/import.c:342 g10/import.c:526 +#: g10/import.c:361 g10/import.c:550 #, c-format msgid "key %08lX: no user id\n" msgstr "SchlЭssel %08lX: Keine User-ID\n" -#: g10/import.c:353 +#: g10/import.c:372 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "SchlЭssel %08lX: Keine gЭltigen User-IDs\n" -#: g10/import.c:355 +#: g10/import.c:374 msgid "this may be caused by a missing self-signature\n" msgstr "dies kЖnnte durch fehlende Eigenbeglaubigung verursacht worden sein\n" -#: g10/import.c:366 g10/import.c:593 +#: g10/import.c:385 g10/import.c:617 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "SchlЭssel %08lX: жffentlicher SchlЭssel nicht gefunden: %s\n" -#: g10/import.c:372 +#: g10/import.c:391 msgid "no default public keyring\n" msgstr "Kein voreingestellter Жffentlicher SchlЭsselbund\n" -#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "Schreiben nach '%s'\n" -#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642 +#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666 #, c-format msgid "can't lock keyring `%s': %s\n" msgstr "kann SchlЭsselbund `%s' nicht sperren: %s\n" -#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "Fehler beim Schreiben des SchlЭsselbundes `%s': %s\n" -#: g10/import.c:387 +#: g10/import.c:406 #, c-format msgid "key %08lX: public key imported\n" msgstr "SchlЭssel %08lX: жffentlicher SchlЭssel importiert\n" -#: g10/import.c:399 +#: g10/import.c:423 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "SchlЭssel %08lX: Stimmt nicht mit unserer Kopie Эberein\n" -#: g10/import.c:408 g10/import.c:601 +#: g10/import.c:432 g10/import.c:625 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "" "SchlЭssel %08lX: der lokale originale SchlЭsselblocks wurde nicht gefunden: " "%s\n" -#: g10/import.c:414 g10/import.c:607 +#: g10/import.c:438 g10/import.c:631 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "" "SchlЭssel %08lX: Lesefehler im lokalen originalen SchlЭsselblocks: %s\n" -#: g10/import.c:441 +#: g10/import.c:465 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "SchlЭssel %08lX: 1 neue User-ID\n" -#: g10/import.c:444 +#: g10/import.c:468 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "SchlЭssel %08lX: %d neue User-IDs\n" -#: g10/import.c:447 +#: g10/import.c:471 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "SchlЭssel %08lX: 1 neue Signatur\n" -#: g10/import.c:450 +#: g10/import.c:474 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "SchlЭssel %08lX: %d neue Signaturen\n" -#: g10/import.c:453 +#: g10/import.c:477 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "SchlЭssel %08lX: 1 neuer UnterschlЭssel\n" -#: g10/import.c:456 +#: g10/import.c:480 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "SchlЭssel %08lX: %d neue UnterschlЭssel\n" -#: g10/import.c:466 +#: g10/import.c:490 #, c-format msgid "key %08lX: not changed\n" msgstr "SchlЭssel %08lX: Nicht geДndert\n" -#: g10/import.c:549 +#: g10/import.c:573 #, c-format msgid "key %08lX: secret key imported\n" msgstr "SchlЭssel %08lX: Geheimer SchlЭssel importiert\n" #. we can't merge secret keys -#: g10/import.c:553 +#: g10/import.c:577 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "SchlЭssel %08lX: Ist bereits im geheimen SchlЭsselbund\n" -#: g10/import.c:558 +#: g10/import.c:582 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "SchlЭssel %08lX: geheimer SchlЭssel nicht gefunden: %s\n" -#: g10/import.c:587 +#: g10/import.c:611 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "SchlЭssel %08lX: Kein Жffentlicher SchlЭssel - der SchlЭsselwiderruf kann " "nicht angebracht werden\n" -#: g10/import.c:618 +#: g10/import.c:642 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "SchlЭssel %08lX: UngЭltiges Widerrufzertifikat: %s - zurЭckgewiesen\n" -#: g10/import.c:650 +#: g10/import.c:674 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "SchlЭssel %08lX: Widerrufzertifikat importiert\n" -#: g10/import.c:683 +#: g10/import.c:707 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "SchlЭssel %08lX: Keine User-ID fЭr Signatur\n" -#: g10/import.c:690 g10/import.c:714 +#: g10/import.c:714 g10/import.c:738 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "SchlЭssel %08lX: Nicht unterstЭtzetes Public-Key-Verfahren\n" -#: g10/import.c:691 +#: g10/import.c:715 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "SchlЭssel %08lX: UngЭltige Eigenbeglaubigung\n" -#: g10/import.c:706 +#: g10/import.c:730 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "SchlЭssel %08lX: Kein UnterschlЭssel fЭr die SchlЭsselanbindung\n" -#: g10/import.c:715 +#: g10/import.c:739 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "SchlЭssel %08lX: UngЭltige UnterschlЭssel-Anbindung\n" -#: g10/import.c:747 +#: g10/import.c:771 #, c-format msgid "key %08lX: skipped userid '" msgstr "SchlЭssel %08lX: Эbergehe User-ID '" -#: g10/import.c:770 +#: g10/import.c:794 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "SchlЭssel %08lX: UnterschlЭssel ignoriert\n" @@ -1742,32 +1775,32 @@ #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense -#: g10/import.c:795 +#: g10/import.c:819 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "SchlЭssel %08lX: Nicht exportfДhige Unterschrift - Эbergangen\n" -#: g10/import.c:804 +#: g10/import.c:828 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "SchlЭssel %08lX: Widerrufzertifikat an falschem Platz - Эbergangen\n" -#: g10/import.c:812 +#: g10/import.c:836 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "SchlЭssel %08lX: UngЭltiges Widerrufzertifikat: %s - Эbergangen\n" -#: g10/import.c:912 +#: g10/import.c:936 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "SchlЭssel %08lX: Doppelte User-ID entdeckt - zusammengefЭhrt\n" -#: g10/import.c:963 +#: g10/import.c:987 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "SchlЭssel %08lX: Widerrufzertifikat hinzugefЭgt\n" -#: g10/import.c:1076 g10/import.c:1131 +#: g10/import.c:1100 g10/import.c:1155 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "SchlЭssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n" @@ -1853,7 +1886,7 @@ msgid "Really sign? " msgstr "Wirklich unterschreiben? " -#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128 +#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "Beglaubigung fehlgeschlagen: %s\n" @@ -1895,390 +1928,385 @@ msgid "moving a key signature to the correct place\n" msgstr "schiebe eine Beglaubigung an die richtige Stelle\n" -#: g10/keyedit.c:561 +#: g10/keyedit.c:564 msgid "quit this menu" msgstr "MenЭ verlassen" -#: g10/keyedit.c:562 +#: g10/keyedit.c:565 msgid "q" msgstr "q" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save" msgstr "save" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save and quit" msgstr "speichern und MenЭ verlassen" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "help" msgstr "help" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "show this help" msgstr "Diese Hilfe zeigen" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "show fingerprint" msgstr "\"Fingerabdruck\" anzeigen" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list" msgstr "Liste der SchlЭssel" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list key and user ids" msgstr "SchlЭssel und User-ID auflisten" -#: g10/keyedit.c:568 +#: g10/keyedit.c:571 msgid "l" msgstr "l" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "uid" msgstr "uid" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "select user id N" msgstr "User-ID N auswДhlen" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "key" msgstr "key" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "select secondary key N" msgstr "ZweitschlЭssel N auswДhlen" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "check" msgstr "check" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "list signatures" msgstr "Liste der Signaturen" -#: g10/keyedit.c:572 +#: g10/keyedit.c:575 msgid "c" msgstr "c" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign" msgstr "sign" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign the key" msgstr "Den SchlЭssel signieren" -#: g10/keyedit.c:574 +#: g10/keyedit.c:577 msgid "s" msgstr "s" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "sign the key locally" msgstr "Den SchlЭssel nur auf diesem Rechner signieren" -#: g10/keyedit.c:576 +#: g10/keyedit.c:579 msgid "debug" msgstr "debug" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "add a user id" msgstr "Eine User-ID hinzufЭgen" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "delete user id" msgstr "User-ID entfernen" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "add a secondary key" msgstr "Einen ZweitschlЭssel hinzufЭgen" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delete a secondary key" msgstr "Einen ZweitschlЭssel entfernen" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 msgid "delete signatures" msgstr "Signatur entfernen" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "expire" msgstr "expire" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "change the expire date" msgstr "дndern des Verfallsdatums" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle between secret and public key listing" msgstr "Umschalten zwischen Anzeige geheimer und Жffentlicher SchlЭssel" -#: g10/keyedit.c:585 +#: g10/keyedit.c:588 msgid "t" msgstr "t" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "pref" msgstr "pref" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "list preferences" msgstr "Liste der Voreinstellungen" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "change the passphrase" msgstr "Das Mantra Дndern" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "trust" msgstr "trust" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "change the ownertrust" msgstr "Den \"Owner trust\" Дndern" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revoke signatures" msgstr "Signaturen widerrufen" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revoke a secondary key" msgstr "Einen ZweitschlЭssel widerrufen" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 msgid "disable" -msgstr "" +msgstr "disable" -#: g10/keyedit.c:591 -#, fuzzy +#: g10/keyedit.c:594 msgid "disable a key" -msgstr "Falscher SchlЭssel" +msgstr "SchlЭssel abschalten" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 msgid "enable" -msgstr "" +msgstr "enable" -#: g10/keyedit.c:592 -#, fuzzy +#: g10/keyedit.c:595 msgid "enable a key" -msgstr "Falscher SchlЭssel" +msgstr "SchlЭssel anschalten" -#: g10/keyedit.c:611 +#: g10/keyedit.c:614 msgid "can't do that in batchmode\n" msgstr "Dies kann im Batchmodus nicht durchgefЭhrt werden.\n" #. check that they match -#. FIXME: check that they both match -#: g10/keyedit.c:640 +#. fixme: check that they both match +#: g10/keyedit.c:652 msgid "Secret key is available.\n" msgstr "Geheimer SchlЭssel ist vorhanden.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:681 msgid "Command> " msgstr "Befehl> " -#: g10/keyedit.c:696 +#: g10/keyedit.c:711 msgid "Need the secret key to do this.\n" msgstr "Hierzu wird der geheime SchlЭssel benЖtigt.\n" -#: g10/keyedit.c:718 -msgid "Save changes? " -msgstr "дnderungen speichern? " - -#: g10/keyedit.c:721 -msgid "Quit without saving? " -msgstr "Beenden ohne zu speichern? " - -#: g10/keyedit.c:731 -#, c-format -msgid "update failed: %s\n" -msgstr "дnderung fehlgeschlagen: %s\n" - -#: g10/keyedit.c:738 -#, c-format -msgid "update secret failed: %s\n" -msgstr "дnderung des Geheimnisses fehlgeschlagen: %s\n" - -#: g10/keyedit.c:745 -msgid "Key not changed so no update needed.\n" -msgstr "SchlЭssel ist nicht geДndert worden, also ist kein Speichern nЖtig.\n" - -#: g10/keyedit.c:748 g10/keyedit.c:807 -#, c-format -msgid "update of trustdb failed: %s\n" -msgstr "дnderung der \"Trust-DB\" fehlgeschlagen: %s\n" - -#: g10/keyedit.c:781 +#: g10/keyedit.c:758 msgid "Really sign all user ids? " msgstr "Wirklich alle User-IDs beglaubigen? " -#: g10/keyedit.c:782 +#: g10/keyedit.c:759 msgid "Hint: Select the user ids to sign\n" msgstr "Tip: WДhlen Sie die User-ID, die beglaubigt werden soll\n" -#: g10/keyedit.c:818 g10/keyedit.c:839 +#: g10/keyedit.c:786 g10/keyedit.c:968 +#, c-format +msgid "update of trustdb failed: %s\n" +msgstr "дnderung der \"Trust-DB\" fehlgeschlagen: %s\n" + +#: g10/keyedit.c:797 g10/keyedit.c:818 msgid "You must select at least one user id.\n" msgstr "Zumindestens eine User-ID muъ ausgewДhlt werden.\n" -#: g10/keyedit.c:820 +#: g10/keyedit.c:799 msgid "You can't delete the last user id!\n" msgstr "Die letzte User-ID kann nicht gelЖscht werden!\n" -#: g10/keyedit.c:823 +#: g10/keyedit.c:802 msgid "Really remove all selected user ids? " msgstr "MЖchten Sie alle ausgewДhlten User-IDs wirklich entfernen? " -#: g10/keyedit.c:824 +#: g10/keyedit.c:803 msgid "Really remove this user id? " msgstr "Diese User-ID wirklich entfernen? " -#: g10/keyedit.c:860 g10/keyedit.c:882 +#: g10/keyedit.c:839 g10/keyedit.c:861 msgid "You must select at least one key.\n" msgstr "Zumindestens ein SchlЭssel muъ ausgewДhlt werden.\n" -#: g10/keyedit.c:864 +#: g10/keyedit.c:843 msgid "Do you really want to delete the selected keys? " msgstr "MЖchten Sie die ausgewДhlten SchlЭssel wirklich entfernen? " -#: g10/keyedit.c:865 +#: g10/keyedit.c:844 msgid "Do you really want to delete this key? " msgstr "MЖchten Sie diesen SchlЭssel wirklich entfernen? " -#: g10/keyedit.c:886 +#: g10/keyedit.c:865 msgid "Do you really want to revoke the selected keys? " msgstr "MЖchten Sie die ausgewДhlten SchlЭssel wirklich widerrufen? " -#: g10/keyedit.c:887 +#: g10/keyedit.c:866 msgid "Do you really want to revoke this key? " msgstr "MЖchten Sie diesen SchlЭssel wirklich wiederrufen? " -#: g10/keyedit.c:949 +#: g10/keyedit.c:932 +msgid "Save changes? " +msgstr "дnderungen speichern? " + +#: g10/keyedit.c:935 +msgid "Quit without saving? " +msgstr "Beenden ohne zu speichern? " + +#: g10/keyedit.c:946 +#, c-format +msgid "update failed: %s\n" +msgstr "дnderung fehlgeschlagen: %s\n" + +#: g10/keyedit.c:953 +#, c-format +msgid "update secret failed: %s\n" +msgstr "дnderung des Geheimnisses fehlgeschlagen: %s\n" + +#: g10/keyedit.c:960 +msgid "Key not changed so no update needed.\n" +msgstr "SchlЭssel ist nicht geДndert worden, also ist kein Speichern nЖtig.\n" + +#: g10/keyedit.c:975 msgid "Invalid command (try \"help\")\n" msgstr "UngЭltiger Befehl (versuchen Sie's mal mit \"help\")\n" -#: g10/keyedit.c:1039 +#: g10/keyedit.c:1065 #, fuzzy msgid "This key has been disabled" msgstr "Hinweis: Dieser SchlЭssel ist verfallen!\n" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:1314 +#: g10/keyedit.c:1340 msgid "Delete this invalid signature? (y/N/q)" msgstr "Diese ungЭltige Beglaubigung entfernen= (j/N/q)" -#: g10/keyedit.c:1318 -#, fuzzy +#: g10/keyedit.c:1344 msgid "Delete this unknown signature? (y/N/q)" -msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)" +msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:1324 +#: g10/keyedit.c:1350 msgid "Really delete this self-signature? (y/N)" msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)" -#: g10/keyedit.c:1338 +#: g10/keyedit.c:1364 #, c-format msgid "Deleted %d signature.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:1339 +#: g10/keyedit.c:1365 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:1342 +#: g10/keyedit.c:1368 msgid "Nothing deleted.\n" msgstr "Nichts entfernt.\n" -#: g10/keyedit.c:1411 +#: g10/keyedit.c:1437 msgid "Please remove selections from the secret keys.\n" msgstr "Bitte entfernen Sie die Auswahl von den geheimen SchlЭsseln.\n" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1443 msgid "Please select at most one secondary key.\n" msgstr "Bitte wДhlen Sie hЖchstens einen ZweitschlЭssel aus.\n" -#: g10/keyedit.c:1421 -#, fuzzy +#: g10/keyedit.c:1447 msgid "Changing expiration time for a secondary key.\n" msgstr "дndern des Verfallsdatums des ZweitschlЭssels.\n" -#: g10/keyedit.c:1423 -#, fuzzy +#: g10/keyedit.c:1449 msgid "Changing expiration time for the primary key.\n" msgstr "дndern des Verfallsdatums des HauptschlЭssels.\n" -#: g10/keyedit.c:1464 +#: g10/keyedit.c:1490 msgid "You can't change the expiration date of a v3 key\n" msgstr "Sie kЖnnen das Verfallsdatum eines v3-SchlЭssels nicht Дndern\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1506 msgid "No corresponding signature in secret ring\n" msgstr "Keine entsprechende Signatur im geheimen SchlЭsselbund\n" -#: g10/keyedit.c:1540 +#: g10/keyedit.c:1566 #, c-format msgid "No user id with index %d\n" msgstr "Keine User-ID mit Index %d\n" -#: g10/keyedit.c:1586 +#: g10/keyedit.c:1612 #, c-format msgid "No secondary key with index %d\n" msgstr "Kein ZweitschlЭssel mit Index %d\n" -#: g10/keyedit.c:1684 +#: g10/keyedit.c:1710 msgid "user ID: \"" msgstr "User-ID: \"" -#: g10/keyedit.c:1687 +#: g10/keyedit.c:1713 #, c-format msgid "" "\"\n" @@ -2287,15 +2315,15 @@ "\"\n" "unterschrieben mit Ihrem SchlЭssel %08lX um %s\n" -#: g10/keyedit.c:1691 +#: g10/keyedit.c:1717 msgid "Create a revocation certificate for this signature? (y/N)" msgstr "Ein Widerrufszertifikat fЭr diese Unterschrift erzeugen (j/N)" -#: g10/keyedit.c:1771 +#: g10/keyedit.c:1797 msgid "Really create the revocation certificates? (y/N)" msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) " -#: g10/keyedit.c:1794 +#: g10/keyedit.c:1820 msgid "no secret key\n" msgstr "Kein geheimer SchlЭssel\n" @@ -2424,7 +2452,7 @@ #: g10/misc.c:239 msgid "this cipher algorithm is depreciated; please use a more standard one!\n" msgstr "" -"Diees VerschlЭsselungsmethode taugt nicht mehr viel; verwenden Sie eine " +"Diese VerschlЭsselungsmethode taugt nicht mehr viel; verwenden Sie eine " "stДrker standardisierte Methode!\n" #: g10/parse-packet.c:113 @@ -2716,10 +2744,9 @@ msgstr "%s: konnte Satz nicht anhДngen: %s\n" #: g10/tdbio.c:1759 -#, fuzzy msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -"Die \"Trust\"-Datenbank ist beschДdigt; verwenden Sie \"gpgm " +"Die \"Trust\"-Datenbank ist beschДdigt; verwenden Sie \"gpg " "--fix-trustdb\".\n" #: g10/trustdb.c:160 @@ -2811,9 +2838,9 @@ msgstr "enum_secret_keys fehlgeschlagen: %s\n" #: g10/trustdb.c:802 -#, fuzzy, c-format +#, c-format msgid "tdbio_search_sdir failed: %s\n" -msgstr "tdbio_search_dir fehlgeschlagen: %s\n" +msgstr "tdbio_search_sdir fehlgeschlagen: %s\n" #: g10/trustdb.c:877 #, c-format @@ -2849,16 +2876,14 @@ msgstr "UngЭltige Eigenbeglaubigung" #: g10/trustdb.c:1060 -#, fuzzy msgid "Valid user ID revocation skipped due to a newer self signature" msgstr "" "GЭltiger User-ID-Widerruf ignoriert, da eine neuere Eigenbeglaubigung " -"vorliegt\n" +"vorliegt" #: g10/trustdb.c:1066 -#, fuzzy msgid "Valid user ID revocation" -msgstr "GЭltiger User-ID-Widerruf\n" +msgstr "GЭltiger User-ID-Widerruf" #: g10/trustdb.c:1071 msgid "Invalid user ID revocation" @@ -3074,7 +3099,7 @@ #: g10/openfile.c:97 #, c-format msgid "%s: unknown suffix\n" -msgstr "" +msgstr "%s: unbekannte Dateinamenerweiterung\n" #: g10/openfile.c:119 #, fuzzy @@ -3317,17 +3342,17 @@ "SchlЭssel\n" "herzustellen" -# ("keyedit.delsig.invalid"), -# "The signature is not valid. It does make sense to remove it from\n" -# "your keyring if it is really invalid and not just unchecked due to\n" -# "a missing public key (marked by \"sig?\")." +# "This signature can't be checked because you don't have the\n" +# "corresponding key. You should postpone its deletion until you\n" +# "know which key was used because this signing key might establish" +# "a trust connection through another already certified key." #: g10/helptext.c:180 -#, fuzzy msgid "keyedit.delsig.unknown" msgstr "" -"Diese Beglaubigung ist ungЭltig. Es ist sinnvoll sie aus Ihrem\n" -"SchlЭsselbund zu entfernen, sofern sie wirklich ungЭltig ist und nicht nur\n" -"wegen eines fehlenden Жff.SchlЭssel (\"sig?\") unkontrollierbar ist." +"Diese Beglaubigung kann nicht geprЭft werden, da Sie den passenden SclЭssel\n" +"nicht besitzen. Sie sollten die LЖschung der Beglaubigung verschieben, bis\n" +"sie wissen, welcher SchlЭssel verwendet wurde. Denn vielleicht wЭrde genau\n" +"diese Beglaubigung den \"Trust\"-Weg kompletieren." # ("keyedit.delsig.invalid"), # "The signature is not valid. It does make sense to remove it from\n" @@ -3407,6 +3432,27 @@ msgid "No help available for `%s'" msgstr "Keine Hilfe fЭr '%s' vorhanden." +#~ msgid "print all message digests" +#~ msgstr "Message-Digests fЭr die Eingabedaten ausgeben" + +#~ msgid "Too many preferences" +#~ msgstr "Zu viele Einstellungen" + +#~ msgid "Too many preference items" +#~ msgstr "Zu viele Angaben zur Bevorzugung" + +#~ msgid "insert_trust_record: keyblock not found: %s\n" +#~ msgstr "insert_trust_record: SchlЭsselblock nicht gefunden: %s\n" + +#~ msgid "lid %lu: update failed: %s\n" +#~ msgstr "lid %lu: дnderung fehlgeschlagen: %s\n" + +#~ msgid "lid %lu: updated\n" +#~ msgstr "lid %lu: geДndert\n" + +#~ msgid "lid %lu: okay\n" +#~ msgstr "lid %lu: In Ordnung\n" + #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" #~ msgstr "Hinweis: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" @@ -3440,12 +3486,6 @@ #~ msgid "lid %lu: can't get keyblock: %s\n" #~ msgstr "lid %lu: SchlЭsselblock nicht verfЭgbar: %s\n" -#~ msgid "Too many preferences" -#~ msgstr "Zu viele Einstellungen" - -#~ msgid "Too many preference items" -#~ msgstr "Zu viele Angaben zur Bevorzugung" - #~ msgid "public key not anymore available" #~ msgstr "жffentlicher SchlЭssel ist nicht mehr vorhanden" @@ -3453,18 +3493,6 @@ #~ msgstr "" #~ "uid %08lX.%lu/%02X%02X: hat \"shadow-dir\" %lu, aber ist noch nicht " #~ "markiert.\n" - -#~ msgid "insert_trust_record: keyblock not found: %s\n" -#~ msgstr "insert_trust_record: SchlЭsselblock nicht gefunden: %s\n" - -#~ msgid "lid %lu: update failed: %s\n" -#~ msgstr "lid %lu: дnderung fehlgeschlagen: %s\n" - -#~ msgid "lid %lu: updated\n" -#~ msgstr "lid %lu: geДndert\n" - -#~ msgid "lid %lu: okay\n" -#~ msgstr "lid %lu: In Ordnung\n" #~ msgid "%s: keyblock read problem: %s\n" #~ msgstr "%s: SchlЭsselblock Leseproblem: %s\n" diff -urN gnupg-0.9.8a/po/es_ES.po gnupg-0.9.8b/po/es_ES.po --- gnupg-0.9.8a/po/es_ES.po Mon Jul 12 15:05:07 1999 +++ gnupg-0.9.8b/po/es_ES.po Wed Jul 14 11:50:45 1999 @@ -7,7 +7,7 @@ # GPG version: 0.9.7 msgid "" msgstr "" -"POT-Creation-Date: 1999-07-12 15:04+0200\n" +"POT-Creation-Date: 1999-07-14 11:47+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" @@ -42,7 +42,7 @@ msgid "yY" msgstr "sS" -#: g10/keyedit.c:561 util/miscutil.c:272 +#: g10/keyedit.c:564 util/miscutil.c:272 msgid "quit" msgstr "" @@ -283,7 +283,7 @@ "otro trabajo para que el sistema pueda recolectar mАs entropМa\n" "(se necesitan %d bytes mАs).\n" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "" "@Commands:\n" " " @@ -291,131 +291,138 @@ "@Comandos:\n" " " -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|[file]|make a signature" msgstr "|[file]|hace una firma" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "|[file]|make a clear text signature" msgstr "|[file]|hace una firma en texto claro" -#: g10/g10.c:181 +#: g10/g10.c:184 msgid "make a detached signature" msgstr "hace una firma separada" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "encrypt data" msgstr "cifra datos" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "encryption only with symmetric cipher" msgstr "cifra sСlo con un cifrado simИtrico" -#: g10/g10.c:184 +#: g10/g10.c:187 msgid "store only" msgstr "sСlo almacenar" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "decrypt data (default)" msgstr "descifra datos (predefinido)" -#: g10/g10.c:186 +#: g10/g10.c:189 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "list keys" msgstr "lista claves" -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "list keys and signatures" msgstr "lista claves y firmas" -#: g10/g10.c:190 +#: g10/g10.c:193 msgid "check key signatures" msgstr "comprueba las firmas de las claves" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "list keys and fingerprints" msgstr "lista claves y huellas dactilares" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "list secret keys" msgstr "lista claves secretas" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "generate a new key pair" msgstr "genera un nuevo par de claves" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "remove key from the public keyring" msgstr "elimina la clave del anillo pЗblico" -#: g10/g10.c:195 +#: g10/g10.c:198 +#, fuzzy +msgid "sign a key" +msgstr "firma la clave" + +#: g10/g10.c:199 +#, fuzzy +msgid "sign a key locally" +msgstr "firma la clave localmente" + +#: g10/g10.c:200 msgid "sign or edit a key" msgstr "firma o modifica una clave" -#: g10/g10.c:196 +#: g10/g10.c:201 msgid "generate a revocation certificate" msgstr "genera un certificado de revocaciСn" -#: g10/g10.c:197 +#: g10/g10.c:202 msgid "export keys" msgstr "exporta claves" -#: g10/g10.c:198 +#: g10/g10.c:203 msgid "export keys to a key server" msgstr "exporta claves a un servidor de claves" -#: g10/g10.c:199 +#: g10/g10.c:204 msgid "import keys from a key server" msgstr "importa claves desde un servidor de claves" -#: g10/g10.c:202 +#: g10/g10.c:207 msgid "import/merge keys" msgstr "importa/fusiona claves" -#: g10/g10.c:204 +#: g10/g10.c:209 msgid "list only the sequence of packets" msgstr "lista sСlo la secuencia de paquetes" -#: g10/g10.c:206 +#: g10/g10.c:211 msgid "export the ownertrust values" msgstr "exporta los valores de confianza" -#: g10/g10.c:208 +#: g10/g10.c:213 msgid "import ownertrust values" msgstr "importa los valores de confianza" -#: g10/g10.c:210 -msgid "|[NAMES]|update the trust database" +#: g10/g10.c:215 +#, fuzzy +msgid "update the trust database" msgstr "|[NOMBRES]|actualiza la base de datos de confianza" -#: g10/g10.c:212 +#: g10/g10.c:217 msgid "|[NAMES]|check the trust database" msgstr "|[NOMBRES]|comprueba la base de datos de confianza" -#: g10/g10.c:213 +#: g10/g10.c:218 msgid "fix a corrupted trust database" msgstr "arregla una base de datos de confianza daЯada" -#: g10/g10.c:214 +#: g10/g10.c:219 msgid "De-Armor a file or stdin" msgstr "quita la armadura de un fichero o stdin" -#: g10/g10.c:215 +#: g10/g10.c:220 msgid "En-Armor a file or stdin" msgstr "crea la armadura a un fichero o stdin" -#: g10/g10.c:216 +#: g10/g10.c:221 msgid "|algo [files]|print message digests" msgstr "|algo [ficheros]|imprime resЗmenes de mensaje" -#: g10/g10.c:217 -msgid "print all message digests" -msgstr "imprime todos los resЗmenes de mensaje" - -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "" "@\n" "Options:\n" @@ -425,164 +432,173 @@ "Opciones:\n" " " -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "create ascii armored output" msgstr "crea una salida ascii con armadura" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "|NAME|encrypt for NAME" msgstr "|NOMBRE|cifra para NOMBRE" -#: g10/g10.c:230 +#: g10/g10.c:231 +#, fuzzy +msgid "|NAME|use NAME as default recipient" +msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" + +#: g10/g10.c:233 +msgid "use the default key as default recipient" +msgstr "" + +#: g10/g10.c:237 msgid "use this user-id to sign or decrypt" msgstr "usa este usuario para firmar o descifrar" -#: g10/g10.c:231 +#: g10/g10.c:238 msgid "|N|set compress level N (0 disables)" msgstr "|N|establece nivel de compresiСn N (0 no comprime)" -#: g10/g10.c:233 +#: g10/g10.c:240 msgid "use canonical text mode" msgstr "usa modo de texto canСnico" -#: g10/g10.c:234 +#: g10/g10.c:241 msgid "use as output file" msgstr "usa como fichero de salida" -#: g10/g10.c:235 +#: g10/g10.c:242 msgid "verbose" msgstr "prolijo" -#: g10/g10.c:236 +#: g10/g10.c:243 msgid "be somewhat more quiet" msgstr "algo mАs discreto" -#: g10/g10.c:237 +#: g10/g10.c:244 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:238 +#: g10/g10.c:245 msgid "force v3 signatures" msgstr "fuerza firmas v3" -#: g10/g10.c:239 +#: g10/g10.c:246 msgid "always use a MDC for encryption" msgstr "siempre usa un MCD para cifrar" -#: g10/g10.c:240 +#: g10/g10.c:247 msgid "do not make any changes" msgstr "no hace ningЗn cambio" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:242 +#: g10/g10.c:249 msgid "batch mode: never ask" msgstr "proceso por lotes: nunca preguntar" -#: g10/g10.c:243 +#: g10/g10.c:250 msgid "assume yes on most questions" msgstr "asume \"sМ\" en casi todas las preguntas" -#: g10/g10.c:244 +#: g10/g10.c:251 msgid "assume no on most questions" msgstr "asume \"no\" en casi todas las preguntas" -#: g10/g10.c:245 +#: g10/g10.c:252 msgid "add this keyring to the list of keyrings" msgstr "aЯade este anillo a la lista de anillos" -#: g10/g10.c:246 +#: g10/g10.c:253 msgid "add this secret keyring to the list" msgstr "aЯade este anillo secreto a la lista" -#: g10/g10.c:247 +#: g10/g10.c:254 msgid "|NAME|use NAME as default secret key" msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" -#: g10/g10.c:248 +#: g10/g10.c:255 msgid "|HOST|use this keyserver to lookup keys" msgstr "|SERVIDOR|usa este servidor de claves" -#: g10/g10.c:249 +#: g10/g10.c:256 msgid "|NAME|set terminal charset to NAME" msgstr "|NOMBRE|usa el juego de caracteres NOMBRE" -#: g10/g10.c:250 +#: g10/g10.c:257 msgid "read options from file" msgstr "lee opciones del fichero" -#: g10/g10.c:252 +#: g10/g10.c:259 msgid "set debugging flags" msgstr "establece los parАmetros de depuraciСn" -#: g10/g10.c:253 +#: g10/g10.c:260 msgid "enable full debugging" msgstr "habilita depuraciСn completa" -#: g10/g10.c:254 +#: g10/g10.c:261 msgid "|FD|write status info to this FD" msgstr "|DF|escribe informaciСn de estado en descriptor DF" -#: g10/g10.c:255 +#: g10/g10.c:262 msgid "do not write comment packets" msgstr "no escribe paquetes de comentario" -#: g10/g10.c:256 +#: g10/g10.c:263 msgid "(default is 1)" msgstr "(por defecto es 1)" -#: g10/g10.c:257 +#: g10/g10.c:264 msgid "(default is 3)" msgstr "(por defecto es 3)" -#: g10/g10.c:259 +#: g10/g10.c:266 msgid "|FILE|load extension module FILE" msgstr "|FICHERO|carga mСdulo de extensiones FICHERO" -#: g10/g10.c:260 +#: g10/g10.c:267 msgid "emulate the mode described in RFC1991" msgstr "emula el modo descrito en la RFC1991" -#: g10/g10.c:261 +#: g10/g10.c:268 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:262 +#: g10/g10.c:269 msgid "|N|use passphrase mode N" msgstr "|N|usa modo de contraseЯa N" -#: g10/g10.c:264 +#: g10/g10.c:271 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:266 +#: g10/g10.c:273 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n" "contraseЯas" -#: g10/g10.c:267 +#: g10/g10.c:274 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE" -#: g10/g10.c:268 +#: g10/g10.c:275 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE" -#: g10/g10.c:269 +#: g10/g10.c:276 msgid "|N|use compress algorithm N" msgstr "|N|usa el algoritmo de compresiСn N" -#: g10/g10.c:270 +#: g10/g10.c:277 msgid "throw keyid field of encrypted packets" msgstr "elimina el campo keyid de los paquetes cifrados" -#: g10/g10.c:271 +#: g10/g10.c:278 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:273 +#: g10/g10.c:280 msgid "" "@\n" "Examples:\n" @@ -602,15 +618,15 @@ " --list-keys [nombres] muestra las claves\n" " --fingerprint [nombres] muestra las huellas dactilares\n" -#: g10/g10.c:353 +#: g10/g10.c:360 msgid "Please report bugs to .\n" msgstr "Por favor, informe de posibles \"bugs\" a .\n" -#: g10/g10.c:357 +#: g10/g10.c:364 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:360 +#: g10/g10.c:367 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -620,7 +636,7 @@ "Firma, comprueba, cifra o descifra.\n" "La operaciСn por defecto depende del tipo de datos de entrada.\n" -#: g10/g10.c:365 +#: g10/g10.c:372 msgid "" "\n" "Supported algorithms:\n" @@ -628,169 +644,181 @@ "\n" "Algoritmos soportados:\n" -#: g10/g10.c:439 +#: g10/g10.c:446 msgid "usage: gpg [options] " msgstr "uso: gpg [opciones] " -#: g10/g10.c:492 +#: g10/g10.c:499 msgid "conflicting commands\n" msgstr "comandos incompatibles\n" -#: g10/g10.c:626 +#: g10/g10.c:633 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/g10.c:630 +#: g10/g10.c:637 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/g10.c:637 +#: g10/g10.c:644 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:805 +#: g10/g10.c:824 #, 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:852 g10/g10.c:864 +#: g10/g10.c:872 g10/g10.c:884 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado no es vАlido\n" -#: g10/g10.c:858 g10/g10.c:870 +#: g10/g10.c:878 g10/g10.c:890 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no es vАlido\n" -#: g10/g10.c:874 +#: g10/g10.c:894 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:877 +#: g10/g10.c:897 #, 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:879 +#: g10/g10.c:899 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:881 +#: g10/g10.c:901 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:883 +#: g10/g10.c:903 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:886 +#: g10/g10.c:906 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:890 +#: g10/g10.c:910 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:967 +#: g10/g10.c:987 #, 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:973 +#: g10/g10.c:993 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:980 +#: g10/g10.c:1000 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:988 +#: g10/g10.c:1008 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:1001 +#: g10/g10.c:1021 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:1014 +#: g10/g10.c:1034 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:1028 +#: g10/g10.c:1048 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:1040 +#: g10/g10.c:1060 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:1049 -msgid "--edit-key username [commands]" +#: g10/g10.c:1068 +msgid "--sign-key user-id" +msgstr "" + +#: g10/g10.c:1076 +#, fuzzy +msgid "--lsign-key user-id" +msgstr "--delete-key nombre_usuario" + +#: g10/g10.c:1084 +#, fuzzy +msgid "--edit-key user-id [commands]" msgstr "--edit-key nombre_usuario [comandos]" -#: g10/g10.c:1063 -msgid "--delete-secret-key username" +#: g10/g10.c:1100 +#, fuzzy +msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nombre_usuario" -#: g10/g10.c:1066 -msgid "--delete-key username" +#: g10/g10.c:1103 +#, fuzzy +msgid "--delete-key user-id" msgstr "--delete-key nombre_usuario" -#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366 +#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "no puede abrirse `%s': %s\n" -#: g10/g10.c:1101 +#: g10/g10.c:1138 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [id_usuario] [anillo]" -#: g10/g10.c:1162 +#: g10/g10.c:1199 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminaciСn de armadura fallida: %s\n" -#: g10/g10.c:1170 +#: g10/g10.c:1207 #, c-format msgid "enarmoring failed: %s\n" msgstr "creaciСn de armadura fallida: %s\n" -#: g10/g10.c:1236 +#: g10/g10.c:1275 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribuciСn no vАlido `%s'\n" -#: g10/g10.c:1317 +#: g10/g10.c:1356 msgid "[filename]" msgstr "[nombre_fichero]" -#: g10/g10.c:1321 +#: g10/g10.c:1360 msgid "Go ahead and type your message ...\n" msgstr "Adelante, teclee su mensaje ...\n" -#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "no puede abrirse `%s'\n" -#: g10/g10.c:1493 +#: g10/g10.c:1532 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1499 +#: g10/g10.c:1538 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1505 +#: g10/g10.c:1544 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1513 +#: g10/g10.c:1552 msgid "a notation value must not use any control characters\n" msgstr "" @@ -869,7 +897,12 @@ "caracter \"quoted printable\" en la armadura - probablemente se usС\n" "un MTA defectuoso\n" -#: g10/pkclist.c:137 +#. a string with valid answers +#: g10/pkclist.c:140 +msgid "sSmMqQ" +msgstr "iImMqQ" + +#: g10/pkclist.c:144 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -878,7 +911,7 @@ "No hay confianza definida para el propietario %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:147 +#: g10/pkclist.c:154 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -900,28 +933,23 @@ " 4 = Me fМo completamente\n" " i = Mostrar mАs informaciСn\n" -#: g10/pkclist.c:156 +#: g10/pkclist.c:163 msgid " m = back to the main menu\n" msgstr " m = volver al menЗ principal\n" -#: g10/pkclist.c:158 +#: g10/pkclist.c:165 msgid " q = quit\n" msgstr " q = salir\n" -#. a string with valid answers -#: g10/pkclist.c:163 -msgid "sSmMqQ" -msgstr "iImMqQ" - -#: g10/pkclist.c:167 +#: g10/pkclist.c:171 msgid "Your decision? " msgstr "Su decisiСn: " -#: g10/pkclist.c:187 +#: g10/pkclist.c:193 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que llevan a una clave de confianza absoluta:\n" -#: g10/pkclist.c:256 +#: g10/pkclist.c:264 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" @@ -931,7 +959,7 @@ "si es posible asignar algunos valores de confianza perdidos.\n" "\n" -#: g10/pkclist.c:262 +#: g10/pkclist.c:270 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -939,7 +967,7 @@ "No se ha encontrado ninguna ruta con una de nuestras claves.\n" "\n" -#: g10/pkclist.c:264 +#: g10/pkclist.c:272 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -947,7 +975,7 @@ "No se ha encontrado ningЗn certificado sin valor de confianza.\n" "\n" -#: g10/pkclist.c:266 +#: g10/pkclist.c:274 msgid "" "No trust values changed.\n" "\n" @@ -955,36 +983,36 @@ "No se cambiС ningЗn valor de confianza.\n" "\n" -#: g10/pkclist.c:283 +#: g10/pkclist.c:291 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "clave %08lX: ║esta clave ha sido revocada!\n" -#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405 +#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413 msgid "Use this key anyway? " msgstr "©Usar esta clave de todas formas? " -#: g10/pkclist.c:293 +#: g10/pkclist.c:301 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "clave %08lX: ║esta subclave ha sido revocada!\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:331 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: clave caducada\n" -#: g10/pkclist.c:329 +#: g10/pkclist.c:337 #, 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:343 +#: g10/pkclist.c:351 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: ║Esta clave NO es de confianza!\n" -#: g10/pkclist.c:349 +#: g10/pkclist.c:357 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -994,15 +1022,15 @@ "proprietario\n" "pero se acepta igualmente\n" -#: g10/pkclist.c:355 +#: g10/pkclist.c:363 msgid "This key probably belongs to the owner\n" msgstr "Esta clave probablemente pertenece a su proprietario\n" -#: g10/pkclist.c:360 +#: g10/pkclist.c:368 msgid "This key belongs to us\n" msgstr "Esta clave nos pertenece\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:408 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" @@ -1014,66 +1042,66 @@ "\"sМ\" a la siguiente pregunta.\n" "\n" -#: g10/pkclist.c:413 g10/pkclist.c:435 +#: g10/pkclist.c:421 g10/pkclist.c:443 msgid "WARNING: Using untrusted key!\n" msgstr "ATENCIсN: ║Usando una clave no fiable!\n" -#: g10/pkclist.c:456 +#: g10/pkclist.c:464 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:457 +#: g10/pkclist.c:465 msgid " This could mean that the signature is forgery.\n" msgstr " Esto puede significar que la firma estА falsificada.\n" -#: g10/pkclist.c:461 +#: g10/pkclist.c:469 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:482 +#: g10/pkclist.c:490 msgid "Note: This key has expired!\n" msgstr "Nota: ║Esta clave estА caducada!\n" -#: g10/pkclist.c:489 +#: g10/pkclist.c:497 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:491 +#: g10/pkclist.c:499 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:507 +#: g10/pkclist.c:515 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATENCIсN: ║Esta clave NO es de confianza!\n" -#: g10/pkclist.c:508 +#: g10/pkclist.c:516 msgid " The signature is probably a FORGERY.\n" msgstr " La firma es probablemente una FALSIFICACIсN.\n" -#: g10/pkclist.c:515 +#: g10/pkclist.c:523 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:518 +#: g10/pkclist.c:526 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:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715 +#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:590 g10/pkclist.c:697 +#: g10/pkclist.c:635 g10/pkclist.c:785 #, fuzzy, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: problema lectura del bloque de clave: %s\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:662 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1081,30 +1109,34 @@ "No se ha especificado un ID de usuario (puede usar \"-r\")\n" "\n" -#: g10/pkclist.c:618 +#: g10/pkclist.c:672 msgid "Enter the user ID: " msgstr "Introduzca el ID de usuario: " -#: g10/pkclist.c:629 +#: g10/pkclist.c:684 msgid "No such user ID.\n" msgstr "ID de usuario inexistente.\n" -#: g10/pkclist.c:639 +#: g10/pkclist.c:704 #, fuzzy msgid "Public key is disabled.\n" msgstr "la clave pЗblica es %08lX\n" -#: g10/pkclist.c:678 +#: g10/pkclist.c:733 +msgid "unknown default recipient `s'\n" +msgstr "" + +#: g10/pkclist.c:766 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: error comprobando la clave: %s\n" -#: g10/pkclist.c:683 +#: g10/pkclist.c:771 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: problema lectura del bloque de clave: %s\n" -#: g10/pkclist.c:721 +#: g10/pkclist.c:809 msgid "no valid addressees\n" msgstr "no hay direcciones vАlidas\n" @@ -1498,238 +1530,238 @@ msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n" -#: g10/import.c:116 +#: g10/import.c:117 #, c-format msgid "can't open `%s': %s\n" msgstr "no puede abrirse `%s': %s\n" -#: g10/import.c:160 +#: g10/import.c:161 #, c-format msgid "skipping block of type %d\n" msgstr "ignorando bloque de tipo %d\n" -#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697 +#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697 #, c-format msgid "%lu keys so far processed\n" msgstr "hasta ahora se han procesado %lu claves\n" -#: g10/import.c:172 +#: g10/import.c:173 #, c-format msgid "error reading `%s': %s\n" msgstr "error leyendo `%s': %s\n" -#: g10/import.c:175 +#: g10/import.c:176 #, c-format msgid "Total number processed: %lu\n" msgstr " Cantidad total procesada: %lu\n" -#: g10/import.c:177 +#: g10/import.c:178 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sin identificativo: %lu\n" -#: g10/import.c:179 +#: g10/import.c:180 #, c-format msgid " imported: %lu" msgstr " importadas: %lu" -#: g10/import.c:185 +#: g10/import.c:186 #, c-format msgid " unchanged: %lu\n" msgstr " sin cambios: %lu\n" -#: g10/import.c:187 +#: g10/import.c:188 #, c-format msgid " new user IDs: %lu\n" msgstr " nuevos identificativos: %lu\n" -#: g10/import.c:189 +#: g10/import.c:190 #, c-format msgid " new subkeys: %lu\n" msgstr " nuevas subclaves: %lu\n" -#: g10/import.c:191 +#: g10/import.c:192 #, c-format msgid " new signatures: %lu\n" msgstr " nuevas firmas: %lu\n" -#: g10/import.c:193 +#: g10/import.c:194 #, c-format msgid " new key revocations: %lu\n" msgstr " nuevas revocaciones: %lu\n" -#: g10/import.c:195 +#: g10/import.c:196 #, c-format msgid " secret keys read: %lu\n" msgstr " claves secretas leМdas: %lu\n" -#: g10/import.c:197 +#: g10/import.c:198 #, c-format msgid " secret keys imported: %lu\n" msgstr " claves secretas importadas: %lu\n" -#: g10/import.c:199 +#: g10/import.c:200 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "claves secretas sin cambios: %lu\n" -#: g10/import.c:342 g10/import.c:526 +#: g10/import.c:361 g10/import.c:550 #, c-format msgid "key %08lX: no user id\n" msgstr "clave %08lX: no hay identificativo de usuario\n" -#: g10/import.c:353 +#: g10/import.c:372 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "clave %08lX: no hay identificativos de usuario vАlidos\n" -#: g10/import.c:355 +#: g10/import.c:374 msgid "this may be caused by a missing self-signature\n" msgstr "esto puede ser debido a la ausencia de autofirma\n" -#: g10/import.c:366 g10/import.c:593 +#: g10/import.c:385 g10/import.c:617 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "clave %08lX: clave pЗblica no encontrada: %s\n" -#: g10/import.c:372 +#: g10/import.c:391 msgid "no default public keyring\n" msgstr "no hay anillo pЗblico por defecto\n" -#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "escribiendo en `%s'\n" -#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642 +#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666 #, c-format msgid "can't lock keyring `%s': %s\n" msgstr "no puede bloquearse el anillo `%s': %s\n" -#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "error escribiendo anillo `%s': %s\n" -#: g10/import.c:387 +#: g10/import.c:406 #, c-format msgid "key %08lX: public key imported\n" msgstr "clave %08lX: clave pЗblica importada\n" -#: g10/import.c:399 +#: g10/import.c:423 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "clave %08lX: no se corresponde con nuestra copia\n" -#: g10/import.c:408 g10/import.c:601 +#: g10/import.c:432 g10/import.c:625 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n" -#: g10/import.c:414 g10/import.c:607 +#: g10/import.c:438 g10/import.c:631 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n" -#: g10/import.c:441 +#: g10/import.c:465 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "clave %08lX: 1 nuevo identificativo de usuario\n" -#: g10/import.c:444 +#: g10/import.c:468 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "clave %08lX: %d nuevos identificativos de usuario\n" -#: g10/import.c:447 +#: g10/import.c:471 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "clave %08lX: 1 nueva firma\n" -#: g10/import.c:450 +#: g10/import.c:474 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "clave %08lX: %d nuevas firmas\n" -#: g10/import.c:453 +#: g10/import.c:477 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "clave %08lX: 1 nueva subclave\n" -#: g10/import.c:456 +#: g10/import.c:480 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "clave %08lX: %d nuevas subclaves\n" -#: g10/import.c:466 +#: g10/import.c:490 #, c-format msgid "key %08lX: not changed\n" msgstr "clave %08lX: sin cambios\n" -#: g10/import.c:549 +#: g10/import.c:573 #, c-format msgid "key %08lX: secret key imported\n" msgstr "clave %08lX: clave secreta importada\n" #. we can't merge secret keys -#: g10/import.c:553 +#: g10/import.c:577 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "clave %08lX: ya estaba en el anillo secreto\n" -#: g10/import.c:558 +#: g10/import.c:582 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "clave %08lX: clave secreta no encontrada: %s\n" -#: g10/import.c:587 +#: g10/import.c:611 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "clave %08lX: falta la clave pЗblica - imposibile applicar el\n" "certificado de revocaciСn\n" -#: g10/import.c:618 +#: g10/import.c:642 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "clave %08lX: certificado de revocaciСn no vАlido: %s - rechazado\n" -#: g10/import.c:650 +#: g10/import.c:674 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "clave %08lX: certificado de revocaciСn importado\n" -#: g10/import.c:683 +#: g10/import.c:707 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "clave %08lX: no hay identificativo de usuario para la firma\n" -#: g10/import.c:690 g10/import.c:714 +#: g10/import.c:714 g10/import.c:738 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "clave %08lX: algoritmo de clave pЗblica no soportado\n" -#: g10/import.c:691 +#: g10/import.c:715 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "clave %08lX: autofirma no vАlida\n" -#: g10/import.c:706 +#: g10/import.c:730 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "clave %08lX: no hay subclave para unir\n" -#: g10/import.c:715 +#: g10/import.c:739 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "clave %08lX.%lu: uniСn de subclave no vАlida\n" -#: g10/import.c:747 +#: g10/import.c:771 #, c-format msgid "key %08lX: skipped userid '" msgstr "clave %08lX: ignorado identificativo de usuario '" -#: g10/import.c:770 +#: g10/import.c:794 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "clave %08lX: subclave ignorada\n" @@ -1738,33 +1770,33 @@ #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense -#: g10/import.c:795 +#: g10/import.c:819 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "clave %08lX: firma no exportable (clase %02x) - ignorada\n" -#: g10/import.c:804 +#: g10/import.c:828 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" "clave %08lX: certificado de revocaciСn en lugar equivocado - ignorado\n" -#: g10/import.c:812 +#: g10/import.c:836 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "clave %08lX: certificado de revocaciСn no valido: %s - ignorado\n" -#: g10/import.c:912 +#: g10/import.c:936 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "clave %08lX: detectado usuario duplicado - fusionada\n" -#: g10/import.c:963 +#: g10/import.c:987 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "clave %08lX: certificado de revocaciСn aЯadido\n" -#: g10/import.c:1076 g10/import.c:1131 +#: g10/import.c:1100 g10/import.c:1155 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "clave %08lX: nuestra copia no tiene autofirma\n" @@ -1850,7 +1882,7 @@ msgid "Really sign? " msgstr "©Firmar de verdad? " -#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128 +#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "firma fallida: %s\n" @@ -1892,394 +1924,394 @@ msgid "moving a key signature to the correct place\n" msgstr "moviendo la firma de la clave al lugar correcto\n" -#: g10/keyedit.c:561 +#: g10/keyedit.c:564 msgid "quit this menu" msgstr "sale de este menЗ" -#: g10/keyedit.c:562 +#: g10/keyedit.c:565 msgid "q" msgstr "" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save" msgstr "" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save and quit" msgstr "graba y sale" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "help" msgstr "" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "show this help" msgstr "muestra esta ayuda" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "fpr" msgstr "" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "show fingerprint" msgstr "muestra huella dactilar" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list" msgstr "" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list key and user ids" msgstr "lista clave e identificativos de usuario" -#: g10/keyedit.c:568 +#: g10/keyedit.c:571 msgid "l" msgstr "" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "uid" msgstr "" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "select user id N" msgstr "selecciona identificativo de usuario N" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "key" msgstr "" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "select secondary key N" msgstr "selecciona clave secundaria N" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "check" msgstr "" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "list signatures" msgstr "lista firmas" -#: g10/keyedit.c:572 +#: g10/keyedit.c:575 msgid "c" msgstr "" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign" msgstr "" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign the key" msgstr "firma la clave" -#: g10/keyedit.c:574 +#: g10/keyedit.c:577 msgid "s" msgstr "" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 #, fuzzy msgid "lsign" msgstr "firmando:" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "sign the key locally" msgstr "firma la clave localmente" -#: g10/keyedit.c:576 +#: g10/keyedit.c:579 msgid "debug" msgstr "" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "adduid" msgstr "" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "add a user id" msgstr "aЯade un identificativo de usuario" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "deluid" msgstr "" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "delete user id" msgstr "borra un identificativo de usuario" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "addkey" msgstr "" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "add a secondary key" msgstr "aЯade una clave secundaria" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delkey" msgstr "" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delete a secondary key" msgstr "borra una clave secundaria" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 #, fuzzy msgid "delsig" msgstr "firmando:" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 #, fuzzy msgid "delete signatures" msgstr "lista firmas" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "expire" msgstr "" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "change the expire date" msgstr "cambia fecha de caducidad" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle" msgstr "" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle between secret and public key listing" msgstr "cambia entre lista de claves secretas y pЗblicas" -#: g10/keyedit.c:585 +#: g10/keyedit.c:588 msgid "t" msgstr "" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "pref" msgstr "" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "list preferences" msgstr "muestra preferencias" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "passwd" msgstr "" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "change the passphrase" msgstr "cambia la contraseЯa" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "trust" msgstr "" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "change the ownertrust" msgstr "cambia valores de confianza" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revsig" msgstr "" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revoke signatures" msgstr "revoca firmas" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revkey" msgstr "" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revoke a secondary key" msgstr "revoca una clave secundaria" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 msgid "disable" msgstr "" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 #, fuzzy msgid "disable a key" msgstr "Clave incorrecta" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 msgid "enable" msgstr "" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 #, fuzzy msgid "enable a key" msgstr "Clave incorrecta" -#: g10/keyedit.c:611 +#: g10/keyedit.c:614 msgid "can't do that in batchmode\n" msgstr "imposible hacer esto en modo de proceso por lotes\n" #. check that they match -#. FIXME: check that they both match -#: g10/keyedit.c:640 +#. fixme: check that they both match +#: g10/keyedit.c:652 msgid "Secret key is available.\n" msgstr "Clave secreta disponible.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:681 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:696 +#: g10/keyedit.c:711 msgid "Need the secret key to do this.\n" msgstr "Se necesita la clave secreta para hacer esto.\n" -#: g10/keyedit.c:718 -msgid "Save changes? " -msgstr "©Grabar cambios? " - -#: g10/keyedit.c:721 -msgid "Quit without saving? " -msgstr "©Salir sin grabar? " - -#: g10/keyedit.c:731 -#, c-format -msgid "update failed: %s\n" -msgstr "actualizaciСn fallida: %s\n" - -#: g10/keyedit.c:738 -#, c-format -msgid "update secret failed: %s\n" -msgstr "actualizaciСn de la clave secreta fallida: %s\n" - -#: g10/keyedit.c:745 -msgid "Key not changed so no update needed.\n" -msgstr "Clave sin cambios, no se necesita actualizaciСn.\n" - -#: g10/keyedit.c:748 g10/keyedit.c:807 -#, c-format -msgid "update of trustdb failed: %s\n" -msgstr "actualizaciСn de confianza fallida: %s\n" - -#: g10/keyedit.c:781 +#: g10/keyedit.c:758 msgid "Really sign all user ids? " msgstr "©Firmar realmente todos los identificativos de usuario? " -#: g10/keyedit.c:782 +#: g10/keyedit.c:759 msgid "Hint: Select the user ids to sign\n" msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n" -#: g10/keyedit.c:818 g10/keyedit.c:839 +#: g10/keyedit.c:786 g10/keyedit.c:968 +#, c-format +msgid "update of trustdb failed: %s\n" +msgstr "actualizaciСn de confianza fallida: %s\n" + +#: g10/keyedit.c:797 g10/keyedit.c:818 msgid "You must select at least one user id.\n" msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n" -#: g10/keyedit.c:820 +#: g10/keyedit.c:799 msgid "You can't delete the last user id!\n" msgstr "║No puede borrar el Зltimo identificativo de usuario!\n" -#: g10/keyedit.c:823 +#: g10/keyedit.c:802 msgid "Really remove all selected user ids? " msgstr "©Borrar realmente todos los identificativos seleccionados? " -#: g10/keyedit.c:824 +#: g10/keyedit.c:803 msgid "Really remove this user id? " msgstr "©Borrar realmente este identificativo? " -#: g10/keyedit.c:860 g10/keyedit.c:882 +#: g10/keyedit.c:839 g10/keyedit.c:861 msgid "You must select at least one key.\n" msgstr "Debe seleccionar por lo menos una clave.\n" -#: g10/keyedit.c:864 +#: g10/keyedit.c:843 msgid "Do you really want to delete the selected keys? " msgstr "©Borrar realmente las claves seleccionadas? " -#: g10/keyedit.c:865 +#: g10/keyedit.c:844 msgid "Do you really want to delete this key? " msgstr "©Borrar realmente esta clave? " -#: g10/keyedit.c:886 +#: g10/keyedit.c:865 msgid "Do you really want to revoke the selected keys? " msgstr "©Revocar realmente las claves seleccionadas? " -#: g10/keyedit.c:887 +#: g10/keyedit.c:866 msgid "Do you really want to revoke this key? " msgstr "©Revocar realmente esta clave? " -#: g10/keyedit.c:949 +#: g10/keyedit.c:932 +msgid "Save changes? " +msgstr "©Grabar cambios? " + +#: g10/keyedit.c:935 +msgid "Quit without saving? " +msgstr "©Salir sin grabar? " + +#: g10/keyedit.c:946 +#, c-format +msgid "update failed: %s\n" +msgstr "actualizaciСn fallida: %s\n" + +#: g10/keyedit.c:953 +#, c-format +msgid "update secret failed: %s\n" +msgstr "actualizaciСn de la clave secreta fallida: %s\n" + +#: g10/keyedit.c:960 +msgid "Key not changed so no update needed.\n" +msgstr "Clave sin cambios, no se necesita actualizaciСn.\n" + +#: g10/keyedit.c:975 msgid "Invalid command (try \"help\")\n" msgstr "Comando no vАlido (pruebe \"help\")\n" -#: g10/keyedit.c:1039 +#: g10/keyedit.c:1065 #, fuzzy msgid "This key has been disabled" msgstr "Nota: ║Esta clave estА caducada!\n" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1314 +#: g10/keyedit.c:1340 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1318 +#: g10/keyedit.c:1344 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1324 +#: g10/keyedit.c:1350 #, fuzzy msgid "Really delete this self-signature? (y/N)" msgstr "©Crear los certificados de revocaciСn realmente? (s/N)" -#: g10/keyedit.c:1338 +#: g10/keyedit.c:1364 #, fuzzy, c-format msgid "Deleted %d signature.\n" msgstr "%d firmas incorrectas\n" -#: g10/keyedit.c:1339 +#: g10/keyedit.c:1365 #, fuzzy, c-format msgid "Deleted %d signatures.\n" msgstr "%d firmas incorrectas\n" -#: g10/keyedit.c:1342 +#: g10/keyedit.c:1368 #, fuzzy msgid "Nothing deleted.\n" msgstr "ATENCIсN: no se ha exportado nada\n" -#: g10/keyedit.c:1411 +#: g10/keyedit.c:1437 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite la selecciСn de las claves secretas.\n" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1443 msgid "Please select at most one secondary key.\n" msgstr "Por favor, seleccione como mАximo una clave secundaria.\n" -#: g10/keyedit.c:1421 +#: g10/keyedit.c:1447 #, fuzzy msgid "Changing expiration time for a secondary key.\n" msgstr "Cambiando caducidad de clave secundaria.\n" -#: g10/keyedit.c:1423 +#: g10/keyedit.c:1449 #, fuzzy msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando caducidad de clave primaria.\n" -#: g10/keyedit.c:1464 +#: g10/keyedit.c:1490 msgid "You can't change the expiration date of a v3 key\n" msgstr "No puede cambiar la fecha de caducidad de una clave v3\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1506 msgid "No corresponding signature in secret ring\n" msgstr "No hay firma correspondiente en anillo secreto\n" -#: g10/keyedit.c:1540 +#: g10/keyedit.c:1566 #, c-format msgid "No user id with index %d\n" msgstr "No hay ningЗn identificativo de usuario con el Мndice %d\n" -#: g10/keyedit.c:1586 +#: g10/keyedit.c:1612 #, c-format msgid "No secondary key with index %d\n" msgstr "No hay ninguna clave secundaria con el Мndice %d\n" -#: g10/keyedit.c:1684 +#: g10/keyedit.c:1710 msgid "user ID: \"" msgstr "ID de usuario: \"" -#: g10/keyedit.c:1687 +#: g10/keyedit.c:1713 #, c-format msgid "" "\"\n" @@ -2288,15 +2320,15 @@ "\"\n" "firmada con su clave %08lX el %s\n" -#: g10/keyedit.c:1691 +#: g10/keyedit.c:1717 msgid "Create a revocation certificate for this signature? (y/N)" msgstr "©Crear un certificado de revocaciСn para esta clave (s/N)?" -#: g10/keyedit.c:1771 +#: g10/keyedit.c:1797 msgid "Really create the revocation certificates? (y/N)" msgstr "©Crear los certificados de revocaciСn realmente? (s/N)" -#: g10/keyedit.c:1794 +#: g10/keyedit.c:1820 msgid "no secret key\n" msgstr "no hay clave secreta\n" @@ -3248,6 +3280,9 @@ #, c-format msgid "No help available for `%s'" msgstr "Ayuda no disponible para `%s'" + +#~ msgid "print all message digests" +#~ msgstr "imprime todos los resЗmenes de mensaje" #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" #~ msgstr "" diff -urN gnupg-0.9.8a/po/fr.po gnupg-0.9.8b/po/fr.po --- gnupg-0.9.8a/po/fr.po Mon Jul 12 15:05:10 1999 +++ gnupg-0.9.8b/po/fr.po Wed Jul 14 11:50:46 1999 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 0.9.7\n" -"POT-Creation-Date: 1999-07-12 15:04+0200\n" +"POT-Creation-Date: 1999-07-14 11:47+0200\n" "PO-Revision-Date: 1999-05-24 21:48+02:00\n" "Last-Translator: GaКl QuИri \n" "Language-Team: French \n" @@ -35,7 +35,7 @@ msgid "yY" msgstr "oO" -#: g10/keyedit.c:561 util/miscutil.c:272 +#: g10/keyedit.c:564 util/miscutil.c:272 msgid "quit" msgstr "quitter" @@ -276,7 +276,7 @@ "Il n'y a pas assez d'octets alИatoires disponibles. Faites autre chose\n" "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "" "@Commands:\n" " " @@ -284,132 +284,139 @@ "@Commandes:\n" " " -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|[file]|make a signature" msgstr "|[fichier]|faire une signature" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "|[file]|make a clear text signature" msgstr "|[fichier]|faire une signature en texte clair" -#: g10/g10.c:181 +#: g10/g10.c:184 msgid "make a detached signature" msgstr "faire une signature dИtachИe" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "encrypt data" msgstr "chiffrer les donnИes" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "encryption only with symmetric cipher" msgstr "chiffrement symИtrique seulement" -#: g10/g10.c:184 +#: g10/g10.c:187 msgid "store only" msgstr "pas d'action" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "decrypt data (default)" msgstr "dИchiffrer les donnИes (dИfaut)" -#: g10/g10.c:186 +#: g10/g10.c:189 msgid "verify a signature" msgstr "vИrifier une signature" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "list keys" msgstr "lister les clИs" -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "list keys and signatures" msgstr "lister les clИs et les signatures" -#: g10/g10.c:190 +#: g10/g10.c:193 msgid "check key signatures" msgstr "vИrifier les signatures des clИs" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "list keys and fingerprints" msgstr "lister les clИs et les empreintes" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "list secret keys" msgstr "lister les clИs secrХtes" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "generate a new key pair" msgstr "gИnИrer une nouvelle paire de clИs" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "remove key from the public keyring" msgstr "enlever la clИ du porte-clИs public" -#: g10/g10.c:195 +#: g10/g10.c:198 +#, fuzzy +msgid "sign a key" +msgstr "signer la clИ" + +#: g10/g10.c:199 +#, fuzzy +msgid "sign a key locally" +msgstr "signer la clИ localement" + +#: g10/g10.c:200 msgid "sign or edit a key" msgstr "signer ou Иditer une clИ" -#: g10/g10.c:196 +#: g10/g10.c:201 msgid "generate a revocation certificate" msgstr "gИnИrer un certificat de rИvocation" -#: g10/g10.c:197 +#: g10/g10.c:202 msgid "export keys" msgstr "exporter les clИs" -#: g10/g10.c:198 +#: g10/g10.c:203 msgid "export keys to a key server" msgstr "exporter les clИs vers un serveur de clИs" -#: g10/g10.c:199 +#: g10/g10.c:204 msgid "import keys from a key server" msgstr "importer les clИs d'un serveur de clИs" -#: g10/g10.c:202 +#: g10/g10.c:207 msgid "import/merge keys" msgstr "importer/fusionner les clИs" -#: g10/g10.c:204 +#: g10/g10.c:209 msgid "list only the sequence of packets" msgstr "ne lister que les paquets" -#: g10/g10.c:206 +#: g10/g10.c:211 msgid "export the ownertrust values" msgstr "exporter les indices de confiance" -#: g10/g10.c:208 +#: g10/g10.c:213 msgid "import ownertrust values" msgstr "importer les indices de confiance" # -#: g10/g10.c:210 -msgid "|[NAMES]|update the trust database" +#: g10/g10.c:215 +#, fuzzy +msgid "update the trust database" msgstr "|[NOMS]|mettre la base de confiance Ю jour" -#: g10/g10.c:212 +#: g10/g10.c:217 msgid "|[NAMES]|check the trust database" msgstr "|[NOMS]|vИrifier la base de confiance" -#: g10/g10.c:213 +#: g10/g10.c:218 msgid "fix a corrupted trust database" msgstr "rИparer une base de confiance corrompue" -#: g10/g10.c:214 +#: g10/g10.c:219 msgid "De-Armor a file or stdin" msgstr "Enlever l'armure d'un fichier ou de stdin" -#: g10/g10.c:215 +#: g10/g10.c:220 msgid "En-Armor a file or stdin" msgstr "Mettre une armure Ю un fichier ou Ю stdin" -#: g10/g10.c:216 +#: g10/g10.c:221 msgid "|algo [files]|print message digests" msgstr "|alg. [fich.]|indiquer les fonctions de hachage" -#: g10/g10.c:217 -msgid "print all message digests" -msgstr "Иcrire toutes les fonctions de hachage" - -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "" "@\n" "Options:\n" @@ -419,162 +426,171 @@ "Options:\n" " " -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "create ascii armored output" msgstr "crИer une sortie ascii avec armure" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "|NAME|encrypt for NAME" msgstr "|NOM|chiffrer pour NOM" -#: g10/g10.c:230 +#: g10/g10.c:231 +#, fuzzy +msgid "|NAME|use NAME as default recipient" +msgstr "|NOM|utiliser NOM comme clИ secrХte par dИfaut" + +#: g10/g10.c:233 +msgid "use the default key as default recipient" +msgstr "" + +#: g10/g10.c:237 msgid "use this user-id to sign or decrypt" msgstr "utiliser ce nom pour signer ou dИchiffrer" -#: g10/g10.c:231 +#: g10/g10.c:238 msgid "|N|set compress level N (0 disables)" msgstr "|N|niveau de compression N (0 dИsactive)" -#: g10/g10.c:233 +#: g10/g10.c:240 msgid "use canonical text mode" msgstr "utiliser le mode texte canonique" -#: g10/g10.c:234 +#: g10/g10.c:241 msgid "use as output file" msgstr "utiliser comme fichier de sortie" -#: g10/g10.c:235 +#: g10/g10.c:242 msgid "verbose" msgstr "bavard" -#: g10/g10.c:236 +#: g10/g10.c:243 msgid "be somewhat more quiet" msgstr "devenir beaucoup plus silencieux" -#: g10/g10.c:237 +#: g10/g10.c:244 msgid "don't use the terminal at all" msgstr "" # -#: g10/g10.c:238 +#: g10/g10.c:245 msgid "force v3 signatures" msgstr "forcer les signatures en v3" -#: g10/g10.c:239 +#: g10/g10.c:246 msgid "always use a MDC for encryption" msgstr "toujours utiliser un sceau pour le chiffrement" -#: g10/g10.c:240 +#: g10/g10.c:247 msgid "do not make any changes" msgstr "ne rien changer" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:242 +#: g10/g10.c:249 msgid "batch mode: never ask" msgstr "mode automatique : ne jamais rien demander" -#: g10/g10.c:243 +#: g10/g10.c:250 msgid "assume yes on most questions" msgstr "rИpondre oui Ю la plupart des questions" -#: g10/g10.c:244 +#: g10/g10.c:251 msgid "assume no on most questions" msgstr "rИpondre non Ю la plupart des questions" -#: g10/g10.c:245 +#: g10/g10.c:252 msgid "add this keyring to the list of keyrings" msgstr "ajouter ce porte-clИs Ю la liste des porte-clИs" -#: g10/g10.c:246 +#: g10/g10.c:253 msgid "add this secret keyring to the list" msgstr "ajouter ce porte-clИs secret Ю la liste" -#: g10/g10.c:247 +#: g10/g10.c:254 msgid "|NAME|use NAME as default secret key" msgstr "|NOM|utiliser NOM comme clИ secrХte par dИfaut" -#: g10/g10.c:248 +#: g10/g10.c:255 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HтTE|utiliser ce serveur pour chercher des clИs" -#: g10/g10.c:249 +#: g10/g10.c:256 msgid "|NAME|set terminal charset to NAME" msgstr "|NOM|le terminal utilise la table de caractХres NOM" -#: g10/g10.c:250 +#: g10/g10.c:257 msgid "read options from file" msgstr "lire les options du fichier" -#: g10/g10.c:252 +#: g10/g10.c:259 msgid "set debugging flags" msgstr "choisir les attributs de dИboguage" -#: g10/g10.c:253 +#: g10/g10.c:260 msgid "enable full debugging" msgstr "permettre un dИboguage complet" -#: g10/g10.c:254 +#: g10/g10.c:261 msgid "|FD|write status info to this FD" msgstr "|FD|Иcrire l'Иtat sur ce descripteur" -#: g10/g10.c:255 +#: g10/g10.c:262 msgid "do not write comment packets" msgstr "ne pas Иcrire de paquets de commentaire" -#: g10/g10.c:256 +#: g10/g10.c:263 msgid "(default is 1)" msgstr "nombre de signatures complХtes requises (1)" -#: g10/g10.c:257 +#: g10/g10.c:264 msgid "(default is 3)" msgstr "nombre de signatures marginales requises (3)" -#: g10/g10.c:259 +#: g10/g10.c:266 msgid "|FILE|load extension module FILE" msgstr "|FICH|charger le module d'extension FICH" -#: g10/g10.c:260 +#: g10/g10.c:267 msgid "emulate the mode described in RFC1991" msgstr "imiter le mode dИcrit dans la RFC1991" -#: g10/g10.c:261 +#: g10/g10.c:268 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" # FIXMOI : faudra trouver mieux ... -#: g10/g10.c:262 +#: g10/g10.c:269 msgid "|N|use passphrase mode N" msgstr "|N|utiliser le mode de codage des mots de passe N" -#: g10/g10.c:264 +#: g10/g10.c:271 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NOM|utiliser le hachage NOM pour les mots de passe" -#: g10/g10.c:266 +#: g10/g10.c:273 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe" -#: g10/g10.c:267 +#: g10/g10.c:274 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOM|utiliser l'algorithme de chiffrement NOM" -#: g10/g10.c:268 +#: g10/g10.c:275 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOM|utiliser la fonction de hachage NOM" -#: g10/g10.c:269 +#: g10/g10.c:276 msgid "|N|use compress algorithm N" msgstr "|N|utiliser l'algorithme de compression N" -#: g10/g10.c:270 +#: g10/g10.c:277 msgid "throw keyid field of encrypted packets" msgstr "supprimer l'identification des paquets chiffrИs" -#: g10/g10.c:271 +#: g10/g10.c:278 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:273 +#: g10/g10.c:280 msgid "" "@\n" "Examples:\n" @@ -594,15 +610,15 @@ " --list-keys [utilisateur] montrer les clИs\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:353 +#: g10/g10.c:360 msgid "Please report bugs to .\n" msgstr "Rapporter toutes anomalies Ю .\n" -#: g10/g10.c:357 +#: g10/g10.c:364 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:360 +#: g10/g10.c:367 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -612,7 +628,7 @@ "signer, vИrifier, chiffer ou dИchiffrer\n" "l'opИration par dИfaut dИpend des donnИes entrИes\n" -#: g10/g10.c:365 +#: g10/g10.c:372 msgid "" "\n" "Supported algorithms:\n" @@ -620,169 +636,181 @@ "\n" "Algorithmes supportИs:\n" -#: g10/g10.c:439 +#: g10/g10.c:446 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:492 +#: g10/g10.c:499 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:626 +#: g10/g10.c:633 #, 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:630 +#: g10/g10.c:637 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s' : %s\n" -#: g10/g10.c:637 +#: g10/g10.c:644 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:805 +#: g10/g10.c:824 #, 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:852 g10/g10.c:864 +#: g10/g10.c:872 g10/g10.c:884 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sИlectionnИ est invalide\n" -#: g10/g10.c:858 g10/g10.c:870 +#: g10/g10.c:878 g10/g10.c:890 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sИlectionnИe est invalide\n" -#: g10/g10.c:874 +#: g10/g10.c:894 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:877 +#: g10/g10.c:897 #, 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:879 +#: g10/g10.c:899 msgid "completes-needed must be greater than 0\n" msgstr "╚ completes-needed ╩ doit Йtre supИrieur Ю 0\n" -#: g10/g10.c:881 +#: g10/g10.c:901 msgid "marginals-needed must be greater than 1\n" msgstr "╚ marginals-needed ╩ doit Йtre supИrieur Ю 1\n" -#: g10/g10.c:883 +#: g10/g10.c:903 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:886 +#: g10/g10.c:906 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:890 +#: g10/g10.c:910 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:967 +#: g10/g10.c:987 #, 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:973 +#: g10/g10.c:993 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:980 +#: g10/g10.c:1000 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:988 +#: g10/g10.c:1008 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:1001 +#: g10/g10.c:1021 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:1014 +#: g10/g10.c:1034 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:1028 +#: g10/g10.c:1048 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:1040 +#: g10/g10.c:1060 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:1049 -msgid "--edit-key username [commands]" +#: g10/g10.c:1068 +msgid "--sign-key user-id" +msgstr "" + +#: g10/g10.c:1076 +#, fuzzy +msgid "--lsign-key user-id" +msgstr "--delete-key utilisateur" + +#: g10/g10.c:1084 +#, fuzzy +msgid "--edit-key user-id [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:1063 -msgid "--delete-secret-key username" +#: g10/g10.c:1100 +#, fuzzy +msgid "--delete-secret-key user-id" msgstr "--delete-secret-key utilisateur" -#: g10/g10.c:1066 -msgid "--delete-key username" +#: g10/g10.c:1103 +#, fuzzy +msgid "--delete-key user-id" msgstr "--delete-key utilisateur" -#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366 +#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "ne peut ouvrir %s: %s\n" -#: g10/g10.c:1101 +#: g10/g10.c:1138 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clИs]" -#: g10/g10.c:1162 +#: g10/g10.c:1199 #, c-format msgid "dearmoring failed: %s\n" msgstr "suppression d'armure non rИussie : %s\n" -#: g10/g10.c:1170 +#: g10/g10.c:1207 #, c-format msgid "enarmoring failed: %s\n" msgstr "construction d'armure non rИussie : %s \n" -#: g10/g10.c:1236 +#: g10/g10.c:1275 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:1317 +#: g10/g10.c:1356 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:1321 +#: g10/g10.c:1360 msgid "Go ahead and type your message ...\n" msgstr "Continuez et tapez votre message...\n" -#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "ne peut ouvrir `%s'\n" -#: g10/g10.c:1493 +#: g10/g10.c:1532 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1499 +#: g10/g10.c:1538 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1505 +#: g10/g10.c:1544 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1513 +#: g10/g10.c:1552 msgid "a notation value must not use any control characters\n" msgstr "" @@ -861,7 +889,12 @@ "caractХre citИ-imprimable (quoted-printable) dans l'armure provenant\n" "certainement d'un agent de transfert de messages boguИ\n" -#: g10/pkclist.c:137 +#. a string with valid answers +#: g10/pkclist.c:140 +msgid "sSmMqQ" +msgstr "sSmMqQ" + +#: g10/pkclist.c:144 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -870,7 +903,7 @@ "Pas de confiance dИfinie pour %lu :\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:147 +#: g10/pkclist.c:154 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -894,28 +927,23 @@ " 4 = je le crois totalement\n" " s = montrez-moi plus d'informations\n" -#: g10/pkclist.c:156 +#: g10/pkclist.c:163 msgid " m = back to the main menu\n" msgstr " m = retour au menu principal\n" -#: g10/pkclist.c:158 +#: g10/pkclist.c:165 msgid " q = quit\n" msgstr " q = quitter\n" -#. a string with valid answers -#: g10/pkclist.c:163 -msgid "sSmMqQ" -msgstr "sSmMqQ" - -#: g10/pkclist.c:167 +#: g10/pkclist.c:171 msgid "Your decision? " msgstr "Votre dИcision ? " -#: g10/pkclist.c:187 +#: g10/pkclist.c:193 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificats conduisant vers une clИ Ю confiance ultime :\n" -#: g10/pkclist.c:256 +#: g10/pkclist.c:264 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" @@ -924,7 +952,7 @@ "N'a pas pu trouver un chemin de confiance valide jusqu'Ю la clИ. Voyons si\n" "nous ne pouvons pas assigner quelques indices de confiance manquants.\n" -#: g10/pkclist.c:262 +#: g10/pkclist.c:270 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -932,7 +960,7 @@ "Aucun chemin menant vers une de nos clИs n'a ИtИ trouvИ.\n" "\n" -#: g10/pkclist.c:264 +#: g10/pkclist.c:272 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -940,7 +968,7 @@ "Aucun certificat Ю confiance indИfinie n'a ИtИ trouvИ.\n" "\n" -#: g10/pkclist.c:266 +#: g10/pkclist.c:274 msgid "" "No trust values changed.\n" "\n" @@ -948,36 +976,36 @@ "Pas d'indice de confiance changИ.\n" "\n" -#: g10/pkclist.c:283 +#: g10/pkclist.c:291 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "clИ %08lX : la clИ a ИtИ rИvoquИe !\n" -#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405 +#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413 msgid "Use this key anyway? " msgstr "Utiliser cette clИ quand-mЙme ? " -#: g10/pkclist.c:293 +#: g10/pkclist.c:301 #, 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:323 +#: g10/pkclist.c:331 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX : la clИ a expirИ\n" -#: g10/pkclist.c:329 +#: g10/pkclist.c:337 #, 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:343 +#: g10/pkclist.c:351 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX : Nous ne faisons PAS confiance Ю cette clИ\n" -#: g10/pkclist.c:349 +#: g10/pkclist.c:357 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -987,15 +1015,15 @@ "propriИtaire\n" "mais elle est quand mЙme acceptИe\n" -#: g10/pkclist.c:355 +#: g10/pkclist.c:363 msgid "This key probably belongs to the owner\n" msgstr "Cette clИ appartient probablement Ю son propriИtaire\n" -#: g10/pkclist.c:360 +#: g10/pkclist.c:368 msgid "This key belongs to us\n" msgstr "Cette clИ nous appartient\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:408 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" @@ -1007,67 +1035,67 @@ "oui Ю la prochaine question\n" "\n" -#: g10/pkclist.c:413 g10/pkclist.c:435 +#: g10/pkclist.c:421 g10/pkclist.c:443 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENTION : Utilisation d'une clИ sans confiance !\n" -#: g10/pkclist.c:456 +#: g10/pkclist.c:464 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:457 +#: g10/pkclist.c:465 msgid " This could mean that the signature is forgery.\n" msgstr " Cela pourrait signifier que la signature est fausse.\n" -#: g10/pkclist.c:461 +#: g10/pkclist.c:469 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:482 +#: g10/pkclist.c:490 msgid "Note: This key has expired!\n" msgstr "Note : Cette clИ a expirИ !\n" -#: g10/pkclist.c:489 +#: g10/pkclist.c:497 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:491 +#: g10/pkclist.c:499 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:507 +#: g10/pkclist.c:515 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENTION : Nous ne faisons PAS confiance Ю cette clИ !\n" -#: g10/pkclist.c:508 +#: g10/pkclist.c:516 msgid " The signature is probably a FORGERY.\n" msgstr " La signature est certainement FAUSSE.\n" -#: g10/pkclist.c:515 +#: g10/pkclist.c:523 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:518 +#: g10/pkclist.c:526 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:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715 +#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803 #, c-format msgid "%s: skipped: %s\n" msgstr "%s : ignorИ : %s\n" -#: g10/pkclist.c:590 g10/pkclist.c:697 +#: g10/pkclist.c:635 g10/pkclist.c:785 #, 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:613 +#: g10/pkclist.c:662 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1076,30 +1104,34 @@ "\"-r\")\n" "\n" -#: g10/pkclist.c:618 +#: g10/pkclist.c:672 msgid "Enter the user ID: " msgstr "Entrez le nom d'utilisateur : " -#: g10/pkclist.c:629 +#: g10/pkclist.c:684 msgid "No such user ID.\n" msgstr "Pas de tel utilisateur.\n" -#: g10/pkclist.c:639 +#: g10/pkclist.c:704 #, fuzzy msgid "Public key is disabled.\n" msgstr "la clИ publique est %08lX\n" -#: g10/pkclist.c:678 +#: g10/pkclist.c:733 +msgid "unknown default recipient `s'\n" +msgstr "" + +#: g10/pkclist.c:766 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s : erreur pendant la vИrification de la clИ : %s\n" -#: g10/pkclist.c:683 +#: g10/pkclist.c:771 #, 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:721 +#: g10/pkclist.c:809 msgid "no valid addressees\n" msgstr "pas de destinataire valide\n" @@ -1494,238 +1526,238 @@ "utilisation de la clИ secondaire %08lX Ю la place de la clИ\n" "principale %08lX\n" -#: g10/import.c:116 +#: g10/import.c:117 #, c-format msgid "can't open `%s': %s\n" msgstr "impossible d'ouvrir `%s': %s\n" -#: g10/import.c:160 +#: g10/import.c:161 #, c-format msgid "skipping block of type %d\n" msgstr "ne prend pas en compte le bloc de type %d\n" -#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697 +#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu clИs traitИes jusqu'ici\n" -#: g10/import.c:172 +#: g10/import.c:173 #, c-format msgid "error reading `%s': %s\n" msgstr "erreur pendant la lecture de `%s' : %s\n" -#: g10/import.c:175 +#: g10/import.c:176 #, c-format msgid "Total number processed: %lu\n" msgstr " QuantitИ totale traitИe : %lu\n" -#: g10/import.c:177 +#: g10/import.c:178 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sans nom d'utilisateur : %lu\n" -#: g10/import.c:179 +#: g10/import.c:180 #, c-format msgid " imported: %lu" msgstr " importИe : %lu" -#: g10/import.c:185 +#: g10/import.c:186 #, c-format msgid " unchanged: %lu\n" msgstr " inchangИe : %lu\n" -#: g10/import.c:187 +#: g10/import.c:188 #, c-format msgid " new user IDs: %lu\n" msgstr " nouveaux noms d'utilisateurs : %lu\n" -#: g10/import.c:189 +#: g10/import.c:190 #, c-format msgid " new subkeys: %lu\n" msgstr " nouvelles sous-clИs : %lu\n" -#: g10/import.c:191 +#: g10/import.c:192 #, c-format msgid " new signatures: %lu\n" msgstr " nouvelles signatures : %lu\n" -#: g10/import.c:193 +#: g10/import.c:194 #, c-format msgid " new key revocations: %lu\n" msgstr " nouvelles rИvocations de clИs : %lu\n" -#: g10/import.c:195 +#: g10/import.c:196 #, c-format msgid " secret keys read: %lu\n" msgstr " clИs secrХtes lues : %lu\n" -#: g10/import.c:197 +#: g10/import.c:198 #, c-format msgid " secret keys imported: %lu\n" msgstr " clИs secrХtes importИes : %lu\n" -#: g10/import.c:199 +#: g10/import.c:200 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " clИs secrХtes inchangИes : %lu\n" -#: g10/import.c:342 g10/import.c:526 +#: g10/import.c:361 g10/import.c:550 #, c-format msgid "key %08lX: no user id\n" msgstr "clИ %08lX : pas de nom d'utilisateur\n" -#: g10/import.c:353 +#: g10/import.c:372 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "clИ %08lX : pas de nom d'utilisateur valide\n" -#: g10/import.c:355 +#: g10/import.c:374 msgid "this may be caused by a missing self-signature\n" msgstr "cela peut provenir d'une auto-signature manquante\n" -#: g10/import.c:366 g10/import.c:593 +#: g10/import.c:385 g10/import.c:617 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "clИ %08lX : clИ publique pas trouvИe: %s\n" -#: g10/import.c:372 +#: g10/import.c:391 msgid "no default public keyring\n" msgstr "pas de porte-clИs public par dИfaut\n" -#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "Иcriture de `%s'\n" -#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642 +#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666 #, c-format msgid "can't lock keyring `%s': %s\n" msgstr "ne peut verrouiller le porte-clИs `%s' : %s\n" -#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "erreur durant l'Иcriture du porte-clИs `%s' : %s\n" -#: g10/import.c:387 +#: g10/import.c:406 #, c-format msgid "key %08lX: public key imported\n" msgstr "clИ %08lX : clИ publique importИe\n" -#: g10/import.c:399 +#: g10/import.c:423 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "clИ %08lX : ne ressemble pas Ю notre copie\n" -#: g10/import.c:408 g10/import.c:601 +#: g10/import.c:432 g10/import.c:625 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "clИ %08lX : ne peut trouver le bloc de clИs original : %s\n" -#: g10/import.c:414 g10/import.c:607 +#: g10/import.c:438 g10/import.c:631 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "clИ %08lX : ne peut lire le bloc de clИs original : %s\n" -#: g10/import.c:441 +#: g10/import.c:465 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "clИ %08lX : un nouvel utilisateur\n" -#: g10/import.c:444 +#: g10/import.c:468 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "clИ %08lX : %d nouveaux utilisateurs\n" -#: g10/import.c:447 +#: g10/import.c:471 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "clИ %08lX : une nouvelle signature\n" -#: g10/import.c:450 +#: g10/import.c:474 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "clИ %08lX : %d nouvelles signatures\n" -#: g10/import.c:453 +#: g10/import.c:477 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "clИ %08lX : une nouvelle sous-clИ\n" -#: g10/import.c:456 +#: g10/import.c:480 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "clИ %08lX : %d nouvelles sous-clИs\n" -#: g10/import.c:466 +#: g10/import.c:490 #, c-format msgid "key %08lX: not changed\n" msgstr "clИ %08lX : n'a pas changИ\n" -#: g10/import.c:549 +#: g10/import.c:573 #, c-format msgid "key %08lX: secret key imported\n" msgstr "clИ %08lX : clИ secrХte importИe\n" #. we can't merge secret keys -#: g10/import.c:553 +#: g10/import.c:577 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "clИ %08lX : dИjЮ dans le porte-clИs secret\n" -#: g10/import.c:558 +#: g10/import.c:582 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "clИ %08lX : clИ secrХte pas trouvИe: %s\n" -#: g10/import.c:587 +#: g10/import.c:611 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "clИ %08lX : pas de clИ publique - ne peut appliquer le certificat de\n" "rИvocation\n" -#: g10/import.c:618 +#: g10/import.c:642 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "clИ %08lX : certificat de rИvocation invalide : %s - rejetИ\n" -#: g10/import.c:650 +#: g10/import.c:674 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "clИ %08lX : certificat de rИvocation importИ\n" -#: g10/import.c:683 +#: g10/import.c:707 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "clИ %08lX : pas d'utilisateur pour la signature\n" -#: g10/import.c:690 g10/import.c:714 +#: g10/import.c:714 g10/import.c:738 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "clИ %08lX : algorithme de clИ publique non supportИ\n" -#: g10/import.c:691 +#: g10/import.c:715 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "clИ %08lX : auto-signature invalide\n" -#: g10/import.c:706 +#: g10/import.c:730 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "clИ %08lX : pas de sous-clИ pour relier la clИ\n" -#: g10/import.c:715 +#: g10/import.c:739 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "clИ %08lX : liaison avec la sous-clИ invalide\n" -#: g10/import.c:747 +#: g10/import.c:771 #, c-format msgid "key %08lX: skipped userid '" msgstr "clИ %08lX : utilisateur non pris en compte '" -#: g10/import.c:770 +#: g10/import.c:794 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "clИ %08lX : sous-clИ non prise en compte\n" @@ -1734,32 +1766,32 @@ #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense -#: g10/import.c:795 +#: g10/import.c:819 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "clИ %08lX : signature non exportable (classe %02x) - ignorИe\n" -#: g10/import.c:804 +#: g10/import.c:828 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "clИ %08lX : certificat de rИvocation au mauvais endroit - ignorИe\n" -#: g10/import.c:812 +#: g10/import.c:836 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "clИ %08lX : certificat de rИvocation invalide : %s - ignorИe\n" -#: g10/import.c:912 +#: g10/import.c:936 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "clИ %08lX: nom d'utilisateur doublon fusionnИ\n" -#: g10/import.c:963 +#: g10/import.c:987 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "clИ %08lX : certificat de rИvocation ajoutИ\n" -#: g10/import.c:1076 g10/import.c:1131 +#: g10/import.c:1100 g10/import.c:1155 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "clИ %08lX : notre copie n'a pas d'auto-signature\n" @@ -1845,7 +1877,7 @@ msgid "Really sign? " msgstr "Signer rИellement ? " -#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128 +#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "la signature a ИchouИ : %s\n" @@ -1886,397 +1918,397 @@ msgid "moving a key signature to the correct place\n" msgstr "replacer la signature d'une clИ Ю l'endroit correct\n" -#: g10/keyedit.c:561 +#: g10/keyedit.c:564 msgid "quit this menu" msgstr "quitter ce menu" -#: g10/keyedit.c:562 +#: g10/keyedit.c:565 msgid "q" msgstr "q" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save" msgstr "enregistrer" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save and quit" msgstr "enregistrer et quitter" # FIXMOI : si je mets aide Гa va demander de taper "aide"... -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "help" msgstr "help" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "show this help" msgstr "afficher cette aide" # g10/keyedit.c:556 ??? -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "show fingerprint" msgstr "afficher l'empreinte" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list" msgstr "lister" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list key and user ids" msgstr "lister la clИ et les noms d'utilisateurs" -#: g10/keyedit.c:568 +#: g10/keyedit.c:571 msgid "l" msgstr "l" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "uid" msgstr "uid" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "select user id N" msgstr "sИlectionner le nom d'utilisateur N" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "key" msgstr "clИ" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "select secondary key N" msgstr "sИlectionner la clИ secondaire N" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "check" msgstr "vИrifier" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "list signatures" msgstr "lister les signatures" -#: g10/keyedit.c:572 +#: g10/keyedit.c:575 msgid "c" msgstr "c" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign" msgstr "signer" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign the key" msgstr "signer la clИ" -#: g10/keyedit.c:574 +#: g10/keyedit.c:577 msgid "s" msgstr "s" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "lsign" msgstr "lsigner" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "sign the key locally" msgstr "signer la clИ localement" -#: g10/keyedit.c:576 +#: g10/keyedit.c:579 msgid "debug" msgstr "dИboguer" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "adduid" msgstr "aj.ut" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "add a user id" msgstr "ajouter un utilisateur" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "deluid" msgstr "suppr.ut" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "delete user id" msgstr "enlever un utilisateur" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "addkey" msgstr "aj.clИ" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "add a secondary key" msgstr "ajouter une clИ secondaire" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delkey" msgstr "suppr.clИ" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delete a secondary key" msgstr "enlever une clИ secondaire" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 #, fuzzy msgid "delsig" msgstr "lsigner" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 #, fuzzy msgid "delete signatures" msgstr "lister les signatures" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "expire" msgstr "expire" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "change the expire date" msgstr "changer la date d'expiration" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle" msgstr "changer" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle between secret and public key listing" msgstr "passer de la liste des clИs secrХtes aux clИs privИes et inversement" -#: g10/keyedit.c:585 +#: g10/keyedit.c:588 msgid "t" msgstr "t" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "pref" msgstr "prИf" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "list preferences" msgstr "lister les prИfИrences" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "passwd" msgstr "mot.pas" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "change the passphrase" msgstr "changer le mot de passe" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "trust" msgstr "confi." -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "change the ownertrust" msgstr "changer la confiance" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revsig" msgstr "revsig" # -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revoke signatures" msgstr "rИvoquer les signatures" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revkey" msgstr "revclИ" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revoke a secondary key" msgstr "rИvoquer une clИ secondaire" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 msgid "disable" msgstr "" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 #, fuzzy msgid "disable a key" msgstr "mauvaise clИ" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 msgid "enable" msgstr "" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 #, fuzzy msgid "enable a key" msgstr "mauvaise clИ" -#: g10/keyedit.c:611 +#: g10/keyedit.c:614 msgid "can't do that in batchmode\n" msgstr "impossible de faire cela en mode automatique\n" #. check that they match -#. FIXME: check that they both match -#: g10/keyedit.c:640 +#. fixme: check that they both match +#: g10/keyedit.c:652 msgid "Secret key is available.\n" msgstr "La clИ secrХte est disponible.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:681 msgid "Command> " msgstr "Commande> " -#: g10/keyedit.c:696 +#: g10/keyedit.c:711 msgid "Need the secret key to do this.\n" msgstr "Il faut la clИ secrХte pour faire cela.\n" -#: g10/keyedit.c:718 -msgid "Save changes? " -msgstr "Enregistrer les changements? " - -#: g10/keyedit.c:721 -msgid "Quit without saving? " -msgstr "Quitter sans enregistrer? " - -#: g10/keyedit.c:731 -#, c-format -msgid "update failed: %s\n" -msgstr "la mise Ю jour a ИchouИ : %s\n" - -#: g10/keyedit.c:738 -#, c-format -msgid "update secret failed: %s\n" -msgstr "la mise Ю jour de la clИ secrХte a ИchouИ : %s\n" - -#: g10/keyedit.c:745 -msgid "Key not changed so no update needed.\n" -msgstr "La clИ n'a pas changИ donc la mise Ю jour est inutile.\n" - -#: g10/keyedit.c:748 g10/keyedit.c:807 -#, c-format -msgid "update of trustdb failed: %s\n" -msgstr "la mise Ю jour de la base de confiance a ИchouИ : %s\n" - -#: g10/keyedit.c:781 +#: g10/keyedit.c:758 msgid "Really sign all user ids? " msgstr "Signer vraiment tous les utilisateurs ? " -#: g10/keyedit.c:782 +#: g10/keyedit.c:759 msgid "Hint: Select the user ids to sign\n" msgstr "Aide : SИlectionner les utilisateurs Ю signer\n" -#: g10/keyedit.c:818 g10/keyedit.c:839 +#: g10/keyedit.c:786 g10/keyedit.c:968 +#, c-format +msgid "update of trustdb failed: %s\n" +msgstr "la mise Ю jour de la base de confiance a ИchouИ : %s\n" + +#: g10/keyedit.c:797 g10/keyedit.c:818 msgid "You must select at least one user id.\n" msgstr "Vous devez sИlectionner au moins un utilisateur.\n" -#: g10/keyedit.c:820 +#: g10/keyedit.c:799 msgid "You can't delete the last user id!\n" msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n" -#: g10/keyedit.c:823 +#: g10/keyedit.c:802 msgid "Really remove all selected user ids? " msgstr "Enlever rИellement tous les utilisateurs sИlectionnИs ? " -#: g10/keyedit.c:824 +#: g10/keyedit.c:803 msgid "Really remove this user id? " msgstr "Enlever rИellement cet utilisateur ? " -#: g10/keyedit.c:860 g10/keyedit.c:882 +#: g10/keyedit.c:839 g10/keyedit.c:861 msgid "You must select at least one key.\n" msgstr "Vous devez sИlectionner au moins une clИ.\n" -#: g10/keyedit.c:864 +#: g10/keyedit.c:843 msgid "Do you really want to delete the selected keys? " msgstr "Voulez-vous vraiment supprimer les clИs sИlectionnИes ? " -#: g10/keyedit.c:865 +#: g10/keyedit.c:844 msgid "Do you really want to delete this key? " msgstr "Voulez-vous vraiment supprimer cette clИ ? " -#: g10/keyedit.c:886 +#: g10/keyedit.c:865 msgid "Do you really want to revoke the selected keys? " msgstr "Voulez-vous vraiment rИvoquer les clИs sИlectionnИes ? " -#: g10/keyedit.c:887 +#: g10/keyedit.c:866 msgid "Do you really want to revoke this key? " msgstr "Voulez-vous vraiment rИvoquer cette clИ ? " -#: g10/keyedit.c:949 +#: g10/keyedit.c:932 +msgid "Save changes? " +msgstr "Enregistrer les changements? " + +#: g10/keyedit.c:935 +msgid "Quit without saving? " +msgstr "Quitter sans enregistrer? " + +#: g10/keyedit.c:946 +#, c-format +msgid "update failed: %s\n" +msgstr "la mise Ю jour a ИchouИ : %s\n" + +#: g10/keyedit.c:953 +#, c-format +msgid "update secret failed: %s\n" +msgstr "la mise Ю jour de la clИ secrХte a ИchouИ : %s\n" + +#: g10/keyedit.c:960 +msgid "Key not changed so no update needed.\n" +msgstr "La clИ n'a pas changИ donc la mise Ю jour est inutile.\n" + +#: g10/keyedit.c:975 msgid "Invalid command (try \"help\")\n" msgstr "Commande invalide (essayez ╚ help ╩)\n" -#: g10/keyedit.c:1039 +#: g10/keyedit.c:1065 #, fuzzy msgid "This key has been disabled" msgstr "Note : Cette clИ a expirИ !\n" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1314 +#: g10/keyedit.c:1340 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1318 +#: g10/keyedit.c:1344 #, fuzzy msgid "Delete this unknown signature? (y/N/q)" msgstr "Faut-il vraiment gИnИrer les certificats de rИvocation ? (o/N)" -#: g10/keyedit.c:1324 +#: g10/keyedit.c:1350 #, fuzzy msgid "Really delete this self-signature? (y/N)" msgstr "Faut-il vraiment gИnИrer les certificats de rИvocation ? (o/N)" -#: g10/keyedit.c:1338 +#: g10/keyedit.c:1364 #, fuzzy, c-format msgid "Deleted %d signature.\n" msgstr "%d mauvaises signatures\n" -#: g10/keyedit.c:1339 +#: g10/keyedit.c:1365 #, fuzzy, c-format msgid "Deleted %d signatures.\n" msgstr "%d mauvaises signatures\n" -#: g10/keyedit.c:1342 +#: g10/keyedit.c:1368 #, fuzzy msgid "Nothing deleted.\n" msgstr "ATTENTION : rien n'a ИtИ exportИ\n" -#: g10/keyedit.c:1411 +#: g10/keyedit.c:1437 msgid "Please remove selections from the secret keys.\n" msgstr "Enlevez les sИlections des clИs secrХtes.\n" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1443 msgid "Please select at most one secondary key.\n" msgstr "Vous devez sИlectionner au plus une clИ secondaire.\n" -#: g10/keyedit.c:1421 +#: g10/keyedit.c:1447 #, fuzzy msgid "Changing expiration time for a secondary key.\n" msgstr "Changer la date d'expiration d'une clИ secondaire.\n" -#: g10/keyedit.c:1423 +#: g10/keyedit.c:1449 #, fuzzy msgid "Changing expiration time for the primary key.\n" msgstr "Changer la date d'expiration de la clИ principale.\n" -#: g10/keyedit.c:1464 +#: g10/keyedit.c:1490 msgid "You can't change the expiration date of a v3 key\n" msgstr "Vous ne pouvez pas changer la date d'expiration d'une clИ v3\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1506 msgid "No corresponding signature in secret ring\n" msgstr "Pas de signature correspondante dans le porte-clИs secret\n" -#: g10/keyedit.c:1540 +#: g10/keyedit.c:1566 #, c-format msgid "No user id with index %d\n" msgstr "Pas d'utilisateur avec l'index %d\n" -#: g10/keyedit.c:1586 +#: g10/keyedit.c:1612 #, c-format msgid "No secondary key with index %d\n" msgstr "Pas de clИ secondaire avec l'index %d\n" -#: g10/keyedit.c:1684 +#: g10/keyedit.c:1710 msgid "user ID: \"" msgstr "nom d'utilisateur : ╚ " -#: g10/keyedit.c:1687 +#: g10/keyedit.c:1713 #, c-format msgid "" "\"\n" @@ -2285,15 +2317,15 @@ " ╩\n" "signИ avec votre clИ %08lX Ю %s\n" -#: g10/keyedit.c:1691 +#: g10/keyedit.c:1717 msgid "Create a revocation certificate for this signature? (y/N)" msgstr "GИnИrer un certificat de rИvocation pour cette signature ? (o/N)" -#: g10/keyedit.c:1771 +#: g10/keyedit.c:1797 msgid "Really create the revocation certificates? (y/N)" msgstr "Faut-il vraiment gИnИrer les certificats de rИvocation ? (o/N)" -#: g10/keyedit.c:1794 +#: g10/keyedit.c:1820 msgid "no secret key\n" msgstr "pas de clИ secrХte\n" @@ -3304,6 +3336,9 @@ #, c-format msgid "No help available for `%s'" msgstr "Pas d'aide disponible pour `%s'" + +#~ msgid "print all message digests" +#~ msgstr "Иcrire toutes les fonctions de hachage" #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" #~ msgstr "" diff -urN gnupg-0.9.8a/po/gnupg.pot gnupg-0.9.8b/po/gnupg.pot --- gnupg-0.9.8a/po/gnupg.pot Mon Jul 12 15:05:02 1999 +++ gnupg-0.9.8b/po/gnupg.pot Wed Jul 14 11:47:28 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-07-12 15:04+0200\n" +"POT-Creation-Date: 1999-07-14 11:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,7 +34,7 @@ msgid "yY" msgstr "" -#: g10/keyedit.c:561 util/miscutil.c:272 +#: g10/keyedit.c:564 util/miscutil.c:272 msgid "quit" msgstr "" @@ -265,297 +265,309 @@ "the OS a chance to collect more entropy! (Need %d more bytes)\n" msgstr "" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "" "@Commands:\n" " " msgstr "" -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|[file]|make a signature" msgstr "" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "|[file]|make a clear text signature" msgstr "" -#: g10/g10.c:181 +#: g10/g10.c:184 msgid "make a detached signature" msgstr "" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "encrypt data" msgstr "" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "encryption only with symmetric cipher" msgstr "" -#: g10/g10.c:184 +#: g10/g10.c:187 msgid "store only" msgstr "" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "decrypt data (default)" msgstr "" -#: g10/g10.c:186 +#: g10/g10.c:189 msgid "verify a signature" msgstr "" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "list keys" msgstr "" -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "list keys and signatures" msgstr "" -#: g10/g10.c:190 +#: g10/g10.c:193 msgid "check key signatures" msgstr "" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "list keys and fingerprints" msgstr "" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "list secret keys" msgstr "" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "generate a new key pair" msgstr "" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "remove key from the public keyring" msgstr "" -#: g10/g10.c:195 +#: g10/g10.c:198 +msgid "sign a key" +msgstr "" + +#: g10/g10.c:199 +msgid "sign a key locally" +msgstr "" + +#: g10/g10.c:200 msgid "sign or edit a key" msgstr "" -#: g10/g10.c:196 +#: g10/g10.c:201 msgid "generate a revocation certificate" msgstr "" -#: g10/g10.c:197 +#: g10/g10.c:202 msgid "export keys" msgstr "" -#: g10/g10.c:198 +#: g10/g10.c:203 msgid "export keys to a key server" msgstr "" -#: g10/g10.c:199 +#: g10/g10.c:204 msgid "import keys from a key server" msgstr "" -#: g10/g10.c:202 +#: g10/g10.c:207 msgid "import/merge keys" msgstr "" -#: g10/g10.c:204 +#: g10/g10.c:209 msgid "list only the sequence of packets" msgstr "" -#: g10/g10.c:206 +#: g10/g10.c:211 msgid "export the ownertrust values" msgstr "" -#: g10/g10.c:208 +#: g10/g10.c:213 msgid "import ownertrust values" msgstr "" -#: g10/g10.c:210 -msgid "|[NAMES]|update the trust database" +#: g10/g10.c:215 +msgid "update the trust database" msgstr "" -#: g10/g10.c:212 +#: g10/g10.c:217 msgid "|[NAMES]|check the trust database" msgstr "" -#: g10/g10.c:213 +#: g10/g10.c:218 msgid "fix a corrupted trust database" msgstr "" -#: g10/g10.c:214 +#: g10/g10.c:219 msgid "De-Armor a file or stdin" msgstr "" -#: g10/g10.c:215 +#: g10/g10.c:220 msgid "En-Armor a file or stdin" msgstr "" -#: g10/g10.c:216 +#: g10/g10.c:221 msgid "|algo [files]|print message digests" msgstr "" -#: g10/g10.c:217 -msgid "print all message digests" -msgstr "" - -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "" "@\n" "Options:\n" " " msgstr "" -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "create ascii armored output" msgstr "" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "|NAME|encrypt for NAME" msgstr "" -#: g10/g10.c:230 +#: g10/g10.c:231 +msgid "|NAME|use NAME as default recipient" +msgstr "" + +#: g10/g10.c:233 +msgid "use the default key as default recipient" +msgstr "" + +#: g10/g10.c:237 msgid "use this user-id to sign or decrypt" msgstr "" -#: g10/g10.c:231 +#: g10/g10.c:238 msgid "|N|set compress level N (0 disables)" msgstr "" -#: g10/g10.c:233 +#: g10/g10.c:240 msgid "use canonical text mode" msgstr "" -#: g10/g10.c:234 +#: g10/g10.c:241 msgid "use as output file" msgstr "" -#: g10/g10.c:235 +#: g10/g10.c:242 msgid "verbose" msgstr "" -#: g10/g10.c:236 +#: g10/g10.c:243 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:237 +#: g10/g10.c:244 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:238 +#: g10/g10.c:245 msgid "force v3 signatures" msgstr "" -#: g10/g10.c:239 +#: g10/g10.c:246 msgid "always use a MDC for encryption" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:247 msgid "do not make any changes" msgstr "" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:242 +#: g10/g10.c:249 msgid "batch mode: never ask" msgstr "" -#: g10/g10.c:243 +#: g10/g10.c:250 msgid "assume yes on most questions" msgstr "" -#: g10/g10.c:244 +#: g10/g10.c:251 msgid "assume no on most questions" msgstr "" -#: g10/g10.c:245 +#: g10/g10.c:252 msgid "add this keyring to the list of keyrings" msgstr "" -#: g10/g10.c:246 +#: g10/g10.c:253 msgid "add this secret keyring to the list" msgstr "" -#: g10/g10.c:247 +#: g10/g10.c:254 msgid "|NAME|use NAME as default secret key" msgstr "" -#: g10/g10.c:248 +#: g10/g10.c:255 msgid "|HOST|use this keyserver to lookup keys" msgstr "" -#: g10/g10.c:249 +#: g10/g10.c:256 msgid "|NAME|set terminal charset to NAME" msgstr "" -#: g10/g10.c:250 +#: g10/g10.c:257 msgid "read options from file" msgstr "" -#: g10/g10.c:252 +#: g10/g10.c:259 msgid "set debugging flags" msgstr "" -#: g10/g10.c:253 +#: g10/g10.c:260 msgid "enable full debugging" msgstr "" -#: g10/g10.c:254 +#: g10/g10.c:261 msgid "|FD|write status info to this FD" msgstr "" -#: g10/g10.c:255 +#: g10/g10.c:262 msgid "do not write comment packets" msgstr "" -#: g10/g10.c:256 +#: g10/g10.c:263 msgid "(default is 1)" msgstr "" -#: g10/g10.c:257 +#: g10/g10.c:264 msgid "(default is 3)" msgstr "" -#: g10/g10.c:259 +#: g10/g10.c:266 msgid "|FILE|load extension module FILE" msgstr "" -#: g10/g10.c:260 +#: g10/g10.c:267 msgid "emulate the mode described in RFC1991" msgstr "" -#: g10/g10.c:261 +#: g10/g10.c:268 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:262 +#: g10/g10.c:269 msgid "|N|use passphrase mode N" msgstr "" -#: g10/g10.c:264 +#: g10/g10.c:271 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "" -#: g10/g10.c:266 +#: g10/g10.c:273 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" -#: g10/g10.c:267 +#: g10/g10.c:274 msgid "|NAME|use cipher algorithm NAME" msgstr "" -#: g10/g10.c:268 +#: g10/g10.c:275 msgid "|NAME|use message digest algorithm NAME" msgstr "" -#: g10/g10.c:269 +#: g10/g10.c:276 msgid "|N|use compress algorithm N" msgstr "" -#: g10/g10.c:270 +#: g10/g10.c:277 msgid "throw keyid field of encrypted packets" msgstr "" -#: g10/g10.c:271 +#: g10/g10.c:278 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:273 +#: g10/g10.c:280 msgid "" "@\n" "Examples:\n" @@ -567,190 +579,198 @@ " --fingerprint [names] show fingerprints\n" msgstr "" -#: g10/g10.c:353 +#: g10/g10.c:360 msgid "Please report bugs to .\n" msgstr "" -#: g10/g10.c:357 +#: g10/g10.c:364 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "" -#: g10/g10.c:360 +#: g10/g10.c:367 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" msgstr "" -#: g10/g10.c:365 +#: g10/g10.c:372 msgid "" "\n" "Supported algorithms:\n" msgstr "" -#: g10/g10.c:439 +#: g10/g10.c:446 msgid "usage: gpg [options] " msgstr "" -#: g10/g10.c:492 +#: g10/g10.c:499 msgid "conflicting commands\n" msgstr "" -#: g10/g10.c:626 +#: g10/g10.c:633 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: g10/g10.c:630 +#: g10/g10.c:637 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: g10/g10.c:637 +#: g10/g10.c:644 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: g10/g10.c:805 +#: g10/g10.c:824 #, c-format msgid "%s is not a valid character set\n" msgstr "" -#: g10/g10.c:852 g10/g10.c:864 +#: g10/g10.c:872 g10/g10.c:884 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/g10.c:858 g10/g10.c:870 +#: g10/g10.c:878 g10/g10.c:890 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:874 +#: g10/g10.c:894 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:877 +#: g10/g10.c:897 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "" -#: g10/g10.c:879 +#: g10/g10.c:899 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:881 +#: g10/g10.c:901 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:883 +#: g10/g10.c:903 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:886 +#: g10/g10.c:906 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/g10.c:890 +#: g10/g10.c:910 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/g10.c:967 +#: g10/g10.c:987 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/g10.c:973 +#: g10/g10.c:993 msgid "--store [filename]" msgstr "" -#: g10/g10.c:980 +#: g10/g10.c:1000 msgid "--symmetric [filename]" msgstr "" -#: g10/g10.c:988 +#: g10/g10.c:1008 msgid "--encrypt [filename]" msgstr "" -#: g10/g10.c:1001 +#: g10/g10.c:1021 msgid "--sign [filename]" msgstr "" -#: g10/g10.c:1014 +#: g10/g10.c:1034 msgid "--sign --encrypt [filename]" msgstr "" -#: g10/g10.c:1028 +#: g10/g10.c:1048 msgid "--clearsign [filename]" msgstr "" -#: g10/g10.c:1040 +#: g10/g10.c:1060 msgid "--decrypt [filename]" msgstr "" -#: g10/g10.c:1049 -msgid "--edit-key username [commands]" +#: g10/g10.c:1068 +msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1063 -msgid "--delete-secret-key username" +#: g10/g10.c:1076 +msgid "--lsign-key user-id" msgstr "" -#: g10/g10.c:1066 -msgid "--delete-key username" +#: g10/g10.c:1084 +msgid "--edit-key user-id [commands]" msgstr "" -#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366 +#: g10/g10.c:1100 +msgid "--delete-secret-key user-id" +msgstr "" + +#: g10/g10.c:1103 +msgid "--delete-key user-id" +msgstr "" + +#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "" -#: g10/g10.c:1101 +#: g10/g10.c:1138 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "" -#: g10/g10.c:1162 +#: g10/g10.c:1199 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/g10.c:1170 +#: g10/g10.c:1207 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/g10.c:1236 +#: g10/g10.c:1275 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "" -#: g10/g10.c:1317 +#: g10/g10.c:1356 msgid "[filename]" msgstr "" -#: g10/g10.c:1321 +#: g10/g10.c:1360 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "" -#: g10/g10.c:1493 +#: g10/g10.c:1532 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1499 +#: g10/g10.c:1538 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1505 +#: g10/g10.c:1544 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1513 +#: g10/g10.c:1552 msgid "a notation value must not use any control characters\n" msgstr "" @@ -827,14 +847,19 @@ "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" -#: g10/pkclist.c:137 +#. a string with valid answers +#: g10/pkclist.c:140 +msgid "sSmMqQ" +msgstr "" + +#: g10/pkclist.c:144 #, c-format msgid "" "No trust value assigned to %lu:\n" "%4u%c/%08lX %s \"" msgstr "" -#: g10/pkclist.c:147 +#: g10/pkclist.c:154 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -847,97 +872,92 @@ " s = please show me more information\n" msgstr "" -#: g10/pkclist.c:156 +#: g10/pkclist.c:163 msgid " m = back to the main menu\n" msgstr "" -#: g10/pkclist.c:158 +#: g10/pkclist.c:165 msgid " q = quit\n" msgstr "" -#. a string with valid answers -#: g10/pkclist.c:163 -msgid "sSmMqQ" -msgstr "" - -#: g10/pkclist.c:167 +#: g10/pkclist.c:171 msgid "Your decision? " msgstr "" -#: g10/pkclist.c:187 +#: g10/pkclist.c:193 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:256 +#: g10/pkclist.c:264 msgid "" "Could not find a valid trust path to the key. Let's see whether we\n" "can assign some missing owner trust values.\n" "\n" msgstr "" -#: g10/pkclist.c:262 +#: g10/pkclist.c:270 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" -#: g10/pkclist.c:264 +#: g10/pkclist.c:272 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "" -#: g10/pkclist.c:266 +#: g10/pkclist.c:274 msgid "" "No trust values changed.\n" "\n" msgstr "" -#: g10/pkclist.c:283 +#: g10/pkclist.c:291 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "" -#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405 +#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413 msgid "Use this key anyway? " msgstr "" -#: g10/pkclist.c:293 +#: g10/pkclist.c:301 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "" -#: g10/pkclist.c:323 +#: g10/pkclist.c:331 #, c-format msgid "%08lX: key has expired\n" msgstr "" -#: g10/pkclist.c:329 +#: g10/pkclist.c:337 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" -#: g10/pkclist.c:343 +#: g10/pkclist.c:351 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "" -#: g10/pkclist.c:349 +#: g10/pkclist.c:357 #, 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:355 +#: g10/pkclist.c:363 msgid "This key probably belongs to the owner\n" msgstr "" -#: g10/pkclist.c:360 +#: g10/pkclist.c:368 msgid "This key belongs to us\n" msgstr "" -#: g10/pkclist.c:400 +#: g10/pkclist.c:408 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" @@ -945,91 +965,95 @@ "\n" msgstr "" -#: g10/pkclist.c:413 g10/pkclist.c:435 +#: g10/pkclist.c:421 g10/pkclist.c:443 msgid "WARNING: Using untrusted key!\n" msgstr "" -#: g10/pkclist.c:456 +#: g10/pkclist.c:464 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "" -#: g10/pkclist.c:457 +#: g10/pkclist.c:465 msgid " This could mean that the signature is forgery.\n" msgstr "" -#: g10/pkclist.c:461 +#: g10/pkclist.c:469 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "" -#: g10/pkclist.c:482 +#: g10/pkclist.c:490 msgid "Note: This key has expired!\n" msgstr "" -#: g10/pkclist.c:489 +#: g10/pkclist.c:497 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" -#: g10/pkclist.c:491 +#: g10/pkclist.c:499 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:507 +#: g10/pkclist.c:515 msgid "WARNING: We do NOT trust this key!\n" msgstr "" -#: g10/pkclist.c:508 +#: g10/pkclist.c:516 msgid " The signature is probably a FORGERY.\n" msgstr "" -#: g10/pkclist.c:515 +#: g10/pkclist.c:523 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" -#: g10/pkclist.c:518 +#: g10/pkclist.c:526 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715 +#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803 #, c-format msgid "%s: skipped: %s\n" msgstr "" -#: g10/pkclist.c:590 g10/pkclist.c:697 +#: g10/pkclist.c:635 g10/pkclist.c:785 #, c-format msgid "%s: skipped: public key already present\n" msgstr "" -#: g10/pkclist.c:613 +#: g10/pkclist.c:662 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" msgstr "" -#: g10/pkclist.c:618 +#: g10/pkclist.c:672 msgid "Enter the user ID: " msgstr "" -#: g10/pkclist.c:629 +#: g10/pkclist.c:684 msgid "No such user ID.\n" msgstr "" -#: g10/pkclist.c:639 +#: g10/pkclist.c:704 msgid "Public key is disabled.\n" msgstr "" -#: g10/pkclist.c:678 +#: g10/pkclist.c:733 +msgid "unknown default recipient `s'\n" +msgstr "" + +#: g10/pkclist.c:766 #, c-format msgid "%s: error checking key: %s\n" msgstr "" -#: g10/pkclist.c:683 +#: g10/pkclist.c:771 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "" -#: g10/pkclist.c:721 +#: g10/pkclist.c:809 msgid "no valid addressees\n" msgstr "" @@ -1378,236 +1402,236 @@ msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" -#: g10/import.c:116 +#: g10/import.c:117 #, c-format msgid "can't open `%s': %s\n" msgstr "" -#: g10/import.c:160 +#: g10/import.c:161 #, c-format msgid "skipping block of type %d\n" msgstr "" -#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697 +#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697 #, c-format msgid "%lu keys so far processed\n" msgstr "" -#: g10/import.c:172 +#: g10/import.c:173 #, c-format msgid "error reading `%s': %s\n" msgstr "" -#: g10/import.c:175 +#: g10/import.c:176 #, c-format msgid "Total number processed: %lu\n" msgstr "" -#: g10/import.c:177 +#: g10/import.c:178 #, c-format msgid " w/o user IDs: %lu\n" msgstr "" -#: g10/import.c:179 +#: g10/import.c:180 #, c-format msgid " imported: %lu" msgstr "" -#: g10/import.c:185 +#: g10/import.c:186 #, c-format msgid " unchanged: %lu\n" msgstr "" -#: g10/import.c:187 +#: g10/import.c:188 #, c-format msgid " new user IDs: %lu\n" msgstr "" -#: g10/import.c:189 +#: g10/import.c:190 #, c-format msgid " new subkeys: %lu\n" msgstr "" -#: g10/import.c:191 +#: g10/import.c:192 #, c-format msgid " new signatures: %lu\n" msgstr "" -#: g10/import.c:193 +#: g10/import.c:194 #, c-format msgid " new key revocations: %lu\n" msgstr "" -#: g10/import.c:195 +#: g10/import.c:196 #, c-format msgid " secret keys read: %lu\n" msgstr "" -#: g10/import.c:197 +#: g10/import.c:198 #, c-format msgid " secret keys imported: %lu\n" msgstr "" -#: g10/import.c:199 +#: g10/import.c:200 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "" -#: g10/import.c:342 g10/import.c:526 +#: g10/import.c:361 g10/import.c:550 #, c-format msgid "key %08lX: no user id\n" msgstr "" -#: g10/import.c:353 +#: g10/import.c:372 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "" -#: g10/import.c:355 +#: g10/import.c:374 msgid "this may be caused by a missing self-signature\n" msgstr "" -#: g10/import.c:366 g10/import.c:593 +#: g10/import.c:385 g10/import.c:617 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "" -#: g10/import.c:372 +#: g10/import.c:391 msgid "no default public keyring\n" msgstr "" -#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "" -#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642 +#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666 #, c-format msgid "can't lock keyring `%s': %s\n" msgstr "" -#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "" -#: g10/import.c:387 +#: g10/import.c:406 #, c-format msgid "key %08lX: public key imported\n" msgstr "" -#: g10/import.c:399 +#: g10/import.c:423 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "" -#: g10/import.c:408 g10/import.c:601 +#: g10/import.c:432 g10/import.c:625 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "" -#: g10/import.c:414 g10/import.c:607 +#: g10/import.c:438 g10/import.c:631 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "" -#: g10/import.c:441 +#: g10/import.c:465 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "" -#: g10/import.c:444 +#: g10/import.c:468 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "" -#: g10/import.c:447 +#: g10/import.c:471 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "" -#: g10/import.c:450 +#: g10/import.c:474 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "" -#: g10/import.c:453 +#: g10/import.c:477 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "" -#: g10/import.c:456 +#: g10/import.c:480 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "" -#: g10/import.c:466 +#: g10/import.c:490 #, c-format msgid "key %08lX: not changed\n" msgstr "" -#: g10/import.c:549 +#: g10/import.c:573 #, c-format msgid "key %08lX: secret key imported\n" msgstr "" #. we can't merge secret keys -#: g10/import.c:553 +#: g10/import.c:577 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "" -#: g10/import.c:558 +#: g10/import.c:582 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "" -#: g10/import.c:587 +#: g10/import.c:611 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" -#: g10/import.c:618 +#: g10/import.c:642 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "" -#: g10/import.c:650 +#: g10/import.c:674 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "" -#: g10/import.c:683 +#: g10/import.c:707 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "" -#: g10/import.c:690 g10/import.c:714 +#: g10/import.c:714 g10/import.c:738 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "" -#: g10/import.c:691 +#: g10/import.c:715 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "" -#: g10/import.c:706 +#: g10/import.c:730 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "" -#: g10/import.c:715 +#: g10/import.c:739 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "" -#: g10/import.c:747 +#: g10/import.c:771 #, c-format msgid "key %08lX: skipped userid '" msgstr "" -#: g10/import.c:770 +#: g10/import.c:794 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "" @@ -1616,32 +1640,32 @@ #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense -#: g10/import.c:795 +#: g10/import.c:819 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "" -#: g10/import.c:804 +#: g10/import.c:828 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" -#: g10/import.c:812 +#: g10/import.c:836 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "" -#: g10/import.c:912 +#: g10/import.c:936 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "" -#: g10/import.c:963 +#: g10/import.c:987 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "" -#: g10/import.c:1076 g10/import.c:1131 +#: g10/import.c:1100 g10/import.c:1155 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "" @@ -1723,7 +1747,7 @@ msgid "Really sign? " msgstr "" -#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128 +#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "" @@ -1761,399 +1785,399 @@ msgid "moving a key signature to the correct place\n" msgstr "" -#: g10/keyedit.c:561 +#: g10/keyedit.c:564 msgid "quit this menu" msgstr "" -#: g10/keyedit.c:562 +#: g10/keyedit.c:565 msgid "q" msgstr "" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save" msgstr "" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save and quit" msgstr "" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "help" msgstr "" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "show this help" msgstr "" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "fpr" msgstr "" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "show fingerprint" msgstr "" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list" msgstr "" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list key and user ids" msgstr "" -#: g10/keyedit.c:568 +#: g10/keyedit.c:571 msgid "l" msgstr "" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "uid" msgstr "" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "select user id N" msgstr "" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "key" msgstr "" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "select secondary key N" msgstr "" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "check" msgstr "" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "list signatures" msgstr "" -#: g10/keyedit.c:572 +#: g10/keyedit.c:575 msgid "c" msgstr "" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign" msgstr "" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign the key" msgstr "" -#: g10/keyedit.c:574 +#: g10/keyedit.c:577 msgid "s" msgstr "" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "lsign" msgstr "" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "sign the key locally" msgstr "" -#: g10/keyedit.c:576 +#: g10/keyedit.c:579 msgid "debug" msgstr "" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "adduid" msgstr "" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "add a user id" msgstr "" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "deluid" msgstr "" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "delete user id" msgstr "" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "addkey" msgstr "" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "add a secondary key" msgstr "" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delkey" msgstr "" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delete a secondary key" msgstr "" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 msgid "delsig" msgstr "" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 msgid "delete signatures" msgstr "" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "expire" msgstr "" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "change the expire date" msgstr "" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle" msgstr "" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle between secret and public key listing" msgstr "" -#: g10/keyedit.c:585 +#: g10/keyedit.c:588 msgid "t" msgstr "" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "pref" msgstr "" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "list preferences" msgstr "" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "passwd" msgstr "" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "change the passphrase" msgstr "" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "trust" msgstr "" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "change the ownertrust" msgstr "" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revsig" msgstr "" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revoke signatures" msgstr "" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revkey" msgstr "" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revoke a secondary key" msgstr "" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 msgid "disable" msgstr "" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 msgid "disable a key" msgstr "" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 msgid "enable" msgstr "" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 msgid "enable a key" msgstr "" -#: g10/keyedit.c:611 +#: g10/keyedit.c:614 msgid "can't do that in batchmode\n" msgstr "" #. check that they match -#. FIXME: check that they both match -#: g10/keyedit.c:640 +#. fixme: check that they both match +#: g10/keyedit.c:652 msgid "Secret key is available.\n" msgstr "" -#: g10/keyedit.c:669 +#: g10/keyedit.c:681 msgid "Command> " msgstr "" -#: g10/keyedit.c:696 +#: g10/keyedit.c:711 msgid "Need the secret key to do this.\n" msgstr "" -#: g10/keyedit.c:718 -msgid "Save changes? " -msgstr "" - -#: g10/keyedit.c:721 -msgid "Quit without saving? " -msgstr "" - -#: g10/keyedit.c:731 -#, c-format -msgid "update failed: %s\n" -msgstr "" - -#: g10/keyedit.c:738 -#, c-format -msgid "update secret failed: %s\n" +#: g10/keyedit.c:758 +msgid "Really sign all user ids? " msgstr "" -#: g10/keyedit.c:745 -msgid "Key not changed so no update needed.\n" +#: g10/keyedit.c:759 +msgid "Hint: Select the user ids to sign\n" msgstr "" -#: g10/keyedit.c:748 g10/keyedit.c:807 +#: g10/keyedit.c:786 g10/keyedit.c:968 #, c-format msgid "update of trustdb failed: %s\n" msgstr "" -#: g10/keyedit.c:781 -msgid "Really sign all user ids? " -msgstr "" - -#: g10/keyedit.c:782 -msgid "Hint: Select the user ids to sign\n" -msgstr "" - -#: g10/keyedit.c:818 g10/keyedit.c:839 +#: g10/keyedit.c:797 g10/keyedit.c:818 msgid "You must select at least one user id.\n" msgstr "" -#: g10/keyedit.c:820 +#: g10/keyedit.c:799 msgid "You can't delete the last user id!\n" msgstr "" -#: g10/keyedit.c:823 +#: g10/keyedit.c:802 msgid "Really remove all selected user ids? " msgstr "" -#: g10/keyedit.c:824 +#: g10/keyedit.c:803 msgid "Really remove this user id? " msgstr "" -#: g10/keyedit.c:860 g10/keyedit.c:882 +#: g10/keyedit.c:839 g10/keyedit.c:861 msgid "You must select at least one key.\n" msgstr "" -#: g10/keyedit.c:864 +#: g10/keyedit.c:843 msgid "Do you really want to delete the selected keys? " msgstr "" -#: g10/keyedit.c:865 +#: g10/keyedit.c:844 msgid "Do you really want to delete this key? " msgstr "" -#: g10/keyedit.c:886 +#: g10/keyedit.c:865 msgid "Do you really want to revoke the selected keys? " msgstr "" -#: g10/keyedit.c:887 +#: g10/keyedit.c:866 msgid "Do you really want to revoke this key? " msgstr "" -#: g10/keyedit.c:949 +#: g10/keyedit.c:932 +msgid "Save changes? " +msgstr "" + +#: g10/keyedit.c:935 +msgid "Quit without saving? " +msgstr "" + +#: g10/keyedit.c:946 +#, c-format +msgid "update failed: %s\n" +msgstr "" + +#: g10/keyedit.c:953 +#, c-format +msgid "update secret failed: %s\n" +msgstr "" + +#: g10/keyedit.c:960 +msgid "Key not changed so no update needed.\n" +msgstr "" + +#: g10/keyedit.c:975 msgid "Invalid command (try \"help\")\n" msgstr "" -#: g10/keyedit.c:1039 +#: g10/keyedit.c:1065 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1314 +#: g10/keyedit.c:1340 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1318 +#: g10/keyedit.c:1344 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1324 +#: g10/keyedit.c:1350 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:1338 +#: g10/keyedit.c:1364 #, c-format msgid "Deleted %d signature.\n" msgstr "" -#: g10/keyedit.c:1339 +#: g10/keyedit.c:1365 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:1342 +#: g10/keyedit.c:1368 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:1411 +#: g10/keyedit.c:1437 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1443 msgid "Please select at most one secondary key.\n" msgstr "" -#: g10/keyedit.c:1421 +#: g10/keyedit.c:1447 msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:1423 +#: g10/keyedit.c:1449 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:1464 +#: g10/keyedit.c:1490 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1506 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:1540 +#: g10/keyedit.c:1566 #, c-format msgid "No user id with index %d\n" msgstr "" -#: g10/keyedit.c:1586 +#: g10/keyedit.c:1612 #, c-format msgid "No secondary key with index %d\n" msgstr "" -#: g10/keyedit.c:1684 +#: g10/keyedit.c:1710 msgid "user ID: \"" msgstr "" -#: g10/keyedit.c:1687 +#: g10/keyedit.c:1713 #, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" msgstr "" -#: g10/keyedit.c:1691 +#: g10/keyedit.c:1717 msgid "Create a revocation certificate for this signature? (y/N)" msgstr "" -#: g10/keyedit.c:1771 +#: g10/keyedit.c:1797 msgid "Really create the revocation certificates? (y/N)" msgstr "" -#: g10/keyedit.c:1794 +#: g10/keyedit.c:1820 msgid "no secret key\n" msgstr "" diff -urN gnupg-0.9.8a/po/it.po gnupg-0.9.8b/po/it.po --- gnupg-0.9.8a/po/it.po Mon Jul 12 15:05:13 1999 +++ gnupg-0.9.8b/po/it.po Wed Jul 14 11:50:47 1999 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.9.7\n" -"POT-Creation-Date: 1999-07-12 15:04+0200\n" +"POT-Creation-Date: 1999-07-14 11:47+0200\n" "PO-Revision-Date: 1999-06-28 19:49+02:00\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -33,7 +33,7 @@ msgid "yY" msgstr "sS" -#: g10/keyedit.c:561 util/miscutil.c:272 +#: g10/keyedit.c:564 util/miscutil.c:272 msgid "quit" msgstr "quit" @@ -271,7 +271,7 @@ "altra cosa per dare all'OS la possibilitЮ di raccogliere altra entropia!\n" "(Servono ancora %d altri byte)\n" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "" "@Commands:\n" " " @@ -279,131 +279,138 @@ "@Comandi:\n" " " -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|[file]|make a signature" msgstr "|[file]|fai una firma" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "|[file]|make a clear text signature" msgstr "|[file]|fai una firma mantenendo il testo in chiaro" -#: g10/g10.c:181 +#: g10/g10.c:184 msgid "make a detached signature" msgstr "fai una firma separata" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "encrypt data" msgstr "cifra dati" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "encryption only with symmetric cipher" msgstr "cifra solo con un cifrario simmetrico" -#: g10/g10.c:184 +#: g10/g10.c:187 msgid "store only" msgstr "immagazzina soltanto" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "decrypt data (default)" msgstr "decifra dati (predefinito)" -#: g10/g10.c:186 +#: g10/g10.c:189 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "list keys" msgstr "elenca le chiavi" -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "list keys and signatures" msgstr "elenca le chiavi e le firme" -#: g10/g10.c:190 +#: g10/g10.c:193 msgid "check key signatures" msgstr "controlla le firme delle chiavi" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "list keys and fingerprints" msgstr "elenca le chiavi e le impronte digitali" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "list secret keys" msgstr "elenca le chiavi segrete" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "generate a new key pair" msgstr "genera una nuova coppia di chiavi" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "remove key from the public keyring" msgstr "rimuove una chiave dal portachiavi pubblico" -#: g10/g10.c:195 +#: g10/g10.c:198 +#, fuzzy +msgid "sign a key" +msgstr "firma la chiave" + +#: g10/g10.c:199 +#, fuzzy +msgid "sign a key locally" +msgstr "firma la chiave localmente" + +#: g10/g10.c:200 msgid "sign or edit a key" msgstr "firma o modifica una chiave" -#: g10/g10.c:196 +#: g10/g10.c:201 msgid "generate a revocation certificate" msgstr "genera un certificato di revoca" -#: g10/g10.c:197 +#: g10/g10.c:202 msgid "export keys" msgstr "esporta delle chiavi" -#: g10/g10.c:198 +#: g10/g10.c:203 msgid "export keys to a key server" msgstr "esporta le chiavi a un key server" -#: g10/g10.c:199 +#: g10/g10.c:204 msgid "import keys from a key server" msgstr "importa le chiavi da un key server" -#: g10/g10.c:202 +#: g10/g10.c:207 msgid "import/merge keys" msgstr "importa/aggiungi delle chiavi" -#: g10/g10.c:204 +#: g10/g10.c:209 msgid "list only the sequence of packets" msgstr "elenca solo la sequenza dei pacchetti" -#: g10/g10.c:206 +#: g10/g10.c:211 msgid "export the ownertrust values" msgstr "esporta i valori di fiducia" -#: g10/g10.c:208 +#: g10/g10.c:213 msgid "import ownertrust values" msgstr "importa i valori di fiducia" -#: g10/g10.c:210 -msgid "|[NAMES]|update the trust database" +#: g10/g10.c:215 +#, fuzzy +msgid "update the trust database" msgstr "|[NOMI]|controlla il database della fiducia" -#: g10/g10.c:212 +#: g10/g10.c:217 msgid "|[NAMES]|check the trust database" msgstr "|[NOMI]|controlla il database della fiducia" -#: g10/g10.c:213 +#: g10/g10.c:218 msgid "fix a corrupted trust database" msgstr "ripara un database della fiducia rovinato" -#: g10/g10.c:214 +#: g10/g10.c:219 msgid "De-Armor a file or stdin" msgstr "rimuovi l'armatura a un file o a stdin" -#: g10/g10.c:215 +#: g10/g10.c:220 msgid "En-Armor a file or stdin" msgstr "crea l'armatura a un file o a stdin" -#: g10/g10.c:216 +#: g10/g10.c:221 msgid "|algo [files]|print message digests" msgstr "|algo [files]|stampa tutti i message digests" -#: g10/g10.c:217 -msgid "print all message digests" -msgstr "stampa tutti i message digests" - -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "" "@\n" "Options:\n" @@ -413,160 +420,169 @@ "Opzioni:\n" " " -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "create ascii armored output" msgstr "crea un output ascii con armatura" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "|NAME|encrypt for NAME" msgstr "|NOME|cifra per NOME" -#: g10/g10.c:230 +#: g10/g10.c:231 +#, fuzzy +msgid "|NAME|use NAME as default recipient" +msgstr "|NAME|usa NAME come chiave segreta predefinita" + +#: g10/g10.c:233 +msgid "use the default key as default recipient" +msgstr "" + +#: g10/g10.c:237 msgid "use this user-id to sign or decrypt" msgstr "usa questo user-id per firmare o decifrare" -#: g10/g10.c:231 +#: g10/g10.c:238 msgid "|N|set compress level N (0 disables)" msgstr "|N|imposta il livello di compressione (0 disabilita)" -#: g10/g10.c:233 +#: g10/g10.c:240 msgid "use canonical text mode" msgstr "usa il modo testo canonico" -#: g10/g10.c:234 +#: g10/g10.c:241 msgid "use as output file" msgstr "usa come file di output" -#: g10/g10.c:235 +#: g10/g10.c:242 msgid "verbose" msgstr "prolisso" -#: g10/g10.c:236 +#: g10/g10.c:243 msgid "be somewhat more quiet" msgstr "meno prolisso" -#: g10/g10.c:237 +#: g10/g10.c:244 msgid "don't use the terminal at all" msgstr "non usa per niente il terminale" -#: g10/g10.c:238 +#: g10/g10.c:245 msgid "force v3 signatures" msgstr "forza l'uso di firme v3" -#: g10/g10.c:239 +#: g10/g10.c:246 msgid "always use a MDC for encryption" msgstr "usa sempre un MDC per cifrare" -#: g10/g10.c:240 +#: g10/g10.c:247 msgid "do not make any changes" msgstr "non fa cambiamenti" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:242 +#: g10/g10.c:249 msgid "batch mode: never ask" msgstr "modo batch: non fare domande" -#: g10/g10.c:243 +#: g10/g10.c:250 msgid "assume yes on most questions" msgstr "assumi \"sЛ\" a quasi tutte le domande" -#: g10/g10.c:244 +#: g10/g10.c:251 msgid "assume no on most questions" msgstr "assumi \"no\" a quasi tutte le domande" -#: g10/g10.c:245 +#: g10/g10.c:252 msgid "add this keyring to the list of keyrings" msgstr "aggiungi questo portachiavi alla lista" -#: g10/g10.c:246 +#: g10/g10.c:253 msgid "add this secret keyring to the list" msgstr "aggiungi questo portachiavi segreto alla lista" -#: g10/g10.c:247 +#: g10/g10.c:254 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|usa NAME come chiave segreta predefinita" -#: g10/g10.c:248 +#: g10/g10.c:255 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|cerca le chiavi in questo keyserver" -#: g10/g10.c:249 +#: g10/g10.c:256 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|imposta il set di caratteri del terminale NOME" -#: g10/g10.c:250 +#: g10/g10.c:257 msgid "read options from file" msgstr "leggi le opzioni dal file" -#: g10/g10.c:252 +#: g10/g10.c:259 msgid "set debugging flags" msgstr "imposta i flag di debugging" -#: g10/g10.c:253 +#: g10/g10.c:260 msgid "enable full debugging" msgstr "abilita il debugging completo" -#: g10/g10.c:254 +#: g10/g10.c:261 msgid "|FD|write status info to this FD" msgstr "|FD|scrivi le informazioni di stato su questo fd" -#: g10/g10.c:255 +#: g10/g10.c:262 msgid "do not write comment packets" msgstr "non scrivere pacchetti di commento" -#: g10/g10.c:256 +#: g10/g10.c:263 msgid "(default is 1)" msgstr "(predefinito Х 1)" -#: g10/g10.c:257 +#: g10/g10.c:264 msgid "(default is 3)" msgstr "(predefinito Х 3)" -#: g10/g10.c:259 +#: g10/g10.c:266 msgid "|FILE|load extension module FILE" msgstr "|FILE|carica il modulo di estensione FILE" -#: g10/g10.c:260 +#: g10/g10.c:267 msgid "emulate the mode described in RFC1991" msgstr "emula il modo descritto in RFC 1991" -#: g10/g10.c:261 +#: g10/g10.c:268 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "imposta per OpenPGP le opzioni di pacchetto, cifrario e digest" -#: g10/g10.c:262 +#: g10/g10.c:269 msgid "|N|use passphrase mode N" msgstr "|N|usa il modo N per la passphrase" -#: g10/g10.c:264 +#: g10/g10.c:271 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:266 +#: g10/g10.c:273 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase" -#: g10/g10.c:267 +#: g10/g10.c:274 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:268 +#: g10/g10.c:275 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:269 +#: g10/g10.c:276 msgid "|N|use compress algorithm N" msgstr "|N|usa l'algoritmo di compressione N" -#: g10/g10.c:270 +#: g10/g10.c:277 msgid "throw keyid field of encrypted packets" msgstr "elimina il campo keyid dei pacchetti cifrati" -#: g10/g10.c:271 +#: g10/g10.c:278 msgid "|NAME=VALUE|use this notation data" msgstr "|NOME=VALORE|usa questi dati per una nota" -#: g10/g10.c:273 +#: g10/g10.c:280 msgid "" "@\n" "Examples:\n" @@ -586,15 +602,15 @@ " --list-keys [nomi] mostra le chiavi\n" " --fingerprint [nomi] mostra le impronte digitali\n" -#: g10/g10.c:353 +#: g10/g10.c:360 msgid "Please report bugs to .\n" msgstr "Per favore segnala i bug a .\n" -#: g10/g10.c:357 +#: g10/g10.c:364 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:360 +#: g10/g10.c:367 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -604,7 +620,7 @@ "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:365 +#: g10/g10.c:372 msgid "" "\n" "Supported algorithms:\n" @@ -612,161 +628,173 @@ "\n" "Algoritmi gestiti:\n" -#: g10/g10.c:439 +#: g10/g10.c:446 msgid "usage: gpg [options] " msgstr "uso: gpg [options] " -#: g10/g10.c:492 +#: g10/g10.c:499 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:626 +#: g10/g10.c:633 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: manca il file con le opzioni predefinite `%s'\n" -#: g10/g10.c:630 +#: g10/g10.c:637 #, c-format msgid "option file `%s': %s\n" msgstr "file con le opzioni `%s': %s\n" -#: g10/g10.c:637 +#: g10/g10.c:644 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:805 +#: g10/g10.c:824 #, c-format msgid "%s is not a valid character set\n" msgstr "%s non Х un set di caratteri valido\n" -#: g10/g10.c:852 g10/g10.c:864 +#: g10/g10.c:872 g10/g10.c:884 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non Х valido\n" -#: g10/g10.c:858 g10/g10.c:870 +#: g10/g10.c:878 g10/g10.c:890 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non Х valido\n" -#: g10/g10.c:874 +#: g10/g10.c:894 msgid "the given policy URL is invalid\n" msgstr "L'URL della policy indicato non Х valido\n" -#: g10/g10.c:877 +#: g10/g10.c:897 #, 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:879 +#: g10/g10.c:899 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:881 +#: g10/g10.c:901 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:883 +#: g10/g10.c:903 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:886 +#: g10/g10.c:906 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:890 +#: g10/g10.c:910 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:967 +#: g10/g10.c:987 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:973 +#: g10/g10.c:993 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:980 +#: g10/g10.c:1000 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:988 +#: g10/g10.c:1008 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:1001 +#: g10/g10.c:1021 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:1014 +#: g10/g10.c:1034 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:1028 +#: g10/g10.c:1048 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:1040 +#: g10/g10.c:1060 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:1049 -msgid "--edit-key username [commands]" +#: g10/g10.c:1068 +msgid "--sign-key user-id" +msgstr "" + +#: g10/g10.c:1076 +#, fuzzy +msgid "--lsign-key user-id" +msgstr "--delete-key nomeutente" + +#: g10/g10.c:1084 +#, fuzzy +msgid "--edit-key user-id [commands]" msgstr "--edit-key nomeutente [comandi]" -#: g10/g10.c:1063 -msgid "--delete-secret-key username" +#: g10/g10.c:1100 +#, fuzzy +msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nomeutente" -#: g10/g10.c:1066 -msgid "--delete-key username" +#: g10/g10.c:1103 +#, fuzzy +msgid "--delete-key user-id" msgstr "--delete-key nomeutente" -#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366 +#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire `%s': %s\n" -#: g10/g10.c:1101 +#: g10/g10.c:1138 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [userid] [portachiavi]" -#: g10/g10.c:1162 +#: g10/g10.c:1199 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:1170 +#: g10/g10.c:1207 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:1236 +#: g10/g10.c:1275 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:1317 +#: g10/g10.c:1356 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:1321 +#: g10/g10.c:1360 msgid "Go ahead and type your message ...\n" msgstr "Vai avanti e scrivi il messaggio...\n" -#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "impossibile aprire `%s'\n" -#: g10/g10.c:1493 +#: g10/g10.c:1532 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:1499 +#: g10/g10.c:1538 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -774,11 +802,11 @@ "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n" "underscore e deve finire con `='\n" -#: g10/g10.c:1505 +#: g10/g10.c:1544 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:1513 +#: g10/g10.c:1552 msgid "a notation value must not use any control characters\n" msgstr "il valore di una nota non deve usare caratteri di controllo\n" @@ -857,7 +885,14 @@ "carattere quoted printable nell'armatura - probabilmente Х stato usato\n" "un MTA buggato\n" -#: g10/pkclist.c:137 +# 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:140 +msgid "sSmMqQ" +msgstr "sSmMqQ" + +#: g10/pkclist.c:144 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -866,7 +901,7 @@ "Nessun valore di fiducia assegnato a %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:147 +#: g10/pkclist.c:154 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -888,30 +923,23 @@ " 4 = Mi fido completamente\n" " s = mostrami ulteriori informazioni\n" -#: g10/pkclist.c:156 +#: g10/pkclist.c:163 msgid " m = back to the main menu\n" msgstr " m = torna al menЫ principale\n" -#: g10/pkclist.c:158 +#: g10/pkclist.c:165 msgid " q = quit\n" msgstr " q = abbandona\n" -# valid user replies (not including 1..4) -# [Marco, you can change 'm' and 's' to whatever letters you like] -#. a string with valid answers -#: g10/pkclist.c:163 -msgid "sSmMqQ" -msgstr "sSmMqQ" - -#: g10/pkclist.c:167 +#: g10/pkclist.c:171 msgid "Your decision? " msgstr "Cosa hai deciso? " -#: g10/pkclist.c:187 +#: g10/pkclist.c:193 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificati che portano a chiavi definitivamente affidabili:\n" -#: g10/pkclist.c:256 +#: g10/pkclist.c:264 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" @@ -921,20 +949,20 @@ "se possiamo assegnare qualche valore di fiducia del proprietario mancante.\n" "\n" -#: g10/pkclist.c:262 +#: g10/pkclist.c:270 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:264 +#: g10/pkclist.c:272 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "Non Х stato trovato alcun certificato con fiducia non definita.\n" -#: g10/pkclist.c:266 +#: g10/pkclist.c:274 msgid "" "No trust values changed.\n" "\n" @@ -942,37 +970,37 @@ "Nessun valore di fiducia modificato.\n" "\n" -#: g10/pkclist.c:283 +#: g10/pkclist.c:291 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "chiave %08lX: la chiave Х stata revocata!\n" -#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405 +#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413 msgid "Use this key anyway? " msgstr "Uso lo stesso questa chiave? " -#: g10/pkclist.c:293 +#: g10/pkclist.c:301 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "chiave %08lX: la subchiave Х stata revocata!\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:331 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: la chiave Х scaduta\n" -#: g10/pkclist.c:329 +#: g10/pkclist.c:337 #, 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:343 +#: g10/pkclist.c:351 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: NON ci fidiamo di questa chiave!\n" -#: g10/pkclist.c:349 +#: g10/pkclist.c:357 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -981,15 +1009,15 @@ "%08lX: Non Х sicuro che questa chiave appartenga veramente al proprietario\n" "ma Х accettata comunque\n" -#: g10/pkclist.c:355 +#: g10/pkclist.c:363 msgid "This key probably belongs to the owner\n" msgstr "Questa chiave probabilmente appartiene al proprietario\n" -#: g10/pkclist.c:360 +#: g10/pkclist.c:368 msgid "This key belongs to us\n" msgstr "Questa chiave ci appartiene\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:408 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" @@ -1001,65 +1029,65 @@ "prossima domanda.\n" "\n" -#: g10/pkclist.c:413 g10/pkclist.c:435 +#: g10/pkclist.c:421 g10/pkclist.c:443 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENZIONE: uso di una chiave non fidata!\n" -#: g10/pkclist.c:456 +#: g10/pkclist.c:464 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATTENZIONE: questa chiave Х stata revocata dal suo proprietario!\n" -#: g10/pkclist.c:457 +#: g10/pkclist.c:465 msgid " This could mean that the signature is forgery.\n" msgstr " Questo puР significare che la firma Х stata falsificata.\n" -#: g10/pkclist.c:461 +#: g10/pkclist.c:469 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATTENZIONE: questa subchiave Х stata revocata dal proprietario!\n" -#: g10/pkclist.c:482 +#: g10/pkclist.c:490 msgid "Note: This key has expired!\n" msgstr "Nota: questa chiave Х scaduta!\n" -#: g10/pkclist.c:489 +#: g10/pkclist.c:497 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:491 +#: g10/pkclist.c:499 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:507 +#: g10/pkclist.c:515 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n" -#: g10/pkclist.c:508 +#: g10/pkclist.c:516 msgid " The signature is probably a FORGERY.\n" msgstr " La firma Х probabilmente un FALSO.\n" -#: g10/pkclist.c:515 +#: g10/pkclist.c:523 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:518 +#: g10/pkclist.c:526 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:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715 +#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: saltata: %s\n" -#: g10/pkclist.c:590 g10/pkclist.c:697 +#: g10/pkclist.c:635 g10/pkclist.c:785 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: saltato: chiave pubblica giЮ presente\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:662 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1067,30 +1095,34 @@ "Non hai specificato un user ID. (puoi usare \"-r\")\n" "\n" -#: g10/pkclist.c:618 +#: g10/pkclist.c:672 msgid "Enter the user ID: " msgstr "Inserisci l'user ID: " -#: g10/pkclist.c:629 +#: g10/pkclist.c:684 msgid "No such user ID.\n" msgstr "User ID inesistente.\n" -#: g10/pkclist.c:639 +#: g10/pkclist.c:704 #, fuzzy msgid "Public key is disabled.\n" msgstr "la chiave pubblica Х %08lX\n" -#: g10/pkclist.c:678 +#: g10/pkclist.c:733 +msgid "unknown default recipient `s'\n" +msgstr "" + +#: g10/pkclist.c:766 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: errore nel controllare la chiave: %s\n" -#: g10/pkclist.c:683 +#: g10/pkclist.c:771 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: saltato: chiave pubblica giЮ presente\n" -#: g10/pkclist.c:721 +#: g10/pkclist.c:809 msgid "no valid addressees\n" msgstr "nessun indirizzo valido\n" @@ -1478,238 +1510,238 @@ msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n" -#: g10/import.c:116 +#: g10/import.c:117 #, c-format msgid "can't open `%s': %s\n" msgstr "impossibile aprire `%s': %s\n" -#: g10/import.c:160 +#: g10/import.c:161 #, c-format msgid "skipping block of type %d\n" msgstr "salto un blocco di tipo %d\n" -#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697 +#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697 #, c-format msgid "%lu keys so far processed\n" msgstr "Per ora sono state esaminate %lu chiavi\n" -#: g10/import.c:172 +#: g10/import.c:173 #, c-format msgid "error reading `%s': %s\n" msgstr "errore leggendo `%s': %s\n" -#: g10/import.c:175 +#: g10/import.c:176 #, c-format msgid "Total number processed: %lu\n" msgstr "Numero totale esaminato: %lu\n" -#: g10/import.c:177 +#: g10/import.c:178 #, c-format msgid " w/o user IDs: %lu\n" msgstr "senza user ID: %lu\n" -#: g10/import.c:179 +#: g10/import.c:180 #, c-format msgid " imported: %lu" msgstr "importate: %lu" -#: g10/import.c:185 +#: g10/import.c:186 #, c-format msgid " unchanged: %lu\n" msgstr "non modificate: %lu\n" -#: g10/import.c:187 +#: g10/import.c:188 #, c-format msgid " new user IDs: %lu\n" msgstr "nuovi user ID: %lu\n" -#: g10/import.c:189 +#: g10/import.c:190 #, c-format msgid " new subkeys: %lu\n" msgstr "nuove subchiavi: %lu\n" -#: g10/import.c:191 +#: g10/import.c:192 #, c-format msgid " new signatures: %lu\n" msgstr "nuove firme: %lu\n" -#: g10/import.c:193 +#: g10/import.c:194 #, c-format msgid " new key revocations: %lu\n" msgstr "nuove revoche di chiavi: %lu\n" -#: g10/import.c:195 +#: g10/import.c:196 #, c-format msgid " secret keys read: %lu\n" msgstr "chiavi segrete lette: %lu\n" -#: g10/import.c:197 +#: g10/import.c:198 #, c-format msgid " secret keys imported: %lu\n" msgstr "chiavi segrete importate %lu\n" -#: g10/import.c:199 +#: g10/import.c:200 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "chiavi segrete non cambiate %lu\n" -#: g10/import.c:342 g10/import.c:526 +#: g10/import.c:361 g10/import.c:550 #, c-format msgid "key %08lX: no user id\n" msgstr "chiave %08lX: nessun user id\n" -#: g10/import.c:353 +#: g10/import.c:372 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "chiave %08lX: nessun user id valido\n" -#: g10/import.c:355 +#: g10/import.c:374 msgid "this may be caused by a missing self-signature\n" msgstr "questo puР essere causato da una autofirma mancante\n" -#: g10/import.c:366 g10/import.c:593 +#: g10/import.c:385 g10/import.c:617 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "chiave %08lX: chiave pubblica non trovata: %s\n" -#: g10/import.c:372 +#: g10/import.c:391 msgid "no default public keyring\n" msgstr "nessun portachiavi pubblico predefinito\n" -#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "scrittura in `%s'\n" -#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642 +#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666 #, c-format msgid "can't lock keyring `%s': %s\n" msgstr "impossibile fare il lock del portachiavi `%s': %s\n" -#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "errore scrivendo il portachiavi `%s': %s\n" -#: g10/import.c:387 +#: g10/import.c:406 #, c-format msgid "key %08lX: public key imported\n" msgstr "chiave %08lX: chiave pubblica importata\n" -#: g10/import.c:399 +#: g10/import.c:423 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "chiave %08lX: non corrisponde alla nostra copia\n" -#: g10/import.c:408 g10/import.c:601 +#: g10/import.c:432 g10/import.c:625 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n" -#: g10/import.c:414 g10/import.c:607 +#: g10/import.c:438 g10/import.c:631 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n" -#: g10/import.c:441 +#: g10/import.c:465 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "chiave %08lX: un nuovo user id\n" -#: g10/import.c:444 +#: g10/import.c:468 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "chiave %08lX: %d nuovi user id\n" -#: g10/import.c:447 +#: g10/import.c:471 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "chiave %08lX: una nuova firma\n" -#: g10/import.c:450 +#: g10/import.c:474 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "chiave %08lX: %d nuove firme\n" -#: g10/import.c:453 +#: g10/import.c:477 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "chiave %08lX: una nuova subchiave\n" -#: g10/import.c:456 +#: g10/import.c:480 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "chiave %08lX: %d nuove subchiavi\n" -#: g10/import.c:466 +#: g10/import.c:490 #, c-format msgid "key %08lX: not changed\n" msgstr "chiave %08lX: non cambiata\n" -#: g10/import.c:549 +#: g10/import.c:573 #, c-format msgid "key %08lX: secret key imported\n" msgstr "chiave %08lX: chiave segreta importata\n" #. we can't merge secret keys -#: g10/import.c:553 +#: g10/import.c:577 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "chiave %08lX: giЮ nel portachiavi segreto\n" -#: g10/import.c:558 +#: g10/import.c:582 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "chiave %08lX: chiave segreta non trovata: %s\n" -#: g10/import.c:587 +#: g10/import.c:611 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n" "certificato di revoca\n" -#: g10/import.c:618 +#: g10/import.c:642 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n" -#: g10/import.c:650 +#: g10/import.c:674 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "chiave %08lX: certificato di revoca importato\n" -#: g10/import.c:683 +#: g10/import.c:707 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "chiave %08lX: nessun user id per la firma\n" -#: g10/import.c:690 g10/import.c:714 +#: g10/import.c:714 g10/import.c:738 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n" -#: g10/import.c:691 +#: g10/import.c:715 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "chiave %08lX: autofirma non valida\n" -#: g10/import.c:706 +#: g10/import.c:730 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n" -#: g10/import.c:715 +#: g10/import.c:739 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "chiave %08lX: legame con la subchiave non valido:\n" -#: g10/import.c:747 +#: g10/import.c:771 #, c-format msgid "key %08lX: skipped userid '" msgstr "chiave %08lX: saltato l'user id '" -#: g10/import.c:770 +#: g10/import.c:794 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "chiave %08lX: saltata la subchiave\n" @@ -1718,32 +1750,32 @@ #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense -#: g10/import.c:795 +#: g10/import.c:819 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "chiave %08lX: firma non esportabile (chiave %02x) - saltata\n" -#: g10/import.c:804 +#: g10/import.c:828 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n" -#: g10/import.c:812 +#: g10/import.c:836 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n" -#: g10/import.c:912 +#: g10/import.c:936 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "chiave %08lX: trovato un user ID duplicato - unito\n" -#: g10/import.c:963 +#: g10/import.c:987 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "chiave %08lX: certificato di revoca aggiunto\n" -#: g10/import.c:1076 g10/import.c:1131 +#: g10/import.c:1100 g10/import.c:1155 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "chiave %08lX: la nostra copia non ha autofirma\n" @@ -1829,7 +1861,7 @@ msgid "Really sign? " msgstr "Firmo davvero? " -#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128 +#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "firma fallita: %s\n" @@ -1871,387 +1903,387 @@ msgid "moving a key signature to the correct place\n" msgstr "spostamento della firma di una chiave nel posto corretto\n" -#: g10/keyedit.c:561 +#: g10/keyedit.c:564 msgid "quit this menu" msgstr "abbandona questo menЫ" -#: g10/keyedit.c:562 +#: g10/keyedit.c:565 msgid "q" msgstr "q" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save" msgstr "save" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save and quit" msgstr "salva ed esci" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "help" msgstr "help" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "show this help" msgstr "mostra questo aiuto" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "show fingerprint" msgstr "mostra le impronte digitali" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list" msgstr "list" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list key and user ids" msgstr "elenca le chiavi e gli user id" -#: g10/keyedit.c:568 +#: g10/keyedit.c:571 msgid "l" msgstr "l" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "uid" msgstr "uid" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "select user id N" msgstr "scegli l'user id N" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "key" msgstr "key" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "select secondary key N" msgstr "scegli la chiave secondaria N" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "check" msgstr "check" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "list signatures" msgstr "elenca le firme" -#: g10/keyedit.c:572 +#: g10/keyedit.c:575 msgid "c" msgstr "c" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign" msgstr "sign" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign the key" msgstr "firma la chiave" -#: g10/keyedit.c:574 +#: g10/keyedit.c:577 msgid "s" msgstr "s" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "sign the key locally" msgstr "firma la chiave localmente" -#: g10/keyedit.c:576 +#: g10/keyedit.c:579 msgid "debug" msgstr "debug" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "add a user id" msgstr "aggiungi un user id" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "delete user id" msgstr "cancella un user id" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "add a secondary key" msgstr "aggiungi una chiave secondaria" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delete a secondary key" msgstr "cancella una chiave secondaria" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 msgid "delsig" msgstr "delsign" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 msgid "delete signatures" msgstr "cancella le firme" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "expire" msgstr "expire" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "change the expire date" msgstr "cambia la data di scadenza" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle between secret and public key listing" msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica" -#: g10/keyedit.c:585 +#: g10/keyedit.c:588 msgid "t" msgstr "t" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "pref" msgstr "pref" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "list preferences" msgstr "elenca le impostazioni" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "change the passphrase" msgstr "cambia la passphrase" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "trust" msgstr "trust" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "change the ownertrust" msgstr "cambia il valore di fiducia" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revoke signatures" msgstr "revoca firme" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revoke a secondary key" msgstr "revoca una chiave secondaria" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 msgid "disable" msgstr "" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 #, fuzzy msgid "disable a key" msgstr "chiave sbagliata" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 msgid "enable" msgstr "" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 #, fuzzy msgid "enable a key" msgstr "chiave sbagliata" -#: g10/keyedit.c:611 +#: g10/keyedit.c:614 msgid "can't do that in batchmode\n" msgstr "impossibile fare questo in batch mode\n" #. check that they match -#. FIXME: check that they both match -#: g10/keyedit.c:640 +#. fixme: check that they both match +#: g10/keyedit.c:652 msgid "Secret key is available.\n" msgstr "х disponibile una chiave segreta.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:681 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:696 +#: g10/keyedit.c:711 msgid "Need the secret key to do this.\n" msgstr "Per fare questo serve la chiave segreta.\n" -#: g10/keyedit.c:718 -msgid "Save changes? " -msgstr "Salvo i cambiamenti? " - -#: g10/keyedit.c:721 -msgid "Quit without saving? " -msgstr "Esco senza salvare? " - -#: g10/keyedit.c:731 -#, c-format -msgid "update failed: %s\n" -msgstr "aggiornamento fallito: %s\n" - -#: g10/keyedit.c:738 -#, c-format -msgid "update secret failed: %s\n" -msgstr "aggiornamento della chiave segreta fallito: %s\n" - -#: g10/keyedit.c:745 -msgid "Key not changed so no update needed.\n" -msgstr "La chiave non Х cambiata quindi non sono necessari aggiornamenti.\n" - -#: g10/keyedit.c:748 g10/keyedit.c:807 -#, c-format -msgid "update of trustdb failed: %s\n" -msgstr "aggiornamento del trustdb fallito: %s\n" - -#: g10/keyedit.c:781 +#: g10/keyedit.c:758 msgid "Really sign all user ids? " msgstr "Firmo davvero tutti gli user id? " -#: g10/keyedit.c:782 +#: g10/keyedit.c:759 msgid "Hint: Select the user ids to sign\n" msgstr "Suggerimento: seleziona gli user id da firmare\n" -#: g10/keyedit.c:818 g10/keyedit.c:839 +#: g10/keyedit.c:786 g10/keyedit.c:968 +#, c-format +msgid "update of trustdb failed: %s\n" +msgstr "aggiornamento del trustdb fallito: %s\n" + +#: g10/keyedit.c:797 g10/keyedit.c:818 msgid "You must select at least one user id.\n" msgstr "Devi selezionare almeno un user id.\n" -#: g10/keyedit.c:820 +#: g10/keyedit.c:799 msgid "You can't delete the last user id!\n" msgstr "Non puoi cancellare l'ultimo user id!\n" -#: g10/keyedit.c:823 +#: g10/keyedit.c:802 msgid "Really remove all selected user ids? " msgstr "Tolgo davvero tutti gli user id selezionati? " -#: g10/keyedit.c:824 +#: g10/keyedit.c:803 msgid "Really remove this user id? " msgstr "Tolgo davvero questo user id? " -#: g10/keyedit.c:860 g10/keyedit.c:882 +#: g10/keyedit.c:839 g10/keyedit.c:861 msgid "You must select at least one key.\n" msgstr "Devi selezionare almeno una chiave.\n" -#: g10/keyedit.c:864 +#: g10/keyedit.c:843 msgid "Do you really want to delete the selected keys? " msgstr "Vuoi davvero cancellare le chiavi selezionate? " -#: g10/keyedit.c:865 +#: g10/keyedit.c:844 msgid "Do you really want to delete this key? " msgstr "Vuoi davvero cancellare questa chiave? " -#: g10/keyedit.c:886 +#: g10/keyedit.c:865 msgid "Do you really want to revoke the selected keys? " msgstr "Vuoi davvero revocare le chiavi selezionate? " -#: g10/keyedit.c:887 +#: g10/keyedit.c:866 msgid "Do you really want to revoke this key? " msgstr "Vuoi davvero revocare questa chiave? " -#: g10/keyedit.c:949 +#: g10/keyedit.c:932 +msgid "Save changes? " +msgstr "Salvo i cambiamenti? " + +#: g10/keyedit.c:935 +msgid "Quit without saving? " +msgstr "Esco senza salvare? " + +#: g10/keyedit.c:946 +#, c-format +msgid "update failed: %s\n" +msgstr "aggiornamento fallito: %s\n" + +#: g10/keyedit.c:953 +#, c-format +msgid "update secret failed: %s\n" +msgstr "aggiornamento della chiave segreta fallito: %s\n" + +#: g10/keyedit.c:960 +msgid "Key not changed so no update needed.\n" +msgstr "La chiave non Х cambiata quindi non sono necessari aggiornamenti.\n" + +#: g10/keyedit.c:975 msgid "Invalid command (try \"help\")\n" msgstr "Comando non valido (prova \"help\")\n" -#: g10/keyedit.c:1039 +#: g10/keyedit.c:1065 #, fuzzy msgid "This key has been disabled" msgstr "Nota: questa chiave Х scaduta!\n" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" msgstr "Cancellare questa firma corretta? (s/N/q)" -#: g10/keyedit.c:1314 +#: g10/keyedit.c:1340 msgid "Delete this invalid signature? (y/N/q)" msgstr "Cancellare questa firma non valida? (s/N/q)" -#: g10/keyedit.c:1318 +#: g10/keyedit.c:1344 msgid "Delete this unknown signature? (y/N/q)" msgstr "Cancellare questa firma sconosciuta? (s/N/q)" -#: g10/keyedit.c:1324 +#: g10/keyedit.c:1350 msgid "Really delete this self-signature? (y/N)" msgstr "Cancellare davvero questa autofirma? (s/N)" -#: g10/keyedit.c:1338 +#: g10/keyedit.c:1364 #, c-format msgid "Deleted %d signature.\n" msgstr "Cancellata %d firma.\n" -#: g10/keyedit.c:1339 +#: g10/keyedit.c:1365 #, c-format msgid "Deleted %d signatures.\n" msgstr "Cancellate %d firme.\n" -#: g10/keyedit.c:1342 +#: g10/keyedit.c:1368 msgid "Nothing deleted.\n" msgstr "Non Х stato cancellato nulla.\n" -#: g10/keyedit.c:1411 +#: g10/keyedit.c:1437 msgid "Please remove selections from the secret keys.\n" msgstr "Togli le selezioni dalle chiavi segrete.\n" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1443 msgid "Please select at most one secondary key.\n" msgstr "Seleziona al massimo una chiave secondaria.\n" -#: g10/keyedit.c:1421 +#: g10/keyedit.c:1447 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambio la data di scadenza per una chiave secondaria.\n" -#: g10/keyedit.c:1423 +#: g10/keyedit.c:1449 msgid "Changing expiration time for the primary key.\n" msgstr "Cambio la data di scadenza per la chiave primaria.\n" -#: g10/keyedit.c:1464 +#: g10/keyedit.c:1490 msgid "You can't change the expiration date of a v3 key\n" msgstr "Non Х possibile cambiare la data di scadenza di una chiave v3\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1506 msgid "No corresponding signature in secret ring\n" msgstr "Manca la firma corrispondente nel portachiavi segreto\n" -#: g10/keyedit.c:1540 +#: g10/keyedit.c:1566 #, c-format msgid "No user id with index %d\n" msgstr "Nessun user id con l'indice %d\n" -#: g10/keyedit.c:1586 +#: g10/keyedit.c:1612 #, c-format msgid "No secondary key with index %d\n" msgstr "Nessuna chiave secondaria con l'indice %d\n" -#: g10/keyedit.c:1684 +#: g10/keyedit.c:1710 msgid "user ID: \"" msgstr "user ID: \"" -#: g10/keyedit.c:1687 +#: g10/keyedit.c:1713 #, c-format msgid "" "\"\n" @@ -2261,15 +2293,15 @@ "firmata con la tua chiave %08lX a %s\n" "\n" -#: g10/keyedit.c:1691 +#: g10/keyedit.c:1717 msgid "Create a revocation certificate for this signature? (y/N)" msgstr "Creare un certificato di revoca per questa firma? (s/N)" -#: g10/keyedit.c:1771 +#: g10/keyedit.c:1797 msgid "Really create the revocation certificates? (y/N)" msgstr "Creare davvero i certificati di revoca? (s/N)" -#: g10/keyedit.c:1794 +#: g10/keyedit.c:1820 msgid "no secret key\n" msgstr "manca la chiave segreta\n" @@ -3223,6 +3255,9 @@ #, c-format msgid "No help available for `%s'" msgstr "Non Х disponibile un aiuto per `%s'" + +#~ msgid "print all message digests" +#~ msgstr "stampa tutti i message digests" #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" #~ msgstr "" diff -urN gnupg-0.9.8a/po/pl.po gnupg-0.9.8b/po/pl.po --- gnupg-0.9.8a/po/pl.po Mon Jul 12 15:05:15 1999 +++ gnupg-0.9.8b/po/pl.po Wed Jul 14 11:50:48 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.9.7\n" -"POT-Creation-Date: 1999-07-12 15:04+0200\n" +"POT-Creation-Date: 1999-07-14 11:47+0200\n" "PO-Revision-Date: 1999-05-30 19:08+02:00\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -42,7 +42,7 @@ msgid "yY" msgstr "tT" -#: g10/keyedit.c:561 util/miscutil.c:272 +#: g10/keyedit.c:564 util/miscutil.c:272 msgid "quit" msgstr "wyj╤cie" @@ -285,7 +285,7 @@ "ProszЙ kontynuowaФ inne dziaЁania aby system mСgЁ zebraФ odpowiedni╠\n" "ilo╤Ф entropii do ich wygenerowania (brakuje %d bajtСw).\n" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "" "@Commands:\n" " " @@ -293,131 +293,138 @@ "@Polecenia:\n" " " -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|[file]|make a signature" msgstr "|[plik]|zЁo©enie podpisu" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "|[file]|make a clear text signature" msgstr "|[plik]|zЁo©enie podpisu na czytelnym dokumencie" -#: g10/g10.c:181 +#: g10/g10.c:184 msgid "make a detached signature" msgstr "sporz╠dzenie podpisu oddzielonego od dokumentu" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "encrypt data" msgstr "szyfrowanie danych" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "encryption only with symmetric cipher" msgstr "szyfrowanie tylko szyfrem symetrycznym" -#: g10/g10.c:184 +#: g10/g10.c:187 msgid "store only" msgstr "tylko zapis" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "decrypt data (default)" msgstr "odszyfrowywanie danych (domy╤lnie)" -#: g10/g10.c:186 +#: g10/g10.c:189 msgid "verify a signature" msgstr "sprawdzenie podpisu" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "list keys" msgstr "lista kluczy" -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "list keys and signatures" msgstr "lista kluczy i podpisСw" -#: g10/g10.c:190 +#: g10/g10.c:193 msgid "check key signatures" msgstr "sprawdzenie podpisСw kluczy" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "list keys and fingerprints" msgstr "lista kluczy i ich odciskСw" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "list secret keys" msgstr "lista kluczy tajnych" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "generate a new key pair" msgstr "generacja nowej pary klucza" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "remove key from the public keyring" msgstr "usuniЙcie klucza ze zbioru kluczy publicznych" -#: g10/g10.c:195 +#: g10/g10.c:198 +#, fuzzy +msgid "sign a key" +msgstr "zЁo©enie podpisu na kluczu" + +#: g10/g10.c:199 +#, fuzzy +msgid "sign a key locally" +msgstr "zЁo©enie lokalnego podpisu na kluczu" + +#: g10/g10.c:200 msgid "sign or edit a key" msgstr "podpisanie lub modyfikacja klucza" -#: g10/g10.c:196 +#: g10/g10.c:201 msgid "generate a revocation certificate" msgstr "generacja certyfikatu uniewa©nienia klucza" -#: g10/g10.c:197 +#: g10/g10.c:202 msgid "export keys" msgstr "eksport kluczy do pliku" -#: g10/g10.c:198 +#: g10/g10.c:203 msgid "export keys to a key server" msgstr "eksport kluczy do serwera kluczy" -#: g10/g10.c:199 +#: g10/g10.c:204 msgid "import keys from a key server" msgstr "import kluczy z serwera kluczy" -#: g10/g10.c:202 +#: g10/g10.c:207 msgid "import/merge keys" msgstr "import/doЁ╠czenie kluczy" -#: g10/g10.c:204 +#: g10/g10.c:209 msgid "list only the sequence of packets" msgstr "wypisane sekwencji pakietСw" -#: g10/g10.c:206 +#: g10/g10.c:211 msgid "export the ownertrust values" msgstr "eksport warto╤ci zaufania" -#: g10/g10.c:208 +#: g10/g10.c:213 msgid "import ownertrust values" msgstr "wczytanie warto╤Фi zaufania" -#: g10/g10.c:210 -msgid "|[NAMES]|update the trust database" +#: g10/g10.c:215 +#, fuzzy +msgid "update the trust database" msgstr "|[NAZWY]|naniesienie poprawek do bazy zaufania" -#: g10/g10.c:212 +#: g10/g10.c:217 msgid "|[NAMES]|check the trust database" msgstr "|[NAZWY]|sprawdzenie bazy zaufania" -#: g10/g10.c:213 +#: g10/g10.c:218 msgid "fix a corrupted trust database" msgstr "naprawa uszkodzonej Bazy Zaufania" -#: g10/g10.c:214 +#: g10/g10.c:219 msgid "De-Armor a file or stdin" msgstr "zdjЙcie opakowania ASCII pliku lub potoku" -#: g10/g10.c:215 +#: g10/g10.c:220 msgid "En-Armor a file or stdin" msgstr "opakowanie ASCII pliku lub potoku" -#: g10/g10.c:216 +#: g10/g10.c:221 msgid "|algo [files]|print message digests" msgstr "|algo [pliki]|skrСty wiadomo╤ci" -#: g10/g10.c:217 -msgid "print all message digests" -msgstr "wszystkie skrСty wiadomo╤ci" - -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "" "@\n" "Options:\n" @@ -427,160 +434,169 @@ "Opcje:\n" " " -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "create ascii armored output" msgstr "plik wynikowy w opakowaniu ASCII" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "|NAME|encrypt for NAME" msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA" -#: g10/g10.c:230 +#: g10/g10.c:231 +#, fuzzy +msgid "|NAME|use NAME as default recipient" +msgstr "|NAZWA|u©ycie NAZWA jako domy╤lnego klucza tajnego" + +#: g10/g10.c:233 +msgid "use the default key as default recipient" +msgstr "" + +#: g10/g10.c:237 msgid "use this user-id to sign or decrypt" msgstr "identyfikator do podpisania lub odszyfrowania" -#: g10/g10.c:231 +#: g10/g10.c:238 msgid "|N|set compress level N (0 disables)" msgstr "|N|poziom kompresji N (0 - brak)" -#: g10/g10.c:233 +#: g10/g10.c:240 msgid "use canonical text mode" msgstr "kanoniczny format tekstowy" -#: g10/g10.c:234 +#: g10/g10.c:241 msgid "use as output file" msgstr "plik wyj╤ciowy" -#: g10/g10.c:235 +#: g10/g10.c:242 msgid "verbose" msgstr "z informacjami dodatkowymi" -#: g10/g10.c:236 +#: g10/g10.c:243 msgid "be somewhat more quiet" msgstr "mniej komunikatСww" -#: g10/g10.c:237 +#: g10/g10.c:244 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:238 +#: g10/g10.c:245 msgid "force v3 signatures" msgstr "wymuszenie trzeciej wersji formatu podpisСw" -#: g10/g10.c:239 +#: g10/g10.c:246 msgid "always use a MDC for encryption" msgstr "do szyfrowania bЙdzie u©ywany MDC" -#: g10/g10.c:240 +#: g10/g10.c:247 msgid "do not make any changes" msgstr "pozostawienie bez zmian" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:242 +#: g10/g10.c:249 msgid "batch mode: never ask" msgstr "tryb wsadowy: ©adnych pytaЯ" -#: g10/g10.c:243 +#: g10/g10.c:250 msgid "assume yes on most questions" msgstr "automatyczna odpowied╪ tak na wiЙkszo╤Ф pytaЯ" -#: g10/g10.c:244 +#: g10/g10.c:251 msgid "assume no on most questions" msgstr "automatyczna odpowied╪ nie na wiЙkszo╤Ф pytaЯ" -#: g10/g10.c:245 +#: g10/g10.c:252 msgid "add this keyring to the list of keyrings" msgstr "dodaФ zbiСr kluczy do listy u©ywanych" -#: g10/g10.c:246 +#: g10/g10.c:253 msgid "add this secret keyring to the list" msgstr "dodaФ zbiСr kluczy tajnych do listy" -#: g10/g10.c:247 +#: g10/g10.c:254 msgid "|NAME|use NAME as default secret key" msgstr "|NAZWA|u©ycie NAZWA jako domy╤lnego klucza tajnego" -#: g10/g10.c:248 +#: g10/g10.c:255 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|serwer kluczy w ktСrym bЙd╠ poszukiwane" -#: g10/g10.c:249 +#: g10/g10.c:256 msgid "|NAME|set terminal charset to NAME" msgstr "|NAZWA|zestaw znakСw terminala NAZWA" -#: g10/g10.c:250 +#: g10/g10.c:257 msgid "read options from file" msgstr "wczytanie opcji z pliku" -#: g10/g10.c:252 +#: g10/g10.c:259 msgid "set debugging flags" msgstr "ustawienie opcji ╤ledzenia wykonania programu" -#: g10/g10.c:253 +#: g10/g10.c:260 msgid "enable full debugging" msgstr "umo©liwienie peЁnego ╤ledzenia programu" -#: g10/g10.c:254 +#: g10/g10.c:261 msgid "|FD|write status info to this FD" msgstr "|FD|zapisaФ opis stanu do FD" -#: g10/g10.c:255 +#: g10/g10.c:262 msgid "do not write comment packets" msgstr "nie zapisywaФ pakietСw z komentarzem" -#: g10/g10.c:256 +#: g10/g10.c:263 msgid "(default is 1)" msgstr "(domy╤lnie 1)" -#: g10/g10.c:257 +#: g10/g10.c:264 msgid "(default is 3)" msgstr "(domy╤lnie 3)" -#: g10/g10.c:259 +#: g10/g10.c:266 msgid "|FILE|load extension module FILE" msgstr "|PLIK|Ёadowanie moduЁu rozszerzenia z PLIK" -#: g10/g10.c:260 +#: g10/g10.c:267 msgid "emulate the mode described in RFC1991" msgstr "emulacja trybu opisanego w RFC1991" -#: g10/g10.c:261 +#: g10/g10.c:268 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:262 +#: g10/g10.c:269 msgid "|N|use passphrase mode N" msgstr "|N|N-ty tryb wprowadzania wyra©enia przej╤ciowego" -#: g10/g10.c:264 +#: g10/g10.c:271 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|ALG|algorytm obliczania skrСtСw wiadomo╤ci ALG" -#: g10/g10.c:266 +#: g10/g10.c:273 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|ALG|algorytmu szyfruj╠cy ALG dla hasЁa" -#: g10/g10.c:267 +#: g10/g10.c:274 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAZWA|algorytm szyfruj╠cy NAZWA" -#: g10/g10.c:268 +#: g10/g10.c:275 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAZWA|algorytm obliczania skrСtСw wiadomo╤ci NAZWA" -#: g10/g10.c:269 +#: g10/g10.c:276 msgid "|N|use compress algorithm N" msgstr "|N|algorytm kompresji N" -#: g10/g10.c:270 +#: g10/g10.c:277 msgid "throw keyid field of encrypted packets" msgstr "usuniЙcie identyfikatorСw kluczy z pakietСw" -#: g10/g10.c:271 +#: g10/g10.c:278 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:273 +#: g10/g10.c:280 msgid "" "@\n" "Examples:\n" @@ -601,15 +617,15 @@ " --list-keys [nazwy] pokazuje klucze\n" " --fingerprint [nazwy] pokazuje odciski kluczy\n" -#: g10/g10.c:353 +#: g10/g10.c:360 msgid "Please report bugs to .\n" msgstr "BЁЙdy prosimy zgЁaszaФ na adres .\n" -#: g10/g10.c:357 +#: g10/g10.c:364 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "WywoЁanie: gpg [opcje] [pliki] (-h podaje pomoc)" -#: g10/g10.c:360 +#: g10/g10.c:367 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -619,7 +635,7 @@ "podpisywanie, sprawdzanie podpisСw, szyfrowanie, deszyfrowanie\n" "domy╤lnie wykonywana operacja zale©y od danych wej╤ciowych\n" -#: g10/g10.c:365 +#: g10/g10.c:372 msgid "" "\n" "Supported algorithms:\n" @@ -627,169 +643,181 @@ "\n" "ObsЁugiwane algorytmy:\n" -#: g10/g10.c:439 +#: g10/g10.c:446 msgid "usage: gpg [options] " msgstr "wywoЁanie: gpg [opcje]" -#: g10/g10.c:492 +#: g10/g10.c:499 msgid "conflicting commands\n" msgstr "sprzeczne polecenia\n" -#: g10/g10.c:626 +#: g10/g10.c:633 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "UWAGA: brak domy╤lnego pliku opcji '%s'\n" -#: g10/g10.c:630 +#: g10/g10.c:637 #, c-format msgid "option file `%s': %s\n" msgstr "plik opcji '%s': %s\n" -#: g10/g10.c:637 +#: g10/g10.c:644 #, c-format msgid "reading options from `%s'\n" msgstr "odczyt opcji z '%s'\n" -#: g10/g10.c:805 +#: g10/g10.c:824 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nie jest poprawn╠ nazw╠ zestawu znakСw\n" -#: g10/g10.c:852 g10/g10.c:864 +#: g10/g10.c:872 g10/g10.c:884 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj╠cy jest niepoprawny\n" -#: g10/g10.c:858 g10/g10.c:870 +#: g10/g10.c:878 g10/g10.c:890 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm geenracji skrСtСw wiadomo╤ci jest niepoprawny\n" -#: g10/g10.c:874 +#: g10/g10.c:894 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:877 +#: g10/g10.c:897 #, 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:879 +#: g10/g10.c:899 msgid "completes-needed must be greater than 0\n" msgstr "warto╤Ф completes-needed musi byФ wiЙksza od 0\n" -#: g10/g10.c:881 +#: g10/g10.c:901 msgid "marginals-needed must be greater than 1\n" msgstr "warto╤Ф marginals-needed musi byФ wiЙksza od 1\n" -#: g10/g10.c:883 +#: g10/g10.c:903 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:886 +#: g10/g10.c:906 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/g10.c:890 +#: g10/g10.c:910 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:967 +#: g10/g10.c:987 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Inicjowanie Bazy Zaufania nie powiodЁo siЙ: %s\n" -#: g10/g10.c:973 +#: g10/g10.c:993 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:980 +#: g10/g10.c:1000 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:988 +#: g10/g10.c:1008 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:1001 +#: g10/g10.c:1021 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:1014 +#: g10/g10.c:1034 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:1028 +#: g10/g10.c:1048 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/g10.c:1040 +#: g10/g10.c:1060 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:1049 -msgid "--edit-key username [commands]" +#: g10/g10.c:1068 +msgid "--sign-key user-id" +msgstr "" + +#: g10/g10.c:1076 +#, fuzzy +msgid "--lsign-key user-id" +msgstr "--delete-key nazwa u©ytkownika" + +#: g10/g10.c:1084 +#, fuzzy +msgid "--edit-key user-id [commands]" msgstr "--edit-key nazwa u©ytkownika [polecenia]" -#: g10/g10.c:1063 -msgid "--delete-secret-key username" +#: g10/g10.c:1100 +#, fuzzy +msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nazwa u©ytkownika" -#: g10/g10.c:1066 -msgid "--delete-key username" +#: g10/g10.c:1103 +#, fuzzy +msgid "--delete-key user-id" msgstr "--delete-key nazwa u©ytkownika" -#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366 +#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "nie mogЙ otworzyФ %s: %s\n" -#: g10/g10.c:1101 +#: g10/g10.c:1138 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiСr kluczy]" -#: g10/g10.c:1162 +#: g10/g10.c:1199 #, c-format msgid "dearmoring failed: %s\n" msgstr "usuniЙcie opakowania ASCII nie powiodЁo siЙ: %s\n" -#: g10/g10.c:1170 +#: g10/g10.c:1207 #, c-format msgid "enarmoring failed: %s\n" msgstr "opakowywanie ASCII nie powiodЁo siЙ: %s\n" -#: g10/g10.c:1236 +#: g10/g10.c:1275 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niewЁa╤ciwy algorytm skrСtu '%s'\n" -#: g10/g10.c:1317 +#: g10/g10.c:1356 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:1321 +#: g10/g10.c:1360 msgid "Go ahead and type your message ...\n" msgstr "Wpisz tutaj swoj╠ wiadomo╤Ф ...\n" -#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "nie mogЙ otworzyФ '%s'\n" -#: g10/g10.c:1493 +#: g10/g10.c:1532 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1499 +#: g10/g10.c:1538 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1505 +#: g10/g10.c:1544 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1513 +#: g10/g10.c:1552 msgid "a notation value must not use any control characters\n" msgstr "" @@ -868,7 +896,12 @@ "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n" "przekЁamanie wprowadzone przez program transportowy poczty\n" -#: g10/pkclist.c:137 +#. a string with valid answers +#: g10/pkclist.c:140 +msgid "sSmMqQ" +msgstr "iIpPwW" + +#: g10/pkclist.c:144 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -877,7 +910,7 @@ "Brak warto╤ci zaufania dla %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:147 +#: g10/pkclist.c:154 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -900,28 +933,23 @@ " 4 = W peЁni mu ufam.\n" " i = potrzebujЙ wiЙcej informacji\n" -#: g10/pkclist.c:156 +#: g10/pkclist.c:163 msgid " m = back to the main menu\n" msgstr " p = powrСt do gЁСwnego menu\n" -#: g10/pkclist.c:158 +#: g10/pkclist.c:165 msgid " q = quit\n" msgstr "w = wyj╤cie\n" -#. a string with valid answers -#: g10/pkclist.c:163 -msgid "sSmMqQ" -msgstr "iIpPwW" - -#: g10/pkclist.c:167 +#: g10/pkclist.c:171 msgid "Your decision? " msgstr "Twoja decyzja? " -#: g10/pkclist.c:187 +#: g10/pkclist.c:193 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certyfikaty prowadz╠ce do ostatecznie zaufanego klucza:\n" -#: g10/pkclist.c:256 +#: g10/pkclist.c:264 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" @@ -931,7 +959,7 @@ "Sprawd╪my czy mo©na przypisaФ brakuj╠ce warto╤ci zaufania.\n" "\n" -#: g10/pkclist.c:262 +#: g10/pkclist.c:270 msgid "" "No path leading to one of our keys found.\n" "\n" @@ -939,7 +967,7 @@ "Brak ╤cie©ki prowadz╠cej do ktСrego╤ z naszych kluczy.\n" "\n" -#: g10/pkclist.c:264 +#: g10/pkclist.c:272 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -947,7 +975,7 @@ "Brak certyfikatСw o niezdefiniowanym poziomie zaufania.\n" "\n" -#: g10/pkclist.c:266 +#: g10/pkclist.c:274 msgid "" "No trust values changed.\n" "\n" @@ -955,36 +983,36 @@ "Parametry zaufania nie zostaЁy zmienione.\n" "\n" -#: g10/pkclist.c:283 +#: g10/pkclist.c:291 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "klucz %08lX: klucz zostaЁ uniewa©niony!\n" -#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405 +#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413 msgid "Use this key anyway? " msgstr "U©yФ tego klucza pomimo to? " -#: g10/pkclist.c:293 +#: g10/pkclist.c:301 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "klucz %08lX: podklucz zostaЁ uniewa©niony!\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:331 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: data wa©no╤ci klucza upЁynЙЁa\n" -#: g10/pkclist.c:329 +#: g10/pkclist.c:337 #, 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:343 +#: g10/pkclist.c:351 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: NIE UFAMY temu kluczowi\n" -#: g10/pkclist.c:349 +#: g10/pkclist.c:357 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -993,16 +1021,16 @@ "%08lX: Nie ma pewno╤Фi ©e ten klucz faktycznie nale©y do odoby podaj╠cej\n" "siЙ za jego wЁa╤ciciela, ale jest akceptowalny.\n" -#: g10/pkclist.c:355 +#: g10/pkclist.c:363 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:360 +#: g10/pkclist.c:368 msgid "This key belongs to us\n" msgstr "Ten klucz nale©y do nas\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:408 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" @@ -1013,67 +1041,67 @@ "wЁa╤ciciela. Je╤li nie masz co do tego ©adnych w╠tpliwo╤ci i *naprawdЙ*\n" "wiesz co robisz mo©esz odpowiedzieФ \"tak\" na nastЙpne pytanie.\n" -#: g10/pkclist.c:413 g10/pkclist.c:435 +#: g10/pkclist.c:421 g10/pkclist.c:443 msgid "WARNING: Using untrusted key!\n" msgstr "OSTRZE╞ENIE: u©ywany jest klucz nie obdarzony zaufaniem!\n" -#: g10/pkclist.c:456 +#: g10/pkclist.c:464 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:457 +#: g10/pkclist.c:465 msgid " This could mean that the signature is forgery.\n" msgstr " To mo©e oznaczaФ ©e podpis jest faЁszerstwem.\n" -#: g10/pkclist.c:461 +#: g10/pkclist.c:469 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:482 +#: g10/pkclist.c:490 msgid "Note: This key has expired!\n" msgstr "Uwaga: Data wa©no╤ci tego klucza upЁynЙЁa!\n" -#: g10/pkclist.c:489 +#: g10/pkclist.c:497 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:491 +#: g10/pkclist.c:499 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:507 +#: g10/pkclist.c:515 msgid "WARNING: We do NOT trust this key!\n" msgstr "OSTRZE╞ENIE: NIE UFAMY temu kluczowi!\n" -#: g10/pkclist.c:508 +#: g10/pkclist.c:516 msgid " The signature is probably a FORGERY.\n" msgstr " Ten podpis prawdopodobnie jest FAёSZERSTWEM.\n" -#: g10/pkclist.c:515 +#: g10/pkclist.c:523 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:518 +#: g10/pkclist.c:526 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:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715 +#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: pominiЙty: %s\n" -#: g10/pkclist.c:590 g10/pkclist.c:697 +#: g10/pkclist.c:635 g10/pkclist.c:785 #, fuzzy, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: problem przy odczycie bloku klucza: %s\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:662 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1081,30 +1109,34 @@ "Nie podaЁe╤ identyfikatora u©ytkownika (user ID). \n" "Mo©na to zrobiФ za pomoc╠ opcji \"-r\".\n" -#: g10/pkclist.c:618 +#: g10/pkclist.c:672 msgid "Enter the user ID: " msgstr "Wprowad╪ identyfikator u©ytkownika (user ID): " -#: g10/pkclist.c:629 +#: g10/pkclist.c:684 msgid "No such user ID.\n" msgstr "Brak takiego identyfikatora u©ytkownika.\n" -#: g10/pkclist.c:639 +#: g10/pkclist.c:704 #, fuzzy msgid "Public key is disabled.\n" msgstr "klucz publiczny %08lX\n" -#: g10/pkclist.c:678 +#: g10/pkclist.c:733 +msgid "unknown default recipient `s'\n" +msgstr "" + +#: g10/pkclist.c:766 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: bЁ╠d podczas sprawdzania klucza: %s\n" -#: g10/pkclist.c:683 +#: g10/pkclist.c:771 #, fuzzy, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: problem przy odczycie bloku klucza: %s\n" -#: g10/pkclist.c:721 +#: g10/pkclist.c:809 msgid "no valid addressees\n" msgstr "brak poprawnych adresСw\n" @@ -1500,241 +1532,241 @@ msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "u©ywany jest podklucz %08lX zamiast klucza gЁСwnego %08lX\n" -#: g10/import.c:116 +#: g10/import.c:117 #, c-format msgid "can't open `%s': %s\n" msgstr "nie mo©na otworzyФ %s: %s\n" -#: g10/import.c:160 +#: g10/import.c:161 #, c-format msgid "skipping block of type %d\n" msgstr "pomijam blok typu %d\n" -#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697 +#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu kluczy przetworzonych do tej chwili\n" -#: g10/import.c:172 +#: g10/import.c:173 #, c-format msgid "error reading `%s': %s\n" msgstr "bЁ╠d odczytu '%s': %s\n" -#: g10/import.c:175 +#: g10/import.c:176 #, c-format msgid "Total number processed: %lu\n" msgstr "OgСЁem przetworzonych kluczy: %lu\n" -#: g10/import.c:177 +#: g10/import.c:178 #, c-format msgid " w/o user IDs: %lu\n" msgstr " bez identyfikatora: %lu\n" -#: g10/import.c:179 +#: g10/import.c:180 #, c-format msgid " imported: %lu" msgstr " doЁ╠czono do zbioru: %lu" -#: g10/import.c:185 +#: g10/import.c:186 #, c-format msgid " unchanged: %lu\n" msgstr " bez zmian: %lu\n" -#: g10/import.c:187 +#: g10/import.c:188 #, c-format msgid " new user IDs: %lu\n" msgstr " nowych identyfikatorСw: %lu\n" -#: g10/import.c:189 +#: g10/import.c:190 #, c-format msgid " new subkeys: %lu\n" msgstr " nowych podkluczy: %lu\n" -#: g10/import.c:191 +#: g10/import.c:192 #, c-format msgid " new signatures: %lu\n" msgstr " nowych podpisСw: %lu\n" -#: g10/import.c:193 +#: g10/import.c:194 #, c-format msgid " new key revocations: %lu\n" msgstr " nowych uniewa©nieЯ kluczy: %lu\n" -#: g10/import.c:195 +#: g10/import.c:196 #, c-format msgid " secret keys read: %lu\n" msgstr " tajnych kluczy wczytanych: %lu\n" -#: g10/import.c:197 +#: g10/import.c:198 #, c-format msgid " secret keys imported: %lu\n" msgstr " tajnych kluczy dodanych: %lu\n" -#: g10/import.c:199 +#: g10/import.c:200 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " tajnych kluczy bez zmian: %lu\n" -#: g10/import.c:342 g10/import.c:526 +#: g10/import.c:361 g10/import.c:550 #, c-format msgid "key %08lX: no user id\n" msgstr "klucz %08lX: brak identyfikatora u©ytkownika\n" -#: g10/import.c:353 +#: g10/import.c:372 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "klucz %08lX: brak poprawnych identyfikatorСw u©ytkownika\n" -#: g10/import.c:355 +#: g10/import.c:374 msgid "this may be caused by a missing self-signature\n" msgstr "to mo©e byФ spowodowane brakiem podpisu wЁa╤ciciela klucza\n" -#: g10/import.c:366 g10/import.c:593 +#: g10/import.c:385 g10/import.c:617 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "klucz %08lX: brak klucza publicznego: %s\n" -#: g10/import.c:372 +#: g10/import.c:391 msgid "no default public keyring\n" msgstr "brak domy╤lnego zbioru kluczy publicznych\n" -#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "zapis do '%s'\n" -#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642 +#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666 #, c-format msgid "can't lock keyring `%s': %s\n" msgstr "nie mo©na zablokowaФ zbioru kluczy publicznych '%s': %s\n" -#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "bЁ╠d zapisu zbioru kluczy '%s': %s\n" -#: g10/import.c:387 +#: g10/import.c:406 #, c-format msgid "key %08lX: public key imported\n" msgstr "klucz %08lX: klucz publiczny wczytany do zbioru\n" -#: g10/import.c:399 +#: g10/import.c:423 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "klucz %08lX: nie zgadza siЙ z lokalnie posiadan╠ kopi╠\n" -#: g10/import.c:408 g10/import.c:601 +#: g10/import.c:432 g10/import.c:625 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n" -#: g10/import.c:414 g10/import.c:607 +#: g10/import.c:438 g10/import.c:631 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "klucz %08lX: nie mo©na odczytaФ oryginalnego bloku klucza; %s\n" -#: g10/import.c:441 +#: g10/import.c:465 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "klucz %08lX: 1 nowy identyfikator u©ytkownika\n" -#: g10/import.c:444 +#: g10/import.c:468 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "klucz %08lX: %d nowych identyfikatorСw u©ytkownika\n" -#: g10/import.c:447 +#: g10/import.c:471 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "klucz %08lX: 1 nowy podpis\n" -#: g10/import.c:450 +#: g10/import.c:474 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "klucz %08lX: %d nowych podpisСw\n" -#: g10/import.c:453 +#: g10/import.c:477 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "klucz %08lX: 1 nowy podklucz\n" -#: g10/import.c:456 +#: g10/import.c:480 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "klucz %08lX: %d nowych podkluczy\n" -#: g10/import.c:466 +#: g10/import.c:490 #, c-format msgid "key %08lX: not changed\n" msgstr "klucz %08lX: bez zmian\n" -#: g10/import.c:549 +#: g10/import.c:573 #, c-format msgid "key %08lX: secret key imported\n" msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n" #. we can't merge secret keys -#: g10/import.c:553 +#: g10/import.c:577 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "Klucz %08lX: ten klucz ju© znajduje siЙ w zbiorze\n" -#: g10/import.c:558 +#: g10/import.c:582 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "klucz %08lX: brak klucza tajnego: %s\n" -#: g10/import.c:587 +#: g10/import.c:611 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "klucz %08lX: brak klucza publicznego - wczytany certyfikat \n" "uniwa©nienia nie mo©e byФ zastosowany\n" -#: g10/import.c:618 +#: g10/import.c:642 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "" "klucz %08lX: niepoprawny certyfikat uniewa©nienia:\n" "%s - odrzucony\n" -#: g10/import.c:650 +#: g10/import.c:674 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "klucz %08lX: wczytany certyfikat uniewa©nienia\n" -#: g10/import.c:683 +#: g10/import.c:707 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "klucz %08lX: brak identyfikatora u©ytkownika do podpisu\n" -#: g10/import.c:690 g10/import.c:714 +#: g10/import.c:714 g10/import.c:738 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "" "klucz %08lX: nie obsЁugiwany algorytm szyfrowania z kluczem publicznym\n" -#: g10/import.c:691 +#: g10/import.c:715 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "klucz %08lX: niepoprawny podpis wЁa╤ciciela klucza\n" -#: g10/import.c:706 +#: g10/import.c:730 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "klucz %08lX: brak podklucza do dowi╠zania\n" -#: g10/import.c:715 +#: g10/import.c:739 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "klucz %08lX: niepoprawne dowi╠zanie podklucza\n" -#: g10/import.c:747 +#: g10/import.c:771 #, c-format msgid "key %08lX: skipped userid '" msgstr "klucz %08lX: zostaЁ pominiЙty identyfikator u©ytkownika '" -#: g10/import.c:770 +#: g10/import.c:794 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "klucz %08lX: podklucz pominiЙty\n" @@ -1743,34 +1775,34 @@ #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense -#: g10/import.c:795 +#: g10/import.c:819 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pominiЙty\n" -#: g10/import.c:804 +#: g10/import.c:828 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" "klucz %08lX: certyfikat uniewa©nienia umieszczony w niewЁa╤ciwym \n" "miejscu - zostaЁ pominiЙty\n" -#: g10/import.c:812 +#: g10/import.c:836 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "klucz %08lX: niepoprawny certyfikat uniewa©nienia: %s - pominiЙty\n" -#: g10/import.c:912 +#: g10/import.c:936 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "key %08lX: powtСrzony identyfikator u©ytkownika - doЁ╠czony\n" -#: g10/import.c:963 +#: g10/import.c:987 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "klucz %08lX: dodany certyfikat uniewa©nienia\n" -#: g10/import.c:1076 g10/import.c:1131 +#: g10/import.c:1100 g10/import.c:1155 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "klucz %08lX: dostЙpna kopia nie jest podpisana ni╠ sam╠\n" @@ -1857,7 +1889,7 @@ msgid "Really sign? " msgstr "Na pewno podpisaФ? " -#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128 +#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "zЁo©enie podpisu nie powiodЁo siЙ: %s\n" @@ -1899,395 +1931,395 @@ msgid "moving a key signature to the correct place\n" msgstr "przenoszЙ podpis klucza na wЁa╤ciwe miejsce\n" -#: g10/keyedit.c:561 +#: g10/keyedit.c:564 msgid "quit this menu" msgstr "wyj╤cie z tego menu" -#: g10/keyedit.c:562 +#: g10/keyedit.c:565 msgid "q" msgstr "w" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save" msgstr "zapis" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save and quit" msgstr "zapis zmian i wyj╤cie" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "help" msgstr "pomoc" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "show this help" msgstr "ten tekst pomocy" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "fpr" msgstr "odc" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "show fingerprint" msgstr "okazanie odcisku klucza" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list" msgstr "lista" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list key and user ids" msgstr "lista kluczy i identyfikatorСw u©ytkownikСw" -#: g10/keyedit.c:568 +#: g10/keyedit.c:571 msgid "l" msgstr "l" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "uid" msgstr "id" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "select user id N" msgstr "wybСr identyfikatora u©ytkownika N" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "key" msgstr "klucz" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "select secondary key N" msgstr "wybСr podklucza N" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "check" msgstr "lista" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "list signatures" msgstr "lista podpisСw" -#: g10/keyedit.c:572 +#: g10/keyedit.c:575 msgid "c" msgstr "l" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign" msgstr "podpis" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign the key" msgstr "zЁo©enie podpisu na kluczu" -#: g10/keyedit.c:574 +#: g10/keyedit.c:577 msgid "s" msgstr "p" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "lsign" msgstr "lpodpis" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "sign the key locally" msgstr "zЁo©enie lokalnego podpisu na kluczu" -#: g10/keyedit.c:576 +#: g10/keyedit.c:579 msgid "debug" msgstr "╤ledzenia" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "adduid" msgstr "dodid" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "add a user id" msgstr "dodanie nowego identyfikatora u©ytkownika do klucza" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "deluid" msgstr "usid" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "delete user id" msgstr "usuniЙcie identyfikatora u©ytkownika z klucza" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "addkey" msgstr "dodkl" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "add a secondary key" msgstr "dodanie podklucza" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delkey" msgstr "uskl" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delete a secondary key" msgstr "usuniЙcie podklucza" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 #, fuzzy msgid "delsig" msgstr "lpodpis" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 #, fuzzy msgid "delete signatures" msgstr "lista podpisСw" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "expire" msgstr "data" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "change the expire date" msgstr "zmiana daty wa©no╤ci klucza" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle" msgstr "przeЁ" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle between secret and public key listing" msgstr "przeЁ╠czenie pomiЙdzy list╠ kluczy publicznych i tajnych" -#: g10/keyedit.c:585 +#: g10/keyedit.c:588 msgid "t" msgstr "p" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "pref" msgstr "opcje" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "list preferences" msgstr "lista opcji" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "passwd" msgstr "hasЁo" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "change the passphrase" msgstr "zmiana wyra©enia przej╤ciowego (hasЁa)" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "trust" msgstr "zaufanie" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "change the ownertrust" msgstr "zmiana zaufania wЁa╤ciciela" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revsig" msgstr "unpod" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revoke signatures" msgstr "uniewa©nienie podpisu" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revkey" msgstr "unpkl" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revoke a secondary key" msgstr "uniewa©nienie podklucza" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 msgid "disable" msgstr "" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 #, fuzzy msgid "disable a key" msgstr "klucz niepoprawny" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 msgid "enable" msgstr "" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 #, fuzzy msgid "enable a key" msgstr "klucz niepoprawny" -#: g10/keyedit.c:611 +#: g10/keyedit.c:614 msgid "can't do that in batchmode\n" msgstr "nie dziaЁa w trybie wsadowym\n" #. check that they match -#. FIXME: check that they both match -#: g10/keyedit.c:640 +#. fixme: check that they both match +#: g10/keyedit.c:652 msgid "Secret key is available.\n" msgstr "DostЙpny jest klucz tajny.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:681 msgid "Command> " msgstr "Polecenie> " -#: g10/keyedit.c:696 +#: g10/keyedit.c:711 msgid "Need the secret key to do this.\n" msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n" -#: g10/keyedit.c:718 -msgid "Save changes? " -msgstr "ZapisaФ zmiany? " - -#: g10/keyedit.c:721 -msgid "Quit without saving? " -msgstr "Wyj╤Ф bez zapisania zmian? " - -#: g10/keyedit.c:731 -#, c-format -msgid "update failed: %s\n" -msgstr "naniesienie poprawek nie powiodЁo siЙ: %s\n" - -#: g10/keyedit.c:738 -#, c-format -msgid "update secret failed: %s\n" -msgstr "naniesienie poprawek na kluczu tajnym nie powiodЁo siЙ: %s\n" - -#: g10/keyedit.c:745 -msgid "Key not changed so no update needed.\n" -msgstr "" -"Klucz nie zostaЁ zmieniony wiЙc nanoszenie poprawek nie jest konieczne.\n" - -#: g10/keyedit.c:748 g10/keyedit.c:807 -#, c-format -msgid "update of trustdb failed: %s\n" -msgstr "naniesienie poprawek bazy zaufania nie powiodЁo siЙ: %s\n" - -#: g10/keyedit.c:781 +#: g10/keyedit.c:758 msgid "Really sign all user ids? " msgstr "PodpisaФ wszystkie identyfikatory u©ytkownika na tym kluczu? " -#: g10/keyedit.c:782 +#: g10/keyedit.c:759 msgid "Hint: Select the user ids to sign\n" msgstr "Podpowied╪: wybierz identyfikatory u©ytkownika do podpisania.\n" -#: g10/keyedit.c:818 g10/keyedit.c:839 +#: g10/keyedit.c:786 g10/keyedit.c:968 +#, c-format +msgid "update of trustdb failed: %s\n" +msgstr "naniesienie poprawek bazy zaufania nie powiodЁo siЙ: %s\n" + +#: g10/keyedit.c:797 g10/keyedit.c:818 msgid "You must select at least one user id.\n" msgstr "Musisz wybraФ co najmniej jeden identyfikator u©ytkownika.\n" -#: g10/keyedit.c:820 +#: g10/keyedit.c:799 msgid "You can't delete the last user id!\n" msgstr "Nie mo©esz usun╠Ф ostatniego identyfikatora u©ytkownika!\n" -#: g10/keyedit.c:823 +#: g10/keyedit.c:802 msgid "Really remove all selected user ids? " msgstr "Czy na pewno usun╠Ф wszystkie wybrane identyfikatory u©ytkownika? " -#: g10/keyedit.c:824 +#: g10/keyedit.c:803 msgid "Really remove this user id? " msgstr "Czy na pewno usun╠Ф ten identyfikator u©ytkownika? " -#: g10/keyedit.c:860 g10/keyedit.c:882 +#: g10/keyedit.c:839 g10/keyedit.c:861 msgid "You must select at least one key.\n" msgstr "Musisz wybraФ co najmniej jeden klucz.\n" -#: g10/keyedit.c:864 +#: g10/keyedit.c:843 msgid "Do you really want to delete the selected keys? " msgstr "Czy na pewno chcesz usun╠Ф wybrane klucze? " -#: g10/keyedit.c:865 +#: g10/keyedit.c:844 msgid "Do you really want to delete this key? " msgstr "Czy na pewno chcesz usun╠Ф ten klucz? " -#: g10/keyedit.c:886 +#: g10/keyedit.c:865 msgid "Do you really want to revoke the selected keys? " msgstr "Czy na pewno chcesz uniewa©niФ wybrane klucze? " -#: g10/keyedit.c:887 +#: g10/keyedit.c:866 msgid "Do you really want to revoke this key? " msgstr "Czy na pewno chcesz uniewa©niФ ten klucz? " -#: g10/keyedit.c:949 +#: g10/keyedit.c:932 +msgid "Save changes? " +msgstr "ZapisaФ zmiany? " + +#: g10/keyedit.c:935 +msgid "Quit without saving? " +msgstr "Wyj╤Ф bez zapisania zmian? " + +#: g10/keyedit.c:946 +#, c-format +msgid "update failed: %s\n" +msgstr "naniesienie poprawek nie powiodЁo siЙ: %s\n" + +#: g10/keyedit.c:953 +#, c-format +msgid "update secret failed: %s\n" +msgstr "naniesienie poprawek na kluczu tajnym nie powiodЁo siЙ: %s\n" + +#: g10/keyedit.c:960 +msgid "Key not changed so no update needed.\n" +msgstr "" +"Klucz nie zostaЁ zmieniony wiЙc nanoszenie poprawek nie jest konieczne.\n" + +#: g10/keyedit.c:975 msgid "Invalid command (try \"help\")\n" msgstr "Niepoprawna komenda (sprСbuj \"help\")\n" -#: g10/keyedit.c:1039 +#: g10/keyedit.c:1065 #, fuzzy msgid "This key has been disabled" msgstr "Uwaga: Data wa©no╤ci tego klucza upЁynЙЁa!\n" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1314 +#: g10/keyedit.c:1340 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1318 +#: g10/keyedit.c:1344 #, fuzzy msgid "Delete this unknown signature? (y/N/q)" msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)" -#: g10/keyedit.c:1324 +#: g10/keyedit.c:1350 #, fuzzy msgid "Really delete this self-signature? (y/N)" msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)" -#: g10/keyedit.c:1338 +#: g10/keyedit.c:1364 #, fuzzy, c-format msgid "Deleted %d signature.\n" msgstr "%d niepoprawnych podpisСw\n" -#: g10/keyedit.c:1339 +#: g10/keyedit.c:1365 #, fuzzy, c-format msgid "Deleted %d signatures.\n" msgstr "%d niepoprawnych podpisСw\n" -#: g10/keyedit.c:1342 +#: g10/keyedit.c:1368 #, fuzzy msgid "Nothing deleted.\n" msgstr "OSTRZE╞ENIE: nic nie zostaЁo wyeksportowane!\n" -#: g10/keyedit.c:1411 +#: g10/keyedit.c:1437 msgid "Please remove selections from the secret keys.\n" msgstr "ProszЙ usun╠Ф znacznik wyboru z kluczy tajnych.\n" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1443 msgid "Please select at most one secondary key.\n" msgstr "ProszЙ wybraФ najwy©ej jeden podklucz.\n" -#: g10/keyedit.c:1421 +#: g10/keyedit.c:1447 #, fuzzy msgid "Changing expiration time for a secondary key.\n" msgstr "Zmiana daty wa©no╤ci podklucza.\n" -#: g10/keyedit.c:1423 +#: g10/keyedit.c:1449 #, fuzzy msgid "Changing expiration time for the primary key.\n" msgstr "Zmiana daty wa©no╤ci gЁСwnego klucza.\n" -#: g10/keyedit.c:1464 +#: g10/keyedit.c:1490 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nie mo©na zmieniФ daty wa©no╤ci klucza w wersji 3.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1506 msgid "No corresponding signature in secret ring\n" msgstr "Brak odpowiadaj╠cego podpisu w zbiorze kluczy tajnych\n" -#: g10/keyedit.c:1540 +#: g10/keyedit.c:1566 #, c-format msgid "No user id with index %d\n" msgstr "Brak identyfikatora u©ytkownika o numerze %d.\n" -#: g10/keyedit.c:1586 +#: g10/keyedit.c:1612 #, c-format msgid "No secondary key with index %d\n" msgstr "Brak podklucza o indeksie %d\n" -#: g10/keyedit.c:1684 +#: g10/keyedit.c:1710 msgid "user ID: \"" msgstr "Identyfikator u©ytkownika: " -#: g10/keyedit.c:1687 +#: g10/keyedit.c:1713 #, c-format msgid "" "\"\n" @@ -2296,15 +2328,15 @@ "\"\n" "podpisano Twoim kluczem %08lX w %s\n" -#: g10/keyedit.c:1691 +#: g10/keyedit.c:1717 msgid "Create a revocation certificate for this signature? (y/N)" msgstr "StworzyФ certyfikat uniewa©nienia tego podpisu? (t/N)" -#: g10/keyedit.c:1771 +#: g10/keyedit.c:1797 msgid "Really create the revocation certificates? (y/N)" msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)" -#: g10/keyedit.c:1794 +#: g10/keyedit.c:1820 msgid "no secret key\n" msgstr "brak klucza prywatnego\n" @@ -3320,6 +3352,9 @@ #, c-format msgid "No help available for `%s'" msgstr "Brak pomocy o '%s'" + +#~ msgid "print all message digests" +#~ msgstr "wszystkie skrСty wiadomo╤ci" #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" #~ msgstr "" diff -urN gnupg-0.9.8a/po/pt_BR.po gnupg-0.9.8b/po/pt_BR.po --- gnupg-0.9.8a/po/pt_BR.po Mon Jul 12 15:05:18 1999 +++ gnupg-0.9.8b/po/pt_BR.po Wed Jul 14 11:50:49 1999 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1999-07-12 15:04+0200\n" +"POT-Creation-Date: 1999-07-14 11:47+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" @@ -38,7 +38,7 @@ msgstr "sS" # INICIO MENU -#: g10/keyedit.c:561 util/miscutil.c:272 +#: g10/keyedit.c:564 util/miscutil.c:272 msgid "quit" msgstr "sair" @@ -285,7 +285,7 @@ "para que o sistema possa coletar mais entropia!\n" "(SЦo necessАrios mais %d bytes)\n" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "" "@Commands:\n" " " @@ -293,134 +293,141 @@ "@Comandos:\n" " " -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|[file]|make a signature" msgstr "|[arquivo]|faz uma assinatura" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "|[file]|make a clear text signature" msgstr "|[arquivo]|faz uma assinatura em texto puro" -#: g10/g10.c:181 +#: g10/g10.c:184 msgid "make a detached signature" msgstr "faz uma assinatura separada" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "encrypt data" msgstr "criptografa dados" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "encryption only with symmetric cipher" msgstr "criptografa apenas com criptografia simИtrica" -#: g10/g10.c:184 +#: g10/g10.c:187 msgid "store only" msgstr "apenas armazena" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "decrypt data (default)" msgstr "descriptografa dados (padrЦo)" -#: g10/g10.c:186 +#: g10/g10.c:189 msgid "verify a signature" msgstr "verifica uma assinatura" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "list keys" msgstr "lista as chaves" -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "list keys and signatures" msgstr "lista as chaves e as assinaturas" -#: g10/g10.c:190 +#: g10/g10.c:193 msgid "check key signatures" msgstr "confere as assinaturas das chaves" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "list keys and fingerprints" msgstr "lista as chaves e as impressУes digitais" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "list secret keys" msgstr "lista as chaves secretas" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "generate a new key pair" msgstr "gera um novo par de chaves" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "remove key from the public keyring" msgstr "remove a chave do chaveiro pЗblico" -#: g10/g10.c:195 +#: g10/g10.c:198 +#, fuzzy +msgid "sign a key" +msgstr "assina a chave" + +#: g10/g10.c:199 +#, fuzzy +msgid "sign a key locally" +msgstr "assina a chave localmente" + +#: g10/g10.c:200 msgid "sign or edit a key" msgstr "assina ou edita uma chave" -#: g10/g10.c:196 +#: g10/g10.c:201 msgid "generate a revocation certificate" msgstr "gera um certificado de revogaГЦo" -#: g10/g10.c:197 +#: g10/g10.c:202 msgid "export keys" msgstr "exporta as chaves" -#: g10/g10.c:198 +#: g10/g10.c:203 msgid "export keys to a key server" msgstr "exporta chaves para um servidor" -#: g10/g10.c:199 +#: g10/g10.c:204 msgid "import keys from a key server" msgstr "importa chaves de um servidor" -#: g10/g10.c:202 +#: g10/g10.c:207 msgid "import/merge keys" msgstr "importa/funde as chaves" -#: g10/g10.c:204 +#: g10/g10.c:209 msgid "list only the sequence of packets" msgstr "lista apenas as seqЭЙncias de pacotes" # ownertrust ??? -#: g10/g10.c:206 +#: g10/g10.c:211 msgid "export the ownertrust values" msgstr "exporta os valores de confianГa" -#: g10/g10.c:208 +#: g10/g10.c:213 msgid "import ownertrust values" msgstr "importa os valores de confianГa" -#: g10/g10.c:210 -msgid "|[NAMES]|update the trust database" +#: g10/g10.c:215 +#, fuzzy +msgid "update the trust database" msgstr "|[NOMES]|atualiza o banco de dados de confiabilidade" -#: g10/g10.c:212 +#: g10/g10.c:217 msgid "|[NAMES]|check the trust database" msgstr "|[NOMES]|confere o banco de dados de confiabilidade" -#: g10/g10.c:213 +#: g10/g10.c:218 msgid "fix a corrupted trust database" msgstr "" "conserta um banco de dados de confiabilidade\n" "danificado" -#: g10/g10.c:214 +#: g10/g10.c:219 msgid "De-Armor a file or stdin" msgstr "Retira a armadura de um arquivo ou de \"stdin\"" -#: g10/g10.c:215 +#: g10/g10.c:220 msgid "En-Armor a file or stdin" msgstr "Cria armadura para um arquivo ou \"stdin\"" -#: g10/g10.c:216 +#: g10/g10.c:221 msgid "|algo [files]|print message digests" msgstr "|algo [arquivos]|imprime \"digests\" de mensagens" -#: g10/g10.c:217 -msgid "print all message digests" -msgstr "imprime todos os \"digests\" de mensagens" - -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "" "@\n" "Options:\n" @@ -430,168 +437,177 @@ "OpГУes:\n" " " -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "create ascii armored output" msgstr "cria uma saМda com armadura ascii" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "|NAME|encrypt for NAME" msgstr "|NOME|criptografa para NOME" -#: g10/g10.c:230 +#: g10/g10.c:231 +#, fuzzy +msgid "|NAME|use NAME as default recipient" +msgstr "|NOME|usa NOME como chave secreta padrЦo" + +#: g10/g10.c:233 +msgid "use the default key as default recipient" +msgstr "" + +#: g10/g10.c:237 msgid "use this user-id to sign or decrypt" msgstr "" "usa este identificador de usuАrio para assinar\n" "ou descriptografar" -#: g10/g10.c:231 +#: g10/g10.c:238 msgid "|N|set compress level N (0 disables)" msgstr "|N|estabelece nМvel de compressЦo N (0 desabilita)" -#: g10/g10.c:233 +#: g10/g10.c:240 msgid "use canonical text mode" msgstr "usa modo de texto canТnico" -#: g10/g10.c:234 +#: g10/g10.c:241 msgid "use as output file" msgstr "usa como arquivo de saМda" -#: g10/g10.c:235 +#: g10/g10.c:242 msgid "verbose" msgstr "detalhado" -#: g10/g10.c:236 +#: g10/g10.c:243 msgid "be somewhat more quiet" msgstr "ser mais silencioso" -#: g10/g10.c:237 +#: g10/g10.c:244 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:238 +#: g10/g10.c:245 msgid "force v3 signatures" msgstr "forГa assinaturas v3" -#: g10/g10.c:239 +#: g10/g10.c:246 msgid "always use a MDC for encryption" msgstr "sempre usar um MDC para criptografar" -#: g10/g10.c:240 +#: g10/g10.c:247 msgid "do not make any changes" msgstr "nЦo fazer alteraГУes" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:242 +#: g10/g10.c:249 msgid "batch mode: never ask" msgstr "modo nЦo-interativo: nunca perguntar" -#: g10/g10.c:243 +#: g10/g10.c:250 msgid "assume yes on most questions" msgstr "assumir sim para a maioria das perguntas" -#: g10/g10.c:244 +#: g10/g10.c:251 msgid "assume no on most questions" msgstr "assumir nЦo para a maioria das perguntas" -#: g10/g10.c:245 +#: g10/g10.c:252 msgid "add this keyring to the list of keyrings" msgstr "adiciona este chaveiro Ю lista de chaveiros" -#: g10/g10.c:246 +#: g10/g10.c:253 msgid "add this secret keyring to the list" msgstr "adiciona este chaveiro secreto Ю lista" -#: g10/g10.c:247 +#: g10/g10.c:254 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usa NOME como chave secreta padrЦo" -#: g10/g10.c:248 +#: g10/g10.c:255 msgid "|HOST|use this keyserver to lookup keys" msgstr "|ENDEREгO|usa este servidor para buscar chaves" -#: g10/g10.c:249 +#: g10/g10.c:256 msgid "|NAME|set terminal charset to NAME" msgstr "|NOME|define mapa de caracteres do terminal como NOME" -#: g10/g10.c:250 +#: g10/g10.c:257 msgid "read options from file" msgstr "lЙ opГУes do arquivo" -#: g10/g10.c:252 +#: g10/g10.c:259 msgid "set debugging flags" msgstr "define parБmetros de depuraГЦo" -#: g10/g10.c:253 +#: g10/g10.c:260 msgid "enable full debugging" msgstr "habilita depuraГЦo completa" -#: g10/g10.c:254 +#: g10/g10.c:261 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:255 +#: g10/g10.c:262 msgid "do not write comment packets" msgstr "nЦo escreve pacotes de comentАrio" -#: g10/g10.c:256 +#: g10/g10.c:263 msgid "(default is 1)" msgstr "(o padrЦo И 1)" -#: g10/g10.c:257 +#: g10/g10.c:264 msgid "(default is 3)" msgstr "(o padrЦo И 3)" -#: g10/g10.c:259 +#: g10/g10.c:266 msgid "|FILE|load extension module FILE" msgstr "|ARQUIVO|carrega mСdulo de extensЦo ARQUIVO" -#: g10/g10.c:260 +#: g10/g10.c:267 msgid "emulate the mode described in RFC1991" msgstr "emula o modo descrito no RFC1991" -#: g10/g10.c:261 +#: g10/g10.c:268 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:262 +#: g10/g10.c:269 msgid "|N|use passphrase mode N" msgstr "|N|usa frase secreta modo N" -#: g10/g10.c:264 +#: g10/g10.c:271 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:266 +#: g10/g10.c:273 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOME|usa algoritmo de criptografia NOME para\n" "frases secretas" -#: g10/g10.c:267 +#: g10/g10.c:274 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOME|usa algoritmo de criptografia NOME" -#: g10/g10.c:268 +#: g10/g10.c:275 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME" -#: g10/g10.c:269 +#: g10/g10.c:276 msgid "|N|use compress algorithm N" msgstr "|N|usa algoritmo de compressЦo N" -#: g10/g10.c:270 +#: g10/g10.c:277 msgid "throw keyid field of encrypted packets" msgstr "elimina o campo keyid dos pacotes criptografados" -#: g10/g10.c:271 +#: g10/g10.c:278 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:273 +#: g10/g10.c:280 msgid "" "@\n" "Examples:\n" @@ -611,16 +627,16 @@ " --list-keys [nomes] mostra chaves\n" " --fingerprint [nomes] mostra impressУes digitais\n" -#: g10/g10.c:353 +#: g10/g10.c:360 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:357 +#: g10/g10.c:364 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:360 +#: g10/g10.c:367 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -630,7 +646,7 @@ "assina, verifica, criptografa ou descriptografa\n" "a operaГЦo padrЦo depende dos dados de entrada\n" -#: g10/g10.c:365 +#: g10/g10.c:372 msgid "" "\n" "Supported algorithms:\n" @@ -638,170 +654,182 @@ "\n" "Algoritmos suportados:\n" -#: g10/g10.c:439 +#: g10/g10.c:446 msgid "usage: gpg [options] " msgstr "uso: gpg [opГУes] " -#: g10/g10.c:492 +#: g10/g10.c:499 msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:626 +#: g10/g10.c:633 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de opГУes padrЦo `%s' inexistente\n" -#: g10/g10.c:630 +#: g10/g10.c:637 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de opГУes `%s': %s\n" -#: g10/g10.c:637 +#: g10/g10.c:644 #, c-format msgid "reading options from `%s'\n" msgstr "lendo opГУes de `%s'\n" -#: g10/g10.c:805 +#: g10/g10.c:824 #, 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:852 g10/g10.c:864 +#: g10/g10.c:872 g10/g10.c:884 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado nЦo И vАlido\n" -#: g10/g10.c:858 g10/g10.c:870 +#: g10/g10.c:878 g10/g10.c:890 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado nЦo И vАlido\n" -#: g10/g10.c:874 +#: g10/g10.c:894 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:877 +#: g10/g10.c:897 #, 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:879 +#: g10/g10.c:899 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:881 +#: g10/g10.c:901 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:883 +#: g10/g10.c:903 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:886 +#: g10/g10.c:906 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:890 +#: g10/g10.c:910 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:967 +#: g10/g10.c:987 #, 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:973 +#: g10/g10.c:993 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:980 +#: g10/g10.c:1000 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:988 +#: g10/g10.c:1008 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:1001 +#: g10/g10.c:1021 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:1014 +#: g10/g10.c:1034 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:1028 +#: g10/g10.c:1048 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:1040 +#: g10/g10.c:1060 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:1049 -msgid "--edit-key username [commands]" +#: g10/g10.c:1068 +msgid "--sign-key user-id" +msgstr "" + +#: g10/g10.c:1076 +#, fuzzy +msgid "--lsign-key user-id" +msgstr "--delete-key nome_do_usuАrio" + +#: g10/g10.c:1084 +#, fuzzy +msgid "--edit-key user-id [commands]" msgstr "--edit-key nome_do_usuАrio [comandos]" -#: g10/g10.c:1063 -msgid "--delete-secret-key username" +#: g10/g10.c:1100 +#, fuzzy +msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nome_do_usuАrio" -#: g10/g10.c:1066 -msgid "--delete-key username" +#: g10/g10.c:1103 +#, fuzzy +msgid "--delete-key user-id" msgstr "--delete-key nome_do_usuАrio" -#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366 +#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossМvel abrir %s: %s\n" -#: g10/g10.c:1101 +#: g10/g10.c:1138 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [id_do_usuАrio] [chaveiro]" -#: g10/g10.c:1162 +#: g10/g10.c:1199 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:1170 +#: g10/g10.c:1207 #, 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:1236 +#: g10/g10.c:1275 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash invАlido `%s'\n" -#: g10/g10.c:1317 +#: g10/g10.c:1356 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:1321 +#: g10/g10.c:1360 msgid "Go ahead and type your message ...\n" msgstr "VА em frente e digite sua mensagem ...\n" -#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "impossМvel abrir `%s'\n" -#: g10/g10.c:1493 +#: g10/g10.c:1532 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1499 +#: g10/g10.c:1538 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1505 +#: g10/g10.c:1544 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1513 +#: g10/g10.c:1552 msgid "a notation value must not use any control characters\n" msgstr "" @@ -880,7 +908,14 @@ "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs " "foi usado\n" -#: g10/pkclist.c:137 +# ??? +#. a string with valid answers +#: g10/pkclist.c:140 +#, fuzzy +msgid "sSmMqQ" +msgstr "sSmMqQ" + +#: g10/pkclist.c:144 #, c-format msgid "" "No trust value assigned to %lu:\n" @@ -889,7 +924,7 @@ "Nenhum valor de confianГa designado para %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:147 +#: g10/pkclist.c:154 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -912,30 +947,23 @@ " 4 = Eu confio completamente\n" " 5 = Mostrar mais informaГЦo\n" -#: g10/pkclist.c:156 +#: g10/pkclist.c:163 msgid " m = back to the main menu\n" msgstr " m = volta ao menu principal\n" -#: g10/pkclist.c:158 +#: g10/pkclist.c:165 msgid " q = quit\n" msgstr " q = sai\n" -# ??? -#. a string with valid answers -#: g10/pkclist.c:163 -#, fuzzy -msgid "sSmMqQ" -msgstr "sSmMqQ" - -#: g10/pkclist.c:167 +#: g10/pkclist.c:171 msgid "Your decision? " msgstr "Sua decisЦo? " -#: g10/pkclist.c:187 +#: g10/pkclist.c:193 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/pkclist.c:256 +#: g10/pkclist.c:264 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" @@ -945,13 +973,13 @@ "Vamos ver se И possМvel designar alguns valores de confianГa ausentes.\n" "\n" -#: g10/pkclist.c:262 +#: g10/pkclist.c:270 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:264 +#: g10/pkclist.c:272 msgid "" "No certificates with undefined trust found.\n" "\n" @@ -959,7 +987,7 @@ "Nenhum certificado com confianГa indefinida encontrado.\n" "\n" -#: g10/pkclist.c:266 +#: g10/pkclist.c:274 msgid "" "No trust values changed.\n" "\n" @@ -967,36 +995,36 @@ "Nenhum valor de confianГa modificado.\n" "\n" -#: g10/pkclist.c:283 +#: g10/pkclist.c:291 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "chave %08lX: a chave foi revogada!\n" -#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405 +#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413 msgid "Use this key anyway? " msgstr "Usa esta chave de qualquer modo? " -#: g10/pkclist.c:293 +#: g10/pkclist.c:301 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "chave %08lX: a subchave foi revogada!\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:331 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: a chave expirou\n" -#: g10/pkclist.c:329 +#: g10/pkclist.c:337 #, 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:343 +#: g10/pkclist.c:351 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: NСs NцO confiamos nesta chave\n" -#: g10/pkclist.c:349 +#: g10/pkclist.c:357 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" @@ -1005,15 +1033,15 @@ "%08lX: NЦo se tem certeza de que esta chave realmente pertence ao dono,\n" "mas И aceita de qualquer modo\n" -#: g10/pkclist.c:355 +#: g10/pkclist.c:363 msgid "This key probably belongs to the owner\n" msgstr "Esta chave provavelmente pertence ao dono\n" -#: g10/pkclist.c:360 +#: g10/pkclist.c:368 msgid "This key belongs to us\n" msgstr "Esta chave pertence a nСs\n" -#: g10/pkclist.c:400 +#: g10/pkclist.c:408 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" @@ -1025,65 +1053,65 @@ "afirmativamente Ю prСxima pergunta\n" "\n" -#: g10/pkclist.c:413 g10/pkclist.c:435 +#: g10/pkclist.c:421 g10/pkclist.c:443 msgid "WARNING: Using untrusted key!\n" msgstr "AVISO: Usando chave nЦo confiАvel!\n" -#: g10/pkclist.c:456 +#: g10/pkclist.c:464 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:457 +#: g10/pkclist.c:465 msgid " This could mean that the signature is forgery.\n" msgstr " Isto pode significar que a assinatura И falsificada.\n" -#: g10/pkclist.c:461 +#: g10/pkclist.c:469 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:482 +#: g10/pkclist.c:490 msgid "Note: This key has expired!\n" msgstr "Nota: Esta chave expirou!\n" -#: g10/pkclist.c:489 +#: g10/pkclist.c:497 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:491 +#: g10/pkclist.c:499 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:507 +#: g10/pkclist.c:515 msgid "WARNING: We do NOT trust this key!\n" msgstr "AVISO: NСs NцO confiamos nesta chave!\n" -#: g10/pkclist.c:508 +#: g10/pkclist.c:516 msgid " The signature is probably a FORGERY.\n" msgstr " A assinatura И provavelmente uma FALSIFICAгцO.\n" -#: g10/pkclist.c:515 +#: g10/pkclist.c:523 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:518 +#: g10/pkclist.c:526 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:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715 +#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:590 g10/pkclist.c:697 +#: g10/pkclist.c:635 g10/pkclist.c:785 #, 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:613 +#: g10/pkclist.c:662 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1091,30 +1119,34 @@ "VocЙ nЦo especificou um ID de usuАrio. (pode-se usar \"-r\")\n" "\n" -#: g10/pkclist.c:618 +#: g10/pkclist.c:672 msgid "Enter the user ID: " msgstr "Digite o identificador de usuАrio: " -#: g10/pkclist.c:629 +#: g10/pkclist.c:684 msgid "No such user ID.\n" msgstr "Identificador de usuАrio inexistente.\n" -#: g10/pkclist.c:639 +#: g10/pkclist.c:704 #, fuzzy msgid "Public key is disabled.\n" msgstr "a chave pЗblica И %08lX\n" -#: g10/pkclist.c:678 +#: g10/pkclist.c:733 +msgid "unknown default recipient `s'\n" +msgstr "" + +#: g10/pkclist.c:766 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: erro na verificaГЦo da chave: %s\n" -#: g10/pkclist.c:683 +#: g10/pkclist.c:771 #, 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:721 +#: g10/pkclist.c:809 msgid "no valid addressees\n" msgstr "nenhum endereГo vАlido\n" @@ -1504,238 +1536,238 @@ msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando chave secundАria %08lX ao invИs de chave primАria %08lX\n" -#: g10/import.c:116 +#: g10/import.c:117 #, c-format msgid "can't open `%s': %s\n" msgstr "impossМvel abrir `%s': %s\n" -#: g10/import.c:160 +#: g10/import.c:161 #, c-format msgid "skipping block of type %d\n" msgstr "ignorando bloco do tipo %d\n" -#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697 +#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu chaves processadas atИ agora\n" -#: g10/import.c:172 +#: g10/import.c:173 #, c-format msgid "error reading `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/import.c:175 +#: g10/import.c:176 #, c-format msgid "Total number processed: %lu\n" msgstr "NЗmero total processado: %lu\n" -#: g10/import.c:177 +#: g10/import.c:178 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sem IDs de usuАrios: %lu\n" -#: g10/import.c:179 +#: g10/import.c:180 #, c-format msgid " imported: %lu" msgstr " importados: %lu" -#: g10/import.c:185 +#: g10/import.c:186 #, c-format msgid " unchanged: %lu\n" msgstr " nЦo modificados: %lu\n" -#: g10/import.c:187 +#: g10/import.c:188 #, c-format msgid " new user IDs: %lu\n" msgstr " novos IDs de usuАrios: %lu\n" -#: g10/import.c:189 +#: g10/import.c:190 #, c-format msgid " new subkeys: %lu\n" msgstr " novas subchaves: %lu\n" -#: g10/import.c:191 +#: g10/import.c:192 #, c-format msgid " new signatures: %lu\n" msgstr " novas assinaturas: %lu\n" -#: g10/import.c:193 +#: g10/import.c:194 #, c-format msgid " new key revocations: %lu\n" msgstr " novas revogaГУes de chaves: %lu\n" -#: g10/import.c:195 +#: g10/import.c:196 #, c-format msgid " secret keys read: %lu\n" msgstr " chaves secretas lidas: %lu\n" -#: g10/import.c:197 +#: g10/import.c:198 #, c-format msgid " secret keys imported: %lu\n" msgstr " chaves secretas importadas: %lu\n" -#: g10/import.c:199 +#: g10/import.c:200 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " chaves secretas nЦo modificadas: %lu\n" -#: g10/import.c:342 g10/import.c:526 +#: g10/import.c:361 g10/import.c:550 #, c-format msgid "key %08lX: no user id\n" msgstr "chave %08lX: sem id de usuАrio\n" -#: g10/import.c:353 +#: g10/import.c:372 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "chave %08lX: sem ids de usuАrios vАlidos\n" -#: g10/import.c:355 +#: g10/import.c:374 msgid "this may be caused by a missing self-signature\n" msgstr "isto pode ser causado por falta de auto-assinatura\n" -#: g10/import.c:366 g10/import.c:593 +#: g10/import.c:385 g10/import.c:617 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "chave %08lX: chave pЗblica nЦo encontrada: %s\n" -#: g10/import.c:372 +#: g10/import.c:391 msgid "no default public keyring\n" msgstr "sem chaveiro pЗblico padrЦo\n" -#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "escrevendo para `%s'\n" -#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642 +#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666 #, fuzzy, c-format msgid "can't lock keyring `%s': %s\n" msgstr "impossМvel bloquear chaveiro `%s': %s\n" -#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "%s: erro na escrita do chaveiro `%s': %s\n" -#: g10/import.c:387 +#: g10/import.c:406 #, c-format msgid "key %08lX: public key imported\n" msgstr "chave %08lX: chave pЗblica importada\n" -#: g10/import.c:399 +#: g10/import.c:423 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "chave %08lX: nЦo corresponde Ю nossa cСpia\n" -#: g10/import.c:408 g10/import.c:601 +#: g10/import.c:432 g10/import.c:625 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "chave %08lX: impossМvel localizar bloco de chaves original: %s\n" -#: g10/import.c:414 g10/import.c:607 +#: g10/import.c:438 g10/import.c:631 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "chave %08lX: impossМvel ler bloco de chaves original: %s\n" -#: g10/import.c:441 +#: g10/import.c:465 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "chave %8lX: 1 novo id de usuАrio\n" -#: g10/import.c:444 +#: g10/import.c:468 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "chave %08lX: %d novos ids de usuАrios\n" -#: g10/import.c:447 +#: g10/import.c:471 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "chave %08lX: 1 nova assinatura\n" -#: g10/import.c:450 +#: g10/import.c:474 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "chave %08lX: %d novas assinaturas\n" -#: g10/import.c:453 +#: g10/import.c:477 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "chave %08lX: 1 nova subchave\n" -#: g10/import.c:456 +#: g10/import.c:480 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "chave %08lX: %d novas subchaves\n" -#: g10/import.c:466 +#: g10/import.c:490 #, c-format msgid "key %08lX: not changed\n" msgstr "chave %08lX: nЦo modificada\n" -#: g10/import.c:549 +#: g10/import.c:573 #, c-format msgid "key %08lX: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" #. we can't merge secret keys -#: g10/import.c:553 +#: g10/import.c:577 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "chave %08lX: jА existe no chaveiro secreto\n" -#: g10/import.c:558 +#: g10/import.c:582 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "chave %08lX: chave secreta nЦo encontrada: %s\n" -#: g10/import.c:587 +#: g10/import.c:611 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "chave %08lX: sem chave pЗblica - impossМvel aplicar certificado\n" "de revogaГЦo\n" -#: g10/import.c:618 +#: g10/import.c:642 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "chave %08lX: certificado de revogaГЦo invАlido: %s - rejeitado\n" -#: g10/import.c:650 +#: g10/import.c:674 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "chave %08lX: certificado de revogaГЦo importado\n" -#: g10/import.c:683 +#: g10/import.c:707 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "chave %08lX: sem id de usuАrio para assinatura\n" -#: g10/import.c:690 g10/import.c:714 +#: g10/import.c:714 g10/import.c:738 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "chave %08lX: algoritmo de chave pЗblica nЦo suportado\n" -#: g10/import.c:691 +#: g10/import.c:715 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "chave %08lX: auto-assinatura invАlida\n" -#: g10/import.c:706 +#: g10/import.c:730 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "chave %08lX: sem subchave para ligaГЦo de chaves\n" -#: g10/import.c:715 +#: g10/import.c:739 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "chave %08lX: ligaГЦo de subchave invАlida\n" -#: g10/import.c:747 +#: g10/import.c:771 #, c-format msgid "key %08lX: skipped userid '" msgstr "chave %08lX: id de usuАrio ignorado '" -#: g10/import.c:770 +#: g10/import.c:794 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "chave %08lX: subchave ignorada\n" @@ -1744,32 +1776,32 @@ #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense -#: g10/import.c:795 +#: g10/import.c:819 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "chave %08lX: assinatura nЦo exportАvel (classe %02x) - ignorada\n" -#: g10/import.c:804 +#: g10/import.c:828 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "chave %08lX: certificado de revogaГЦo no local errado - ignorada\n" -#: g10/import.c:812 +#: g10/import.c:836 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "chave %08lX: certificado de revogaГЦo invАlido: %s - ignorada\n" -#: g10/import.c:912 +#: g10/import.c:936 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "chave %08lX: detectado ID de usuАrio duplicado - unido\n" -#: g10/import.c:963 +#: g10/import.c:987 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "chave %08lX: certificado de revogaГЦo adicionado\n" -#: g10/import.c:1076 g10/import.c:1131 +#: g10/import.c:1100 g10/import.c:1155 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "chave %08lX: nossa cСpia nЦo tem auto-assinatura\n" @@ -1855,7 +1887,7 @@ msgid "Really sign? " msgstr "Realmente assinar? " -#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128 +#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128 #, c-format msgid "signing failed: %s\n" msgstr "assinatura falhou: %s\n" @@ -1897,400 +1929,400 @@ msgid "moving a key signature to the correct place\n" msgstr "movendo a assinatura da chave para o local correto\n" -#: g10/keyedit.c:561 +#: g10/keyedit.c:564 msgid "quit this menu" msgstr "sair deste menu" -#: g10/keyedit.c:562 +#: g10/keyedit.c:565 msgid "q" msgstr "s" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save" msgstr "gravar" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save and quit" msgstr "gravar e sair" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "help" msgstr "ajuda" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "show this help" msgstr "mostra esta ajuda" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "fpr" msgstr "imp" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "show fingerprint" msgstr "mostra impressЦo digital" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list" msgstr "lista" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 msgid "list key and user ids" msgstr "lista chave e identificaГУes de usuАrios" # ??? -#: g10/keyedit.c:568 +#: g10/keyedit.c:571 msgid "l" msgstr "l" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "uid" msgstr "uid" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "select user id N" msgstr "seleciona id de usuАrio N" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "key" msgstr "chave" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "select secondary key N" msgstr "seleciona chave secundАria N" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "check" msgstr "verifica" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "list signatures" msgstr "lista assinaturas" # ??? -#: g10/keyedit.c:572 +#: g10/keyedit.c:575 msgid "c" msgstr "c" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign" msgstr "assina" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign the key" msgstr "assina a chave" # ??? -#: g10/keyedit.c:574 +#: g10/keyedit.c:577 msgid "s" msgstr "s" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 #, fuzzy msgid "lsign" msgstr "lassina" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 msgid "sign the key locally" msgstr "assina a chave localmente" -#: g10/keyedit.c:576 +#: g10/keyedit.c:579 msgid "debug" msgstr "depura" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "adduid" msgstr "" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "add a user id" msgstr "adiciona um novo id de usuАrio" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "deluid" msgstr "" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "delete user id" msgstr "remove id de usuАrio" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "addkey" msgstr "" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "add a secondary key" msgstr "adiciona nova chave secundАria" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delkey" msgstr "" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delete a secondary key" msgstr "remove uma chave secundАria" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 #, fuzzy msgid "delsig" msgstr "lassina" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 #, fuzzy msgid "delete signatures" msgstr "lista assinaturas" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "expire" msgstr "expira" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "change the expire date" msgstr "muda a data de expiraГЦo" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle" msgstr "alterna" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle between secret and public key listing" msgstr "alterna entre listagem de chave secreta e pЗblica" -#: g10/keyedit.c:585 +#: g10/keyedit.c:588 msgid "t" msgstr "c" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "pref" msgstr "" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "list preferences" msgstr "lista preferЙncias" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "passwd" msgstr "senha" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "change the passphrase" msgstr "muda a frase secreta" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "trust" msgstr "confianca" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "change the ownertrust" msgstr "muda os valores de confianГa" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 #, fuzzy msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 msgid "revoke signatures" msgstr "revoga assinaturas" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 #, fuzzy msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 msgid "revoke a secondary key" msgstr "revoga uma chave secundАria" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 msgid "disable" msgstr "" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 #, fuzzy msgid "disable a key" msgstr "chave incorreta" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 msgid "enable" msgstr "" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 #, fuzzy msgid "enable a key" msgstr "chave incorreta" -#: g10/keyedit.c:611 +#: g10/keyedit.c:614 msgid "can't do that in batchmode\n" msgstr "impossМvel fazer isso em modo nЦo-interativo\n" #. check that they match -#. FIXME: check that they both match -#: g10/keyedit.c:640 +#. fixme: check that they both match +#: g10/keyedit.c:652 msgid "Secret key is available.\n" msgstr "Chave secreta disponМvel.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:681 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:696 +#: g10/keyedit.c:711 msgid "Need the secret key to do this.\n" msgstr "A chave secreta И necessАria para fazer isto.\n" -#: g10/keyedit.c:718 -msgid "Save changes? " -msgstr "Salvar alteraГУes? " - -#: g10/keyedit.c:721 -msgid "Quit without saving? " -msgstr "Sair sem salvar? " - -#: g10/keyedit.c:731 -#, c-format -msgid "update failed: %s\n" -msgstr "atualizaГЦo falhou: %s\n" - -#: g10/keyedit.c:738 -#, c-format -msgid "update secret failed: %s\n" -msgstr "atualizaГЦo da chave secreta falhou: %s\n" - -#: g10/keyedit.c:745 -msgid "Key not changed so no update needed.\n" -msgstr "Chave nЦo alterada, nenhuma atualizaГЦo И necessАria.\n" - -#: g10/keyedit.c:748 g10/keyedit.c:807 -#, c-format -msgid "update of trustdb failed: %s\n" -msgstr "atualizaГЦo do banco de dados de confiabilidade falhou: %s\n" - -#: g10/keyedit.c:781 +#: g10/keyedit.c:758 msgid "Really sign all user ids? " msgstr "Realmente assinar todos os ids de usuАrio? " -#: g10/keyedit.c:782 +#: g10/keyedit.c:759 msgid "Hint: Select the user ids to sign\n" msgstr "SugestЦo: Selecione os ids de usuАrio para assinar\n" -#: g10/keyedit.c:818 g10/keyedit.c:839 +#: g10/keyedit.c:786 g10/keyedit.c:968 +#, c-format +msgid "update of trustdb failed: %s\n" +msgstr "atualizaГЦo do banco de dados de confiabilidade falhou: %s\n" + +#: g10/keyedit.c:797 g10/keyedit.c:818 msgid "You must select at least one user id.\n" msgstr "VocЙ precisa selecionar pelo menos um id de usuАrio.\n" -#: g10/keyedit.c:820 +#: g10/keyedit.c:799 msgid "You can't delete the last user id!\n" msgstr "VocЙ nЦo pode remover o Зltimo id de usuАrio!\n" -#: g10/keyedit.c:823 +#: g10/keyedit.c:802 msgid "Really remove all selected user ids? " msgstr "Realmente remover todos os ids de usuАrio selecionados? " -#: g10/keyedit.c:824 +#: g10/keyedit.c:803 msgid "Really remove this user id? " msgstr "Realmente remover este id de usuАrio? " -#: g10/keyedit.c:860 g10/keyedit.c:882 +#: g10/keyedit.c:839 g10/keyedit.c:861 msgid "You must select at least one key.\n" msgstr "VocЙ deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:864 +#: g10/keyedit.c:843 msgid "Do you really want to delete the selected keys? " msgstr "VocЙ realmente quer remover as chaves selecionadas? " -#: g10/keyedit.c:865 +#: g10/keyedit.c:844 msgid "Do you really want to delete this key? " msgstr "VocЙ realmente quer remover esta chave? " -#: g10/keyedit.c:886 +#: g10/keyedit.c:865 msgid "Do you really want to revoke the selected keys? " msgstr "VocЙ realmente quer revogar as chaves selecionadas? " -#: g10/keyedit.c:887 +#: g10/keyedit.c:866 msgid "Do you really want to revoke this key? " msgstr "VocЙ realmente quer revogar esta chave? " +#: g10/keyedit.c:932 +msgid "Save changes? " +msgstr "Salvar alteraГУes? " + +#: g10/keyedit.c:935 +msgid "Quit without saving? " +msgstr "Sair sem salvar? " + +#: g10/keyedit.c:946 +#, c-format +msgid "update failed: %s\n" +msgstr "atualizaГЦo falhou: %s\n" + +#: g10/keyedit.c:953 +#, c-format +msgid "update secret failed: %s\n" +msgstr "atualizaГЦo da chave secreta falhou: %s\n" + +#: g10/keyedit.c:960 +msgid "Key not changed so no update needed.\n" +msgstr "Chave nЦo alterada, nenhuma atualizaГЦo И necessАria.\n" + # help ou ajuda ??? -#: g10/keyedit.c:949 +#: g10/keyedit.c:975 msgid "Invalid command (try \"help\")\n" msgstr "Comando invАlido (tente \"help\")\n" -#: g10/keyedit.c:1039 +#: g10/keyedit.c:1065 #, fuzzy msgid "This key has been disabled" msgstr "Nota: Esta chave expirou!\n" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1314 +#: g10/keyedit.c:1340 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1318 +#: g10/keyedit.c:1344 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1324 +#: g10/keyedit.c:1350 #, fuzzy msgid "Really delete this self-signature? (y/N)" msgstr "Realmente gerar os certificados de revogaГЦo? (s/N)" -#: g10/keyedit.c:1338 +#: g10/keyedit.c:1364 #, fuzzy, c-format msgid "Deleted %d signature.\n" msgstr "%d assinaturas incorretas\n" -#: g10/keyedit.c:1339 +#: g10/keyedit.c:1365 #, fuzzy, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas incorretas\n" -#: g10/keyedit.c:1342 +#: g10/keyedit.c:1368 #, fuzzy msgid "Nothing deleted.\n" msgstr "AVISO: nada exportado\n" -#: g10/keyedit.c:1411 +#: g10/keyedit.c:1437 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as seleГУes das chaves secretas.\n" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1443 msgid "Please select at most one secondary key.\n" msgstr "Por favor selecione no mАximo uma chave secundАria.\n" -#: g10/keyedit.c:1421 +#: g10/keyedit.c:1447 #, fuzzy msgid "Changing expiration time for a secondary key.\n" msgstr "Modificando a data de expiraГЦo para a chave secundАria.\n" -#: g10/keyedit.c:1423 +#: g10/keyedit.c:1449 #, fuzzy msgid "Changing expiration time for the primary key.\n" msgstr "Modificando a data de expiraГЦo para a chave primАria.\n" -#: g10/keyedit.c:1464 +#: g10/keyedit.c:1490 msgid "You can't change the expiration date of a v3 key\n" msgstr "VocЙ nЦo pode modificar a data de expiraГЦo de uma chave v3\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1506 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n" -#: g10/keyedit.c:1540 +#: g10/keyedit.c:1566 #, c-format msgid "No user id with index %d\n" msgstr "Nenhum id de usuАrio com Мndice %d\n" -#: g10/keyedit.c:1586 +#: g10/keyedit.c:1612 #, c-format msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundАria com Мndice %d\n" -#: g10/keyedit.c:1684 +#: g10/keyedit.c:1710 msgid "user ID: \"" msgstr "Digite o identificador de usuАrio:" -#: g10/keyedit.c:1687 +#: g10/keyedit.c:1713 #, c-format msgid "" "\"\n" @@ -2299,15 +2331,15 @@ "\"\n" "assinado com sua chave %08lX em %s\n" -#: g10/keyedit.c:1691 +#: g10/keyedit.c:1717 msgid "Create a revocation certificate for this signature? (y/N)" msgstr "Gerar um certificado de revogaГЦo para esta assinatura? (s/N)" -#: g10/keyedit.c:1771 +#: g10/keyedit.c:1797 msgid "Really create the revocation certificates? (y/N)" msgstr "Realmente gerar os certificados de revogaГЦo? (s/N)" -#: g10/keyedit.c:1794 +#: g10/keyedit.c:1820 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" @@ -3263,6 +3295,9 @@ #, c-format msgid "No help available for `%s'" msgstr "Nenhuma ajuda disponМvel para `%s'" + +#~ msgid "print all message digests" +#~ msgstr "imprime todos os \"digests\" de mensagens" #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" #~ msgstr "" diff -urN gnupg-0.9.8a/po/ru.po gnupg-0.9.8b/po/ru.po --- gnupg-0.9.8a/po/ru.po Mon Jul 12 15:05:21 1999 +++ gnupg-0.9.8b/po/ru.po Wed Jul 14 11:50:50 1999 @@ -9,7 +9,7 @@ # QingLong (couldn't send an email to let you know) msgid "" msgstr "" -"POT-Creation-Date: 1999-07-12 15:04+0200\n" +"POT-Creation-Date: 1999-07-14 11:47+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck \n" @@ -44,7 +44,7 @@ msgid "yY" msgstr "yY" -#: g10/keyedit.c:561 util/miscutil.c:272 +#: g10/keyedit.c:564 util/miscutil.c:272 msgid "quit" msgstr "выход" @@ -330,7 +330,7 @@ "Недостаточно случайных данных. Пожалуйста, поделайте что-нибудь, чтобы\n" "ОС могла набрать дополнительные случайные числа! (нужно еще %d байт)\n" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "" "@Commands:\n" " " @@ -338,136 +338,142 @@ "@Команды:\n" " " -#: g10/g10.c:179 +#: g10/g10.c:182 #, fuzzy msgid "|[file]|make a signature" msgstr "|[файл]|создать подпись" -#: g10/g10.c:180 +#: g10/g10.c:183 #, fuzzy msgid "|[file]|make a clear text signature" msgstr "|[файл]|создать текстовую подпись" -#: g10/g10.c:181 +#: g10/g10.c:184 msgid "make a detached signature" msgstr "создать отдельную подпись" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "encrypt data" msgstr "зашифровать данные" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "encryption only with symmetric cipher" msgstr "зашифровать симметричным алгоритмом" -#: g10/g10.c:184 +#: g10/g10.c:187 msgid "store only" msgstr "только сохранить" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "decrypt data (default)" msgstr "расшифровать данные (по умолчанию)" -#: g10/g10.c:186 +#: g10/g10.c:189 msgid "verify a signature" msgstr "проверить подпись" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "list keys" msgstr "список ключей" -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "list keys and signatures" msgstr "список ключей и подписей" -#: g10/g10.c:190 +#: g10/g10.c:193 msgid "check key signatures" msgstr "проверить подпись на ключе" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "list keys and fingerprints" msgstr "список ключей с их \"отпечатками пальцев\"" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "list secret keys" msgstr "список секретных ключей" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "generate a new key pair" msgstr "сгенерировать новую пару ключей (открытый и секретный)" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "remove key from the public keyring" msgstr "удалить ключ со связки" -#: g10/g10.c:195 +#: g10/g10.c:198 +#, fuzzy +msgid "sign a key" +msgstr "подписать ключ" + +#: g10/g10.c:199 +#, fuzzy +msgid "sign a key locally" +msgstr "подписать ключ" + +#: g10/g10.c:200 msgid "sign or edit a key" msgstr "подписать или редактировать ключ" -#: g10/g10.c:196 +#: g10/g10.c:201 msgid "generate a revocation certificate" msgstr "сгенерировать отзывающий сертификат" -#: g10/g10.c:197 +#: g10/g10.c:202 msgid "export keys" msgstr "экспортировать ключи" -#: g10/g10.c:198 +#: g10/g10.c:203 msgid "export keys to a key server" msgstr "" -#: g10/g10.c:199 +#: g10/g10.c:204 msgid "import keys from a key server" msgstr "" -#: g10/g10.c:202 +#: g10/g10.c:207 msgid "import/merge keys" msgstr "импортировать/добавить ключи" -#: g10/g10.c:204 +#: g10/g10.c:209 msgid "list only the sequence of packets" msgstr "напечатать только последовательность пакетов" -#: g10/g10.c:206 +#: g10/g10.c:211 #, fuzzy msgid "export the ownertrust values" msgstr "экспортировать параметры доверия\n" -#: g10/g10.c:208 +#: g10/g10.c:213 #, fuzzy msgid "import ownertrust values" msgstr "импортировать параметры доверия\n" -#: g10/g10.c:210 +#: g10/g10.c:215 #, fuzzy -msgid "|[NAMES]|update the trust database" +msgid "update the trust database" msgstr "|[ИМЕНА]|проверить базу данных доверия" -#: g10/g10.c:212 +#: g10/g10.c:217 msgid "|[NAMES]|check the trust database" msgstr "|[ИМЕНА]|проверить базу данных доверия" -#: g10/g10.c:213 +#: g10/g10.c:218 msgid "fix a corrupted trust database" msgstr "исправить разрушенную базу данных доверия" -#: g10/g10.c:214 +#: g10/g10.c:219 msgid "De-Armor a file or stdin" msgstr "Декодировать stdin или файл из ASCII-представления" -#: g10/g10.c:215 +#: g10/g10.c:220 msgid "En-Armor a file or stdin" msgstr "Закодировать stdin или файл в ASCII-представление" -#: g10/g10.c:216 +#: g10/g10.c:221 msgid "|algo [files]|print message digests" msgstr "|algo [files]|напечатать дайджест сообщения" -#: g10/g10.c:217 -msgid "print all message digests" -msgstr "напечатать все дайджесты сообщения" - -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "" "@\n" "Options:\n" @@ -477,169 +483,178 @@ "Параметры:\n" " " -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "create ascii armored output" msgstr "вывод в ASCII-представлении" -#: g10/g10.c:226 +#: g10/g10.c:228 #, fuzzy msgid "|NAME|encrypt for NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:230 +#: g10/g10.c:231 +#, fuzzy +msgid "|NAME|use NAME as default recipient" +msgstr "|ИМЯ|использовать ИМЯ в качестве секретного ключа по умолчанию" + +#: g10/g10.c:233 +msgid "use the default key as default recipient" +msgstr "" + +#: g10/g10.c:237 msgid "use this user-id to sign or decrypt" msgstr "" "использовать указанный идентификатор пользователя для подписи или расшифровки" -#: g10/g10.c:231 +#: g10/g10.c:238 msgid "|N|set compress level N (0 disables)" msgstr "|N|установить уровень сжатия (0 - не сжимать)" -#: g10/g10.c:233 +#: g10/g10.c:240 msgid "use canonical text mode" msgstr "использовать канонический текстовый режим" -#: g10/g10.c:234 +#: g10/g10.c:241 msgid "use as output file" msgstr "использовать в качестве выходного файла" -#: g10/g10.c:235 +#: g10/g10.c:242 msgid "verbose" msgstr "многословный" -#: g10/g10.c:236 +#: g10/g10.c:243 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:237 +#: g10/g10.c:244 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:238 +#: g10/g10.c:245 #, fuzzy msgid "force v3 signatures" msgstr "проверить подпись на ключе" -#: g10/g10.c:239 +#: g10/g10.c:246 #, fuzzy msgid "always use a MDC for encryption" msgstr "использовать указанный идентификатор пользователя для шифрования" -#: g10/g10.c:240 +#: g10/g10.c:247 msgid "do not make any changes" msgstr "Keine wirklichen дnderungen durchfЭhren" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:242 +#: g10/g10.c:249 msgid "batch mode: never ask" msgstr "пакетный режим: ничего не спрашивать" -#: g10/g10.c:243 +#: g10/g10.c:250 msgid "assume yes on most questions" msgstr "отвечать \"да\" на большинство вопросов" -#: g10/g10.c:244 +#: g10/g10.c:251 msgid "assume no on most questions" msgstr "отвечать \"нет\" на большинство вопросов" -#: g10/g10.c:245 +#: g10/g10.c:252 msgid "add this keyring to the list of keyrings" msgstr "добавить эту связку к списку связок ключей" -#: g10/g10.c:246 +#: g10/g10.c:253 msgid "add this secret keyring to the list" msgstr "добавить эту секретную связку к списку связок ключей" -#: g10/g10.c:247 +#: g10/g10.c:254 msgid "|NAME|use NAME as default secret key" msgstr "|ИМЯ|использовать ИМЯ в качестве секретного ключа по умолчанию" -#: g10/g10.c:248 +#: g10/g10.c:255 msgid "|HOST|use this keyserver to lookup keys" msgstr "" -#: g10/g10.c:249 +#: g10/g10.c:256 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:250 +#: g10/g10.c:257 msgid "read options from file" msgstr "читать параметры из файла" -#: g10/g10.c:252 +#: g10/g10.c:259 msgid "set debugging flags" msgstr "установить отладочные флаги" -#: g10/g10.c:253 +#: g10/g10.c:260 msgid "enable full debugging" msgstr "разрешить всю отладку" -#: g10/g10.c:254 +#: g10/g10.c:261 msgid "|FD|write status info to this FD" msgstr "|FD| записывать информацию о состоянии в дескриптор (FD)" -#: g10/g10.c:255 +#: g10/g10.c:262 msgid "do not write comment packets" msgstr "не писать пакеты с комментариями" -#: g10/g10.c:256 +#: g10/g10.c:263 msgid "(default is 1)" msgstr "(по умолчанию 1)" -#: g10/g10.c:257 +#: g10/g10.c:264 msgid "(default is 3)" msgstr "(по умолчанию 3)" -#: g10/g10.c:259 +#: g10/g10.c:266 #, fuzzy msgid "|FILE|load extension module FILE" msgstr "|ФАЙЛ|загрузить ФАЙЛ с расширяющими модулями" -#: g10/g10.c:260 +#: g10/g10.c:267 msgid "emulate the mode described in RFC1991" msgstr "эмулировать режим описанный в RFC1991" -#: g10/g10.c:261 +#: g10/g10.c:268 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:262 +#: g10/g10.c:269 #, fuzzy msgid "|N|use passphrase mode N" msgstr "|N|использовать ключевую фразу режима N\n" -#: g10/g10.c:264 +#: g10/g10.c:271 #, fuzzy msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ для ключевых фраз" -#: g10/g10.c:266 +#: g10/g10.c:273 #, fuzzy msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ для ключевых фраз" -#: g10/g10.c:267 +#: g10/g10.c:274 msgid "|NAME|use cipher algorithm NAME" msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ" -#: g10/g10.c:268 +#: g10/g10.c:275 msgid "|NAME|use message digest algorithm NAME" msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ" -#: g10/g10.c:269 +#: g10/g10.c:276 msgid "|N|use compress algorithm N" msgstr "|N|использовать алгоритм сжатия N" -#: g10/g10.c:270 +#: g10/g10.c:277 msgid "throw keyid field of encrypted packets" msgstr "выбрасывать поле keyid у зашифрованных пакетов" -#: g10/g10.c:271 +#: g10/g10.c:278 msgid "|NAME=VALUE|use this notation data" msgstr "" -#: g10/g10.c:273 +#: g10/g10.c:280 #, fuzzy msgid "" "@\n" @@ -660,17 +675,17 @@ " --list-keys [names] показать список ключей\n" " --fingerprint [names] показать \"отпечатки пальцев\" ключей\n" -#: g10/g10.c:353 +#: g10/g10.c:360 msgid "Please report bugs to .\n" msgstr "" "Пожалуйста, отправляйте сообщения об ошибках по адресу " ".\n" -#: g10/g10.c:357 +#: g10/g10.c:364 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Использование: gpg [параметры] [файлы] (-h для помощи)" -#: g10/g10.c:360 +#: g10/g10.c:367 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -680,7 +695,7 @@ "подписывает, проверяет подписи, шифрует или расшифровывает\n" "режим работы зависит от входных данных\n" -#: g10/g10.c:365 +#: g10/g10.c:372 msgid "" "\n" "Supported algorithms:\n" @@ -688,171 +703,182 @@ "\n" "Поддерживаемые алгоритмы:\n" -#: g10/g10.c:439 +#: g10/g10.c:446 msgid "usage: gpg [options] " msgstr "Использование: gpg [параметры] " -#: g10/g10.c:492 +#: g10/g10.c:499 msgid "conflicting commands\n" msgstr "WidersprЭchliche Kommandos\n" -#: g10/g10.c:626 +#: g10/g10.c:633 #, fuzzy, c-format msgid "NOTE: no default option file `%s'\n" msgstr "замечание: файл параметров по умолчанию `%s' отсутствует\n" -#: g10/g10.c:630 +#: g10/g10.c:637 #, c-format msgid "option file `%s': %s\n" msgstr "файл параметров `%s': %s\n" -#: g10/g10.c:637 +#: g10/g10.c:644 #, c-format msgid "reading options from `%s'\n" msgstr "читаются параметры из `%s'\n" -#: g10/g10.c:805 +#: g10/g10.c:824 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "Недопустимый символ в комментарии.\n" -#: g10/g10.c:852 g10/g10.c:864 +#: g10/g10.c:872 g10/g10.c:884 msgid "selected cipher algorithm is invalid\n" msgstr "выбран недопустимый алгоритм шифрования\n" -#: g10/g10.c:858 g10/g10.c:870 +#: g10/g10.c:878 g10/g10.c:890 msgid "selected digest algorithm is invalid\n" msgstr "выбран недопустимый дайджест-алгоритм\n" -#: g10/g10.c:874 +#: g10/g10.c:894 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:877 +#: g10/g10.c:897 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "алгоритм упаковки может иметь значения от %d до %d\n" -#: g10/g10.c:879 +#: g10/g10.c:899 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed должен быть больше 0\n" -#: g10/g10.c:881 +#: g10/g10.c:901 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed должен быть больше 1\n" -#: g10/g10.c:883 +#: g10/g10.c:903 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:886 +#: g10/g10.c:906 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "замечание: простой S2K режим (0) очень не рекомендуется\n" -#: g10/g10.c:890 +#: g10/g10.c:910 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "недопустимый режим S2K: должен быть 0, 1 или 3\n" -#: g10/g10.c:967 +#: g10/g10.c:987 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Ошибка инициализации базы данных доверия: %s\n" -#: g10/g10.c:973 +#: g10/g10.c:993 msgid "--store [filename]" msgstr "--store [имя файла]" -#: g10/g10.c:980 +#: g10/g10.c:1000 msgid "--symmetric [filename]" msgstr "--symmetric [имя файла]" -#: g10/g10.c:988 +#: g10/g10.c:1008 msgid "--encrypt [filename]" msgstr "--encrypt [имя файла]" -#: g10/g10.c:1001 +#: g10/g10.c:1021 msgid "--sign [filename]" msgstr "--sign [имя файла]" -#: g10/g10.c:1014 +#: g10/g10.c:1034 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [имя файла]" -#: g10/g10.c:1028 +#: g10/g10.c:1048 msgid "--clearsign [filename]" msgstr "--clearsign [имя файла]" -#: g10/g10.c:1040 +#: g10/g10.c:1060 msgid "--decrypt [filename]" msgstr "--decrypt [имя файла]" -#: g10/g10.c:1049 +#: g10/g10.c:1068 +msgid "--sign-key user-id" +msgstr "" + +#: g10/g10.c:1076 +#, fuzzy +msgid "--lsign-key user-id" +msgstr "--delete-key имя-пользователя" + +#: g10/g10.c:1084 #, fuzzy -msgid "--edit-key username [commands]" +msgid "--edit-key user-id [commands]" msgstr "--edit-key имя-пользователя" -#: g10/g10.c:1063 -msgid "--delete-secret-key username" +#: g10/g10.c:1100 +#, fuzzy +msgid "--delete-secret-key user-id" msgstr "--delete-secret-key имя-пользователя" -#: g10/g10.c:1066 -msgid "--delete-key username" +#: g10/g10.c:1103 +#, fuzzy +msgid "--delete-key user-id" msgstr "--delete-key имя-пользователя" -#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366 +#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "невозможно открыть файл `%s': %s\n" -#: g10/g10.c:1101 +#: g10/g10.c:1138 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [идентификатор пользователя] [связка ключей]" -#: g10/g10.c:1162 +#: g10/g10.c:1199 #, c-format msgid "dearmoring failed: %s\n" msgstr "ошибка декодирования: %s\n" -#: g10/g10.c:1170 +#: g10/g10.c:1207 #, c-format msgid "enarmoring failed: %s\n" msgstr "ошибка кодирования: %s\n" -#: g10/g10.c:1236 +#: g10/g10.c:1275 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "недопустимый хэш-алгоритм `%s'\n" -#: g10/g10.c:1317 +#: g10/g10.c:1356 msgid "[filename]" msgstr "[имя файла]" -#: g10/g10.c:1321 +#: g10/g10.c:1360 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "невозможно открыть файл `%s'\n" -#: g10/g10.c:1493 +#: g10/g10.c:1532 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1499 +#: g10/g10.c:1538 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1505 +#: g10/g10.c:1544 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1513 +#: g10/g10.c:1552 msgid "a notation value must not use any control characters\n" msgstr "" @@ -933,7 +959,14 @@ "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" -#: g10/pkclist.c:137 +# valid user replies (not including 1..4) +#. a string with valid answers +#: g10/pkclist.c:140 +#, fuzzy +msgid "sSmMqQ" +msgstr "sSmMqQ" + +#: g10/pkclist.c:144 #, fuzzy, c-format msgid "" "No trust value assigned to %lu:\n" @@ -942,7 +975,7 @@ "Не определены параметры доверия для %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:147 +#: g10/pkclist.c:154 #, fuzzy msgid "" "Please decide how far you trust this user to correctly\n" @@ -967,30 +1000,23 @@ " 4 = Верю полностью\n" " s = Пожалуйста, покажите дополнительную информацию\n" -#: g10/pkclist.c:156 +#: g10/pkclist.c:163 msgid " m = back to the main menu\n" msgstr " m = обратно в главное меню\n" -#: g10/pkclist.c:158 +#: g10/pkclist.c:165 msgid " q = quit\n" msgstr "" -# valid user replies (not including 1..4) -#. a string with valid answers -#: g10/pkclist.c:163 -#, fuzzy -msgid "sSmMqQ" -msgstr "sSmMqQ" - -#: g10/pkclist.c:167 +#: g10/pkclist.c:171 msgid "Your decision? " msgstr "Ваше решение? " -#: g10/pkclist.c:187 +#: g10/pkclist.c:193 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:256 +#: g10/pkclist.c:264 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" @@ -1001,70 +1027,70 @@ "некоторые недостающие значения \"доверия владельцу\"\n" "\n" -#: g10/pkclist.c:262 +#: g10/pkclist.c:270 msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" -#: g10/pkclist.c:264 +#: g10/pkclist.c:272 msgid "" "No certificates with undefined trust found.\n" "\n" msgstr "" -#: g10/pkclist.c:266 +#: g10/pkclist.c:274 #, fuzzy msgid "" "No trust values changed.\n" "\n" msgstr "Значения параметров доверия не изменены.\n" -#: g10/pkclist.c:283 +#: g10/pkclist.c:291 #, fuzzy, c-format msgid "key %08lX: key has been revoked!\n" msgstr "build_sigrecs: ключ ist widerrufen\n" -#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405 +#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413 msgid "Use this key anyway? " msgstr "Все равно использовать этот ключ?" -#: g10/pkclist.c:293 +#: g10/pkclist.c:301 #, fuzzy, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "build_sigrecs: ключ ist widerrufen\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:331 #, fuzzy, c-format msgid "%08lX: key has expired\n" msgstr "Замечание: Срок действия ключа уже истек!\n" -#: g10/pkclist.c:329 +#: g10/pkclist.c:337 #, c-format msgid "%08lX: no info to calculate a trust probability\n" msgstr "" -#: g10/pkclist.c:343 +#: g10/pkclist.c:351 #, fuzzy, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "ВНИМАНИЕ: Мы НЕ доверяем этому ключу!\n" -#: g10/pkclist.c:349 +#: g10/pkclist.c:357 #, 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:355 +#: g10/pkclist.c:363 msgid "This key probably belongs to the owner\n" msgstr "" -#: g10/pkclist.c:360 +#: g10/pkclist.c:368 msgid "This key belongs to us\n" msgstr "" -#: g10/pkclist.c:400 +#: g10/pkclist.c:408 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" @@ -1075,65 +1101,65 @@ "кто указан его владельцем. Отвечайте \"да\" на следующий вопрос,\n" "только если вы *действительно* понимаете что делаете.\n" -#: g10/pkclist.c:413 g10/pkclist.c:435 +#: g10/pkclist.c:421 g10/pkclist.c:443 msgid "WARNING: Using untrusted key!\n" msgstr "ВНИМАНИЕ: Используется ключ к которому нет доверия!\n" -#: g10/pkclist.c:456 +#: g10/pkclist.c:464 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ВНИМАНИЕ: Владелец ключа уже отозвал его!\n" -#: g10/pkclist.c:457 +#: g10/pkclist.c:465 msgid " This could mean that the signature is forgery.\n" msgstr " Это может означать, что подпись поддельная.\n" -#: g10/pkclist.c:461 +#: g10/pkclist.c:469 #, fuzzy msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ВНИМАНИЕ: Владелец ключа уже отозвал его!\n" -#: g10/pkclist.c:482 +#: g10/pkclist.c:490 msgid "Note: This key has expired!\n" msgstr "Замечание: Срок действия ключа уже истек!\n" -#: g10/pkclist.c:489 +#: g10/pkclist.c:497 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "ВНИМАНИЕ: Этот ключ не заверен доверенной подписью!\n" -#: g10/pkclist.c:491 +#: g10/pkclist.c:499 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Нет никаких указания на то, что ключ принадлежит его владельцу.\n" -#: g10/pkclist.c:507 +#: g10/pkclist.c:515 msgid "WARNING: We do NOT trust this key!\n" msgstr "ВНИМАНИЕ: Мы НЕ доверяем этому ключу!\n" -#: g10/pkclist.c:508 +#: g10/pkclist.c:516 msgid " The signature is probably a FORGERY.\n" msgstr " Подпись вероятно -- ПОДДЕЛКА.\n" -#: g10/pkclist.c:515 +#: g10/pkclist.c:523 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "ВНИМАНИЕ: Этот ключ не заверен достаточно доверенными подписями!\n" -#: g10/pkclist.c:518 +#: g10/pkclist.c:526 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Нет уверенности, что подпись принадлежит владельцу.\n" -#: g10/pkclist.c:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715 +#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: пропущен: %s\n" -#: g10/pkclist.c:590 g10/pkclist.c:697 +#: g10/pkclist.c:635 g10/pkclist.c:785 #, c-format msgid "%s: skipped: public key already present\n" msgstr "" -#: g10/pkclist.c:613 +#: g10/pkclist.c:662 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1142,30 +1168,34 @@ "\"-r\").\n" "\n" -#: g10/pkclist.c:618 +#: g10/pkclist.c:672 msgid "Enter the user ID: " msgstr "Введите идентификатор пользователя: " -#: g10/pkclist.c:629 +#: g10/pkclist.c:684 msgid "No such user ID.\n" msgstr "Нет такого идентификатора пользователя.\n" -#: g10/pkclist.c:639 +#: g10/pkclist.c:704 #, fuzzy msgid "Public key is disabled.\n" msgstr "Открытый ключ не найден" -#: g10/pkclist.c:678 +#: g10/pkclist.c:733 +msgid "unknown default recipient `s'\n" +msgstr "" + +#: g10/pkclist.c:766 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: ошибка при проверке ключа: %s\n" -#: g10/pkclist.c:683 +#: g10/pkclist.c:771 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "" -#: g10/pkclist.c:721 +#: g10/pkclist.c:809 msgid "no valid addressees\n" msgstr "нет допустимых адресов\n" @@ -1563,238 +1593,238 @@ msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "используется дополнительный ключ %09lX вместо основного %08lX%\n" -#: g10/import.c:116 +#: g10/import.c:117 #, fuzzy, c-format msgid "can't open `%s': %s\n" msgstr "невозможно открыть файл `%s': %s\n" -#: g10/import.c:160 +#: g10/import.c:161 #, c-format msgid "skipping block of type %d\n" msgstr "пропускаем блок типа %d\n" -#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697 +#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697 #, c-format msgid "%lu keys so far processed\n" msgstr "" -#: g10/import.c:172 +#: g10/import.c:173 #, fuzzy, c-format msgid "error reading `%s': %s\n" msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" -#: g10/import.c:175 +#: g10/import.c:176 #, c-format msgid "Total number processed: %lu\n" msgstr "" -#: g10/import.c:177 +#: g10/import.c:178 #, c-format msgid " w/o user IDs: %lu\n" msgstr "" -#: g10/import.c:179 +#: g10/import.c:180 #, c-format msgid " imported: %lu" msgstr "" -#: g10/import.c:185 +#: g10/import.c:186 #, c-format msgid " unchanged: %lu\n" msgstr "" -#: g10/import.c:187 +#: g10/import.c:188 #, c-format msgid " new user IDs: %lu\n" msgstr "" -#: g10/import.c:189 +#: g10/import.c:190 #, c-format msgid " new subkeys: %lu\n" msgstr "" -#: g10/import.c:191 +#: g10/import.c:192 #, fuzzy, c-format msgid " new signatures: %lu\n" msgstr "ключ %08lX: %d новых подписей\n" -#: g10/import.c:193 +#: g10/import.c:194 #, c-format msgid " new key revocations: %lu\n" msgstr "" -#: g10/import.c:195 +#: g10/import.c:196 #, c-format msgid " secret keys read: %lu\n" msgstr "" -#: g10/import.c:197 +#: g10/import.c:198 #, fuzzy, c-format msgid " secret keys imported: %lu\n" msgstr "ключ %08lX: секретный ключ импортирован\n" -#: g10/import.c:199 +#: g10/import.c:200 #, fuzzy, c-format msgid " secret keys unchanged: %lu\n" msgstr "Использован неправильный секретный ключ" -#: g10/import.c:342 g10/import.c:526 +#: g10/import.c:361 g10/import.c:550 #, c-format msgid "key %08lX: no user id\n" msgstr "ключ %08lX: нет идентификатора пользователя\n" -#: g10/import.c:353 +#: g10/import.c:372 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "ключ %08lX: нет допустимых идентификаторов пользователей\n" -#: g10/import.c:355 +#: g10/import.c:374 msgid "this may be caused by a missing self-signature\n" msgstr "это может быть вызвано отсутствием само-подписи\n" -#: g10/import.c:366 g10/import.c:593 +#: g10/import.c:385 g10/import.c:617 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "ключ %08lX: открытый ключ не найден: %s\n" -#: g10/import.c:372 +#: g10/import.c:391 msgid "no default public keyring\n" msgstr "нет связки открытых ключей по умолчанию\n" -#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 +#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559 #, c-format msgid "writing to `%s'\n" msgstr "записывается в `%s'\n" -#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642 +#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666 #, fuzzy, c-format msgid "can't lock keyring `%s': %s\n" msgstr "невозможно заблокировать связку открытых ключей: %s\n" -#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645 +#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669 #, fuzzy, c-format msgid "error writing keyring `%s': %s\n" msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" -#: g10/import.c:387 +#: g10/import.c:406 #, c-format msgid "key %08lX: public key imported\n" msgstr "ключ %08lX: открытый ключ импортирован\n" -#: g10/import.c:399 +#: g10/import.c:423 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "ключ %08lX: не совпадает с нашей копией\n" -#: g10/import.c:408 g10/import.c:601 +#: g10/import.c:432 g10/import.c:625 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "ключ %08lX: невозможно обнаружить original keyblock: %s\n" -#: g10/import.c:414 g10/import.c:607 +#: g10/import.c:438 g10/import.c:631 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "ключ %08lX: невозможно прочитать original keyblock: %s\n" -#: g10/import.c:441 +#: g10/import.c:465 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "ключ %08lX: 1 новый идентификатор пользователя\n" -#: g10/import.c:444 +#: g10/import.c:468 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "ключ %08lX: %d новых идентификаторов пользователей\n" -#: g10/import.c:447 +#: g10/import.c:471 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "ключ %08lX: 1 новая подпись\n" -#: g10/import.c:450 +#: g10/import.c:474 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "ключ %08lX: %d новых подписей\n" -#: g10/import.c:453 +#: g10/import.c:477 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "ключ %08lX: 1 новый под-ключ\n" -#: g10/import.c:456 +#: g10/import.c:480 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "ключ %08lX: %d новых под-ключей\n" -#: g10/import.c:466 +#: g10/import.c:490 #, c-format msgid "key %08lX: not changed\n" msgstr "ключ %08lX: не изменен\n" -#: g10/import.c:549 +#: g10/import.c:573 #, c-format msgid "key %08lX: secret key imported\n" msgstr "ключ %08lX: секретный ключ импортирован\n" #. we can't merge secret keys -#: g10/import.c:553 +#: g10/import.c:577 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "ключ %08lX: уже на связке секретных ключей\n" -#: g10/import.c:558 +#: g10/import.c:582 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "ключ %08lX: секретный ключ не найден: %s\n" -#: g10/import.c:587 +#: g10/import.c:611 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "ключ %08lX: нет открытого ключа - невозможно применить отзывающий " "сертификат\n" -#: g10/import.c:618 +#: g10/import.c:642 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "ключ %08lX: недопустимый отзывающий сертификат: %s - отвергнут\n" -#: g10/import.c:650 +#: g10/import.c:674 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "ключ %08lX: отзывающий сертификат импортирован\n" -#: g10/import.c:683 +#: g10/import.c:707 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "ключ %08lX: нет идентификатора пользователя для подписи\n" -#: g10/import.c:690 g10/import.c:714 +#: g10/import.c:714 g10/import.c:738 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "ключ %08lX: неподдерживаемый алгоритм открытого ключа\n" -#: g10/import.c:691 +#: g10/import.c:715 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "ключ %08lX: недопустимая само-подпись\n" -#: g10/import.c:706 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "ключ %08lX: нет идентификатора пользователя\n" -#: g10/import.c:715 +#: g10/import.c:739 #, fuzzy, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "ключ %08lX: нет допустимых идентификаторов пользователей\n" -#: g10/import.c:747 +#: g10/import.c:771 #, c-format msgid "key %08lX: skipped userid '" msgstr "ключ %08lX: пропущен идентификатор пользователя '" -#: g10/import.c:770 +#: g10/import.c:794 #, fuzzy, c-format msgid "key %08lX: skipped subkey\n" msgstr "ключ %08lX: 1 новый под-ключ\n" @@ -1803,32 +1833,32 @@ #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense -#: g10/import.c:795 +#: g10/import.c:819 #, fuzzy, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "ключ %08lX: отзывающий сертификат в неправильном месте - пропущен\n" -#: g10/import.c:804 +#: g10/import.c:828 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "ключ %08lX: отзывающий сертификат в неправильном месте - пропущен\n" -#: g10/import.c:812 +#: g10/import.c:836 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "ключ %08lX: недопустимый отзывающий сертификат: %s - пропущен\n" -#: g10/import.c:912 +#: g10/import.c:936 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "" -#: g10/import.c:963 +#: g10/import.c:987 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "ключ %08lX: отзывающий сертификат добавлен\n" -#: g10/import.c:1076 g10/import.c:1131 +#: g10/import.c:1100 g10/import.c:1155 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "ключ %08lX: наша копия не имеет само-подписи\n" @@ -1917,7 +1947,7 @@ msgid "Really sign? " msgstr "Действительно подписать? " -#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128 +#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128 #, fuzzy, c-format msgid "signing failed: %s\n" msgstr "ошибка подписывания: %s\n" @@ -1959,436 +1989,436 @@ msgid "moving a key signature to the correct place\n" msgstr "" -#: g10/keyedit.c:561 +#: g10/keyedit.c:564 msgid "quit this menu" msgstr "выйти из меню" -#: g10/keyedit.c:562 +#: g10/keyedit.c:565 msgid "q" msgstr "" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save" msgstr "записать" -#: g10/keyedit.c:563 +#: g10/keyedit.c:566 msgid "save and quit" msgstr "записать и выйти" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "help" msgstr "помощь" -#: g10/keyedit.c:564 +#: g10/keyedit.c:567 msgid "show this help" msgstr "показать помощь" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 msgid "fpr" msgstr "" -#: g10/keyedit.c:566 +#: g10/keyedit.c:569 #, fuzzy msgid "show fingerprint" msgstr "показать \"отпечаток пальца\"" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 #, fuzzy msgid "list" msgstr "список" -#: g10/keyedit.c:567 +#: g10/keyedit.c:570 #, fuzzy msgid "list key and user ids" msgstr "список ключей и идентификаторов пользователей" -#: g10/keyedit.c:568 +#: g10/keyedit.c:571 msgid "l" msgstr "" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "uid" msgstr "" -#: g10/keyedit.c:569 +#: g10/keyedit.c:572 msgid "select user id N" msgstr "выбрать идентификатор пользователя N" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "key" msgstr "ключ" -#: g10/keyedit.c:570 +#: g10/keyedit.c:573 msgid "select secondary key N" msgstr "выбрать дополнительный ключ N" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 msgid "check" msgstr "проверка" -#: g10/keyedit.c:571 +#: g10/keyedit.c:574 #, fuzzy msgid "list signatures" msgstr "список ключей и их подписей" -#: g10/keyedit.c:572 +#: g10/keyedit.c:575 msgid "c" msgstr "" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 msgid "sign" msgstr "подписать" -#: g10/keyedit.c:573 +#: g10/keyedit.c:576 #, fuzzy msgid "sign the key" msgstr "подписать ключ" -#: g10/keyedit.c:574 +#: g10/keyedit.c:577 msgid "s" msgstr "" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 #, fuzzy msgid "lsign" msgstr "подписать" -#: g10/keyedit.c:575 +#: g10/keyedit.c:578 #, fuzzy msgid "sign the key locally" msgstr "подписать ключ" -#: g10/keyedit.c:576 +#: g10/keyedit.c:579 msgid "debug" msgstr "отладка" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "adduid" msgstr "" -#: g10/keyedit.c:577 +#: g10/keyedit.c:580 msgid "add a user id" msgstr "добавить идентификатор пользователя" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 msgid "deluid" msgstr "" -#: g10/keyedit.c:578 +#: g10/keyedit.c:581 #, fuzzy msgid "delete user id" msgstr "удалить идентификатор пользователя" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 msgid "addkey" msgstr "" -#: g10/keyedit.c:579 +#: g10/keyedit.c:582 #, fuzzy msgid "add a secondary key" msgstr "добавить дополнительный ключ" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delkey" msgstr "" -#: g10/keyedit.c:580 +#: g10/keyedit.c:583 msgid "delete a secondary key" msgstr "удалить дополнительный ключ" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 #, fuzzy msgid "delsig" msgstr "подписать" -#: g10/keyedit.c:581 +#: g10/keyedit.c:584 #, fuzzy msgid "delete signatures" msgstr "список ключей и их подписей" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 msgid "expire" msgstr "" -#: g10/keyedit.c:582 +#: g10/keyedit.c:585 #, fuzzy msgid "change the expire date" msgstr "изменить ключевую фразу" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle" msgstr "" -#: g10/keyedit.c:583 +#: g10/keyedit.c:586 msgid "toggle between secret and public key listing" msgstr "переключить между списком секретных и открытых ключей" -#: g10/keyedit.c:585 +#: g10/keyedit.c:588 msgid "t" msgstr "" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "pref" msgstr "" -#: g10/keyedit.c:586 +#: g10/keyedit.c:589 msgid "list preferences" msgstr "" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 msgid "passwd" msgstr "" -#: g10/keyedit.c:587 +#: g10/keyedit.c:590 #, fuzzy msgid "change the passphrase" msgstr "изменить ключевую фразу" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "trust" msgstr "" -#: g10/keyedit.c:588 +#: g10/keyedit.c:591 msgid "change the ownertrust" msgstr "изменить параметры доверия" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 #, fuzzy msgid "revsig" msgstr "подписать" -#: g10/keyedit.c:589 +#: g10/keyedit.c:592 #, fuzzy msgid "revoke signatures" msgstr "проверить подпись на ключе" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 #, fuzzy msgid "revkey" msgstr "ключ" -#: g10/keyedit.c:590 +#: g10/keyedit.c:593 #, fuzzy msgid "revoke a secondary key" msgstr "удалить дополнительный ключ" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 msgid "disable" msgstr "" -#: g10/keyedit.c:591 +#: g10/keyedit.c:594 #, fuzzy msgid "disable a key" msgstr "Плохой ключ" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 msgid "enable" msgstr "" -#: g10/keyedit.c:592 +#: g10/keyedit.c:595 #, fuzzy msgid "enable a key" msgstr "Плохой ключ" -#: g10/keyedit.c:611 +#: g10/keyedit.c:614 msgid "can't do that in batchmode\n" msgstr "невозможно сделать это в пакетном режиме.\n" #. check that they match -#. FIXME: check that they both match -#: g10/keyedit.c:640 +#. fixme: check that they both match +#: g10/keyedit.c:652 #, fuzzy msgid "Secret key is available.\n" msgstr "Имеется секретный ключ.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:681 #, fuzzy msgid "Command> " msgstr "Команда> " -#: g10/keyedit.c:696 +#: g10/keyedit.c:711 #, fuzzy msgid "Need the secret key to do this.\n" msgstr "Чтобы это сделать, нужен секретный ключ.\n" -#: g10/keyedit.c:718 -msgid "Save changes? " -msgstr "Сохранить изменения? " - -#: g10/keyedit.c:721 -msgid "Quit without saving? " -msgstr "Выйти без сохранения? " - -#: g10/keyedit.c:731 -#, fuzzy, c-format -msgid "update failed: %s\n" -msgstr "обновление не удалось: %s\n" - -#: g10/keyedit.c:738 -#, fuzzy, c-format -msgid "update secret failed: %s\n" -msgstr "обновление секрета не удалось: %s\n" - -#: g10/keyedit.c:745 -msgid "Key not changed so no update needed.\n" -msgstr "Ключ не изменился, обновление не нужно.\n" - -#: g10/keyedit.c:748 g10/keyedit.c:807 -#, fuzzy, c-format -msgid "update of trustdb failed: %s\n" -msgstr "обновление базы данных доверия не удалось: %s\n" - -#: g10/keyedit.c:781 +#: g10/keyedit.c:758 msgid "Really sign all user ids? " msgstr "Действительно подписать все идентификаторы пользователя? " -#: g10/keyedit.c:782 +#: g10/keyedit.c:759 msgid "Hint: Select the user ids to sign\n" msgstr "" "Подсказка: выберите идентификаторы пользователя которые хотите подписать\n" -#: g10/keyedit.c:818 g10/keyedit.c:839 +#: g10/keyedit.c:786 g10/keyedit.c:968 +#, fuzzy, c-format +msgid "update of trustdb failed: %s\n" +msgstr "обновление базы данных доверия не удалось: %s\n" + +#: g10/keyedit.c:797 g10/keyedit.c:818 msgid "You must select at least one user id.\n" msgstr "Вы должны выбрать хотя бы один идентификатор пользователя.\n" -#: g10/keyedit.c:820 +#: g10/keyedit.c:799 msgid "You can't delete the last user id!\n" msgstr "Вы не можете удалить последний идентификатор пользователя!\n" -#: g10/keyedit.c:823 +#: g10/keyedit.c:802 #, fuzzy msgid "Really remove all selected user ids? " msgstr "Действительно удалить все выбранные идентификаторы пользователя? " -#: g10/keyedit.c:824 +#: g10/keyedit.c:803 #, fuzzy msgid "Really remove this user id? " msgstr "Действительно удалить этот идентификатор пользователя? " -#: g10/keyedit.c:860 g10/keyedit.c:882 +#: g10/keyedit.c:839 g10/keyedit.c:861 msgid "You must select at least one key.\n" msgstr "Вы должны выбрать хотя бы один ключ.\n" -#: g10/keyedit.c:864 +#: g10/keyedit.c:843 #, fuzzy msgid "Do you really want to delete the selected keys? " msgstr "Вы действительно хотите удалить выбранные ключи? " -#: g10/keyedit.c:865 +#: g10/keyedit.c:844 #, fuzzy msgid "Do you really want to delete this key? " msgstr "Вы действительно хотите удалить этот ключ? " -#: g10/keyedit.c:886 +#: g10/keyedit.c:865 #, fuzzy msgid "Do you really want to revoke the selected keys? " msgstr "Вы действительно хотите удалить выбранные ключи? " -#: g10/keyedit.c:887 +#: g10/keyedit.c:866 #, fuzzy msgid "Do you really want to revoke this key? " msgstr "Вы действительно хотите удалить этот ключ? " -#: g10/keyedit.c:949 +#: g10/keyedit.c:932 +msgid "Save changes? " +msgstr "Сохранить изменения? " + +#: g10/keyedit.c:935 +msgid "Quit without saving? " +msgstr "Выйти без сохранения? " + +#: g10/keyedit.c:946 +#, fuzzy, c-format +msgid "update failed: %s\n" +msgstr "обновление не удалось: %s\n" + +#: g10/keyedit.c:953 +#, fuzzy, c-format +msgid "update secret failed: %s\n" +msgstr "обновление секрета не удалось: %s\n" + +#: g10/keyedit.c:960 +msgid "Key not changed so no update needed.\n" +msgstr "Ключ не изменился, обновление не нужно.\n" + +#: g10/keyedit.c:975 msgid "Invalid command (try \"help\")\n" msgstr "Недопустимая команда (попробуйте \"help\")\n" -#: g10/keyedit.c:1039 +#: g10/keyedit.c:1065 #, fuzzy msgid "This key has been disabled" msgstr "Замечание: Срок действия ключа уже истек!\n" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1336 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1314 +#: g10/keyedit.c:1340 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:1318 +#: g10/keyedit.c:1344 #, fuzzy msgid "Delete this unknown signature? (y/N/q)" msgstr "сгенерировать отзывающий сертификат" -#: g10/keyedit.c:1324 +#: g10/keyedit.c:1350 #, fuzzy msgid "Really delete this self-signature? (y/N)" msgstr "сгенерировать отзывающий сертификат" -#: g10/keyedit.c:1338 +#: g10/keyedit.c:1364 #, fuzzy, c-format msgid "Deleted %d signature.\n" msgstr "%d плохих подписей\n" -#: g10/keyedit.c:1339 +#: g10/keyedit.c:1365 #, fuzzy, c-format msgid "Deleted %d signatures.\n" msgstr "%d плохих подписей\n" -#: g10/keyedit.c:1342 +#: g10/keyedit.c:1368 #, fuzzy msgid "Nothing deleted.\n" msgstr "ВНИМАНИЕ: Используется ключ к которому нет доверия!\n" -#: g10/keyedit.c:1411 +#: g10/keyedit.c:1437 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1443 #, fuzzy msgid "Please select at most one secondary key.\n" msgstr "Вы должны выбрать хотя бы один ключ.\n" -#: g10/keyedit.c:1421 +#: g10/keyedit.c:1447 msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:1423 +#: g10/keyedit.c:1449 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:1464 +#: g10/keyedit.c:1490 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1506 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:1540 +#: g10/keyedit.c:1566 #, c-format msgid "No user id with index %d\n" msgstr "Нет идентификатора пользователя с индексом %d\n" -#: g10/keyedit.c:1586 +#: g10/keyedit.c:1612 #, c-format msgid "No secondary key with index %d\n" msgstr "Нет дополнительного ключа с индексом %d\n" -#: g10/keyedit.c:1684 +#: g10/keyedit.c:1710 #, fuzzy msgid "user ID: \"" msgstr "Введите идентификатор пользователя: " -#: g10/keyedit.c:1687 +#: g10/keyedit.c:1713 #, fuzzy, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" msgstr "Нечего подписывать ключам %08lX\n" -#: g10/keyedit.c:1691 +#: g10/keyedit.c:1717 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N)" msgstr "сгенерировать отзывающий сертификат" -#: g10/keyedit.c:1771 +#: g10/keyedit.c:1797 #, fuzzy msgid "Really create the revocation certificates? (y/N)" msgstr "сгенерировать отзывающий сертификат" -#: g10/keyedit.c:1794 +#: g10/keyedit.c:1820 #, fuzzy msgid "no secret key\n" msgstr "Плохой секретный ключ" @@ -3367,6 +3397,9 @@ #, c-format msgid "No help available for `%s'" msgstr "Помощь для `%s' отсутствует." + +#~ msgid "print all message digests" +#~ msgstr "напечатать все дайджесты сообщения" #, fuzzy #~ msgid "lid %lu: user id not found in keyblock\n" diff -urN gnupg-0.9.8a/scripts/gnupg.spec gnupg-0.9.8b/scripts/gnupg.spec --- gnupg-0.9.8a/scripts/gnupg.spec Mon Jul 12 15:06:14 1999 +++ gnupg-0.9.8b/scripts/gnupg.spec Wed Jul 14 11:51:25 1999 @@ -2,7 +2,7 @@ # gnupg -- gnu privacy guard # This is a template. The dist target uses it to create the real file. # -%define version 0.9.8a +%define version 0.9.8b %define name gnupg Summary: GPL public key crypto Name: %{name} diff -urN gnupg-0.9.8a/scripts/ltconfig gnupg-0.9.8b/scripts/ltconfig --- gnupg-0.9.8a/scripts/ltconfig Tue Jun 22 23:33:42 1999 +++ gnupg-0.9.8b/scripts/ltconfig Wed Jul 14 11:23:06 1999 @@ -169,8 +169,8 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool -VERSION=1.3.2 -TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)" +VERSION=1.3.3 +TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' rm="rm -f" @@ -181,7 +181,8 @@ default_ofile=libtool can_build_shared=yes enable_shared=yes -# All known linkers require a `.a' archive for static linking. +# All known linkers require a `.a' archive for static linking (except M$VC, +# which needs '.lib'). enable_static=yes enable_fast_install=yes enable_dlopen=unknown @@ -201,6 +202,7 @@ ac_ext=c objext=o libext=a +exeext= cache_file= old_AR="$AR" @@ -576,7 +578,7 @@ # Now see if the compiler is really GCC. with_gcc=no echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6 - echo "$progname:579: checking whether we are using GNU C" >&5 + echo "$progname:581: checking whether we are using GNU C" >&5 $rm conftest.c cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then with_gcc=yes fi $rm conftest.c @@ -598,8 +600,8 @@ echo $ac_n "checking for object suffix... $ac_c" 1>&6 $rm conftest* echo 'int i = 1;' > conftest.c -echo "$progname:601: checking for object suffix" >& 5 -if { (eval echo $progname:602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then +echo "$progname:603: checking for object suffix" >& 5 +if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then # Append any warnings to the config.log. cat conftest.err 1>&5 @@ -617,6 +619,38 @@ $rm conftest* echo "$ac_t$objext" 1>&6 +echo $ac_n "checking for executable suffix... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_cv_exeext="no" + $rm conftest* + echo 'main () { return 0; }' > conftest.c + echo "$progname:629: checking for executable suffix" >& 5 + if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then + # Append any warnings to the config.log. + cat conftest.err 1>&5 + + for ac_file in conftest.*; do + case $ac_file in + *.c | *.err | *.$objext ) ;; + *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;; + esac + done + else + cat conftest.err 1>&5 + echo "$progname: failed program was:" >&5 + cat conftest.c >&5 + fi + $rm conftest* +fi +if test "X$ac_cv_exeext" = Xno; then + exeext="" +else + exeext="$ac_cv_exeext" +fi +echo "$ac_t$ac_cv_exeext" 1>&6 + echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6 pic_flag= special_shlib_compile_flags= @@ -739,8 +773,8 @@ echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pic_flag -DPIC" - echo "$progname:742: checking if $compiler PIC flag $pic_flag works" >&5 - if { (eval echo $progname:743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then + echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5 + if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then # Append any warnings to the config.log. cat conftest.err 1>&5 @@ -792,8 +826,8 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.o" -echo "$progname:795: checking if $compiler supports -c -o file.o" >&5 -if { (eval echo $progname:796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then +echo "$progname:829: checking if $compiler supports -c -o file.o" >&5 +if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -825,8 +859,8 @@ echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" - echo "$progname:828: checking if $compiler supports -c -o file.lo" >&5 -if { (eval echo $progname:829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then + echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5 +if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -877,8 +911,8 @@ echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c" - echo "$progname:880: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 - if { (eval echo $progname:881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then + echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -921,8 +955,8 @@ echo 'main(){return(0);}' > conftest.c save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $link_static_flag" -echo "$progname:924: checking if $compiler static flag $link_static_flag works" >&5 -if { (eval echo $progname:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5 +if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then echo "$ac_t$link_static_flag" 1>&6 else echo "$ac_t"none 1>&6 @@ -954,7 +988,7 @@ if test "$with_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 - echo "$progname:957: checking for ld used by GCC" >&5 + echo "$progname:991: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -978,10 +1012,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld... $ac_c" 1>&6 - echo "$progname:981: checking for GNU ld" >&5 + echo "$progname:1015: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 - echo "$progname:984: checking for non-GNU ld" >&5 + echo "$progname:1018: checking for non-GNU ld" >&5 fi if test -z "$LD"; then @@ -1047,7 +1081,7 @@ hardcode_shlibpath_var=unsupported runpath_var= always_export_symbols=no -export_symbols_cmds='$NM $libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' +export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' # include_expsyms should be a list of space-separated symbols to be *always* # included in the symbol list include_expsyms= @@ -1130,10 +1164,9 @@ # Extract the symbol export list from an `--export-all' def file, # then regenerate the def file from the symbol export list, so that # the compiled dll only exports the symbol export list. - export_symbols_cmds='rm -f $objdir/$soname-ltdll.c~ - sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ - (cd $objdir && $CC -c $soname-ltdll.c)~ - $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs~ + export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ + test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ + $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs $convenience~ sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols' archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~ @@ -1142,13 +1175,15 @@ echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def; _lt_hint=`expr 1 + \$_lt_hint`; done~ + test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ + test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts' - old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' + old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' ;; netbsd*) @@ -1554,11 +1589,11 @@ main(){nm_test_var='a';nm_test_func();return(0);} EOF - echo "$progname:1557: checking if global_symbol_pipe works" >&5 - if { (eval echo $progname:1558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then + echo "$progname:1592: checking if global_symbol_pipe works" >&5 + if { (eval echo $progname:1593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then # Now try to grab the symbols. nlist=conftest.nm - if { echo "$progname:1561: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + if { echo "$progname:1596: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -1610,7 +1645,7 @@ save_CFLAGS="$CFLAGS" LIBS="conftstm.$objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo $progname:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes else echo "$progname: failed program was:" >&5 @@ -1756,7 +1791,7 @@ soname_spec='${libname}.so' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH - deplibs_check_method='file_magic ELF 32-bit LSB shared object' + deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' file_magic_cmd=/usr/bin/file file_magic_test_file=/shlib/libc.so sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -1768,6 +1803,8 @@ cygwin* | mingw*) version_type=windows + need_version=no + need_lib_prefix=no if test "$with_gcc" = yes; then library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a' else @@ -1776,7 +1813,6 @@ dynamic_linker='Win32 ld.exe' deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' file_magic_cmd='${OBJDUMP} -f' - need_lib_prefix=no # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH lt_cv_dlopen="LoadLibrary" @@ -1807,11 +1843,22 @@ esac finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH + case "$host_os" in + freebsd2* | freebsd3.[01]*) + shlibpath_overrides_runpath=yes + ;; + *) # from 3.2 on + shlibpath_overrides_runpath=no + ;; + esac ;; gnu*) version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}.so' + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' + soname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2120,7 +2167,7 @@ if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then lt_cv_dlopen=no lt_cv_dlopen_libs= echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "$progname:2123: checking for dlopen in -ldl" >&5 +echo "$progname:2170: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2128,7 +2175,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2157,12 +2204,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "$progname:2160: checking for dlopen" >&5 +echo "$progname:2207: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2184,7 +2231,7 @@ ; return 0; } EOF -if { (eval echo $progname:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -2201,7 +2248,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "$progname:2204: checking for dld_link in -ldld" >&5 +echo "$progname:2251: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2209,7 +2256,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2238,12 +2285,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "$progname:2241: checking for shl_load" >&5 +echo "$progname:2288: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2265,7 +2312,7 @@ ; return 0; } EOF -if { (eval echo $progname:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -2283,7 +2330,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "$progname:2286: checking for shl_load in -ldld" >&5 +echo "$progname:2333: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2291,7 +2338,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2345,17 +2392,17 @@ for ac_hdr in dlfcn.h; do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "$progname:2348: checking for $ac_hdr" >&5 +echo "$progname:2395: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int fnord = 0; EOF ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo $progname:2358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo $progname:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2383,7 +2430,7 @@ LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "$progname:2386: checking whether a program can dlopen itself" >&5 +echo "$progname:2433: checking whether a program can dlopen itself" >&5 if test "${lt_cv_dlopen_self+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2391,7 +2438,7 @@ lt_cv_dlopen_self=cross else cat > conftest.c < @@ -2434,10 +2481,10 @@ fnord() { int i=42;} main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); - if(ptr1 || ptr2) exit(0); } exit(1); } + if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } EOF -if { (eval echo $progname:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo $progname:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self=yes else @@ -2456,7 +2503,7 @@ if test "$lt_cv_dlopen_self" = yes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "$progname:2459: checking whether a statically linked program can dlopen itself" >&5 +echo "$progname:2506: checking whether a statically linked program can dlopen itself" >&5 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2464,7 +2511,7 @@ lt_cv_dlopen_self_static=cross else cat > conftest.c < @@ -2507,10 +2554,10 @@ fnord() { int i=42;} main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); - if(ptr1 || ptr2) exit(0); } exit(1); } + if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } EOF -if { (eval echo $progname:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo $progname:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self_static=yes else @@ -2729,6 +2776,9 @@ # Old archive suffix (normally "a"). libext="$libext" +# Executable file suffix (normally ""). +exeext="$exeext" + # Additional compiler flags for building library objects. pic_flag=$pic_flag @@ -2897,7 +2947,7 @@ esac # Append the ltmain.sh script. - cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1) + sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1) chmod +x "$ofile" ;; diff -urN gnupg-0.9.8a/scripts/ltmain.sh gnupg-0.9.8b/scripts/ltmain.sh --- gnupg-0.9.8a/scripts/ltmain.sh Tue Jun 22 23:33:42 1999 +++ gnupg-0.9.8b/scripts/ltmain.sh Wed Jul 14 11:23:07 1999 @@ -54,8 +54,8 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.3.2 -TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)" +VERSION=1.3.3 +TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= help="Try \`$progname --help' for more information." @@ -69,7 +69,7 @@ Xsed='sed -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' SP2NL='tr \040 \012' -NL2SP='tr \012 \040' +NL2SP='tr \015\012 \040\040' # NLS nuisances. # Only set LANG and LC_ALL to C if already set. @@ -638,6 +638,12 @@ # #undef WIN32_LEAN_AND_MEAN # #include # +# #ifndef __CYGWIN__ +# # ifdef __CYGWIN32__ +# # define __CYGWIN__ __CYGWIN32__ +# # endif +# #endif +# # #ifdef __cplusplus # extern "C" { # #endif @@ -646,8 +652,10 @@ # } # #endif # +# #ifdef __CYGWIN__ # #include # DECLARE_CYGWIN_DLL( DllMain ); +# #endif # HINSTANCE __hDllInstance_base; # # BOOL APIENTRY @@ -893,6 +901,14 @@ fi case "$arg" in *.la | *.lo) ;; # We handle these cases below. + force) + if test "$dlself" = no; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; self) if test "$prev" = dlprefiles; then dlself=yes @@ -1222,7 +1238,7 @@ fi if test -n "$dependency_libs"; then - # Extract -R from dependency_libs + # Extract -R and -L from dependency_libs temp_deplibs= for deplib in $dependency_libs; do case "$deplib" in @@ -1234,7 +1250,13 @@ -L*) case "$compile_command $temp_deplibs " in *" $deplib "*) ;; *) temp_deplibs="$temp_deplibs $deplib";; - esac;; + esac + temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'` + case " $lib_search_path " in + *" $temp_dir "*) ;; + *) lib_search_path="$lib_search_path $temp_dir";; + esac + ;; *) temp_deplibs="$temp_deplibs $deplib";; esac done @@ -2037,51 +2059,6 @@ # Use standard objects if they are pic test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - if test -n "$whole_archive_flag_spec"; then - if test -n "$convenience"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi - else - gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "mkdir $gentop" - $run mkdir "$gentop" - status=$? - if test $status -ne 0 && test ! -d "$gentop"; then - exit $status - fi - generated="$generated $gentop" - - for xlib in $convenience; do - # Extract the objects. - case "$xlib" in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" - status=$? - if test $status -ne 0 && test ! -d "$xdir"; then - exit $status - fi - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - - libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` - done - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linkopts="$linkopts $flag" - fi - # Prepare the list of exported symbols if test -z "$export_symbols"; then if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then @@ -2109,6 +2086,51 @@ $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' fi + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + else + gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "mkdir $gentop" + $run mkdir "$gentop" + status=$? + if test $status -ne 0 && test ! -d "$gentop"; then + exit $status + fi + generated="$generated $gentop" + + for xlib in $convenience; do + # Extract the objects. + case "$xlib" in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "mkdir $xdir" + $run mkdir "$xdir" + status=$? + if test $status -ne 0 && test ! -d "$xdir"; then + exit $status + fi + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + + libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + done + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + linkopts="$linkopts $flag" + fi + # Do each of the archive commands. if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" @@ -2187,8 +2209,58 @@ # Delete the old objects. $run $rm $obj $libobj + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of + # -Wl from whole_archive_flag_spec + wl= + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" + else + gentop="$output_objdir/${obj}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "mkdir $gentop" + $run mkdir "$gentop" + status=$? + if test $status -ne 0 && test ! -d "$gentop"; then + exit $status + fi + generated="$generated $gentop" + + for xlib in $convenience; do + # Extract the objects. + case "$xlib" in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "mkdir $xdir" + $run mkdir "$xdir" + status=$? + if test $status -ne 0 && test ! -d "$xdir"; then + exit $status + fi + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + + reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + done + fi + fi + # Create the old-style object. - reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` + reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" output="$obj" eval cmds=\"$reload_cmds\" @@ -2201,9 +2273,21 @@ IFS="$save_ifs" # Exit if we aren't doing a library object file. - test -z "$libobj" && exit 0 + if test -z "$libobj"; then + if test -n "$gentop"; then + $show "${rm}r $gentop" + $run ${rm}r $gentop + fi + + exit 0 + fi if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then + $show "${rm}r $gentop" + $run ${rm}r $gentop + fi + # Create an invalid libtool object if no PIC, so that we don't # accidentally link it into a program. $show "echo timestamp > $libobj" @@ -2213,7 +2297,7 @@ if test -n "$pic_flag"; then # Only do commands if we really have different PIC objects. - reload_objs="$libobjs" + reload_objs="$libobjs $reload_conv_objs" output="$libobj" eval cmds=\"$reload_cmds\" IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' @@ -2231,6 +2315,11 @@ $run $LN_S $obj $libobj || exit $? fi + if test -n "$gentop"; then + $show "${rm}r $gentop" + $run ${rm}r $gentop + fi + exit 0 ;; @@ -2363,7 +2452,7 @@ fi dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" = yes; then + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$NM" && test -n "$global_symbol_pipe"; then dlsyms="${outputname}S.c" else @@ -2776,7 +2865,7 @@ fi" else echo >> $output "\ - program='$outputname' + program='$outputname$exeext' progdir=\"\$thisdir/$objdir\" " fi @@ -3201,13 +3290,11 @@ # Install the shared library and build the symlinks. $show "$install_prog $dir/$realname $destdir/$realname" $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $? - test "X$dlname" = "X$realname" && dlname= if test $# -gt 0; then # Delete the old symlinks, and create new ones. for linkname do - test "X$dlname" = "X$linkname" && dlname= if test "$linkname" != "$realname"; then $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" @@ -3215,12 +3302,6 @@ done fi - if test -n "$dlname"; then - # Install the dynamically-loadable library. - $show "$install_prog $dir/$dlname $destdir/$dlname" - $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $? - fi - # Do each command in the postinstall commands. lib="$destdir/$realname" eval cmds=\"$postinstall_cmds\" @@ -3652,9 +3733,7 @@ # Delete the libtool libraries and symlinks. for n in $library_names; do rmfiles="$rmfiles $dir/$n" - test "X$n" = "X$dlname" && dlname= done - test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname" test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library" $show "$rm $rmfiles" diff -urN gnupg-0.9.8a/tools/lspgpot gnupg-0.9.8b/tools/lspgpot --- gnupg-0.9.8a/tools/lspgpot Thu Jul 8 16:15:51 1999 +++ gnupg-0.9.8b/tools/lspgpot Wed Jul 14 09:29:31 1999 @@ -1,6 +1,6 @@ #!/bin/sh # lspgpot - script to extract the ownertrust values -# from a PGP keyrings and list them in GnuPG ownertrust format. +# from PGP keyrings and list them in GnuPG ownertrust format. ../g10/gpg --dry-run --with-fingerprint --with-colons $* | awk ' BEGIN { FS=":" diff -urN gnupg-0.9.8a/util/strgutil.c gnupg-0.9.8b/util/strgutil.c --- gnupg-0.9.8a/util/strgutil.c Wed Jun 30 10:19:20 1999 +++ gnupg-0.9.8b/util/strgutil.c Wed Jul 14 09:29:31 1999 @@ -1,4 +1,4 @@ -/* strgutil.c - miscellaneous utilities +/* strgutil.c - string utilities * Copyright (C) 1998 Free Software Foundation, Inc. * * This file is part of GnuPG. -----BEGIN PGP SIGNATURE----- Version: GnuPG v0.9.8a (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE3jF5UaLeriVdUjc0RAsweAJ0ROXMVpPek87Mi71K1gLJimKGX2ACeP66T hkztKRcGnUVFHBucJjq6ieA= =JkKS -----END PGP SIGNATURE-----