diff options
| author | Werner Koch <[email protected]> | 1999-09-02 14:50:38 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 1999-09-02 14:50:38 +0000 |
| commit | 175c9d84bc92d19739cb4613ab698c1cd5c2b1b2 (patch) | |
| tree | 0b0a778cc2bb04a930ee4d437d6893d5b870d076 | |
| parent | See ChangeLog: Wed Sep 1 15:30:44 CEST 1999 Werner Koch (diff) | |
| download | gnupg-175c9d84bc92d19739cb4613ab698c1cd5c2b1b2.tar.gz gnupg-175c9d84bc92d19739cb4613ab698c1cd5c2b1b2.zip | |
See ChangeLog: Thu Sep 2 16:40:55 CEST 1999 Werner Koch
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | README | 35 | ||||
| -rw-r--r-- | TODO | 15 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | g10/ChangeLog | 9 | ||||
| -rw-r--r-- | g10/import.c | 52 | ||||
| -rw-r--r-- | po/de.po | 241 | ||||
| -rw-r--r-- | po/es_ES.po | 217 | ||||
| -rw-r--r-- | po/fr.po | 223 | ||||
| -rw-r--r-- | po/it.po | 223 | ||||
| -rw-r--r-- | po/pl.po | 217 | ||||
| -rw-r--r-- | po/pt_BR.po | 223 | ||||
| -rw-r--r-- | po/ru.po | 211 | ||||
| -rw-r--r-- | scripts/ChangeLog | 6 | ||||
| -rwxr-xr-x | scripts/mkdiff | 68 | ||||
| -rwxr-xr-x | scripts/mksnapshot | 26 | ||||
| -rwxr-xr-x | scripts/mkwebpage | 8 |
18 files changed, 970 insertions, 819 deletions
@@ -1,17 +1,19 @@ -Tue Aug 31 17:20:44 CEST 1999 Werner Koch <[email protected]> +Thu Sep 2 16:40:55 CEST 1999 Werner Koch <[email protected]> + + + * VERSION: Set to 0.9.11. +Tue Aug 31 17:20:44 CEST 1999 Werner Koch <[email protected]> * configure.in: Minor changes to the OS/2 and Mingw32 system labels. Add a printable name for Hurd. Mon Aug 30 20:38:33 CEST 1999 Werner Koch <[email protected]> - * configure.in: Some support for DJGPP (Mark Elbrecht) Wed Aug 4 10:34:46 CEST 1999 Werner Koch <[email protected]> - * VERSION: Set to 0.9.10. Mon Jul 26 09:34:46 CEST 1999 Werner Koch <[email protected]> @@ -1,11 +1,12 @@ -Noteworthy changes in version 0.9.xx +Noteworthy changes in version 0.9.11 ------------------------------------ * UTF-8 strings are now correctly printed (if --charset is set correctly). - Output of --with-colons is remains C-style escaped UTF8. + Output of --with-colons remains C-style escaped UTF-8. * Workaround for a problem with PGP 5 detached signature in textmode. + * Fixed a problem when importing new subkeys (duplicated signatures). Noteworthy changes in version 0.9.10 ------------------------------------ @@ -2,7 +2,12 @@ GnuPG - The GNU Privacy Guard ------------------------------- - Version 0.9.10 + Version 0.9.11 + + GnuPG is a tool for secure communication and data storage. It + can be used to encrypt data and to create digital signatures. + It includes an advanced key management facility and is compliant + to the proposed OpenPGP Internet standard as described in RFC2440. GnuPG is now in Beta test and you should report all bugs to the mailing list (see below). The 0.9.x versions are released mainly @@ -15,9 +20,6 @@ See the file COPYING for copyright and warranty information. - GnuPG is in compliance with RFC2440 (OpenPGP), see doc/OpenPGP for - details. - Because GnuPG does not use use any patented algorithm it cannot be compatible with PGP2 versions. PGP 2.x uses only IDEA (which is patented worldwide) and RSA (which is patented in the United States @@ -28,7 +30,7 @@ signatures it is deprecated (Please note that the GnuPG implementation of ElGamal signatures is *not* insecure). Symmetric algorithms are: 3DES, Blowfish, CAST5 and Twofish (GnuPG does not - yet create Twofish encrypted messages because there no agreement + yet create Twofish encrypted messages because there is no agreement in the OpenPGP WG on how to use it together with a MDC algorithm) Digest algorithms available are MD5, RIPEMD160, SHA1, and TIGER/192. @@ -133,12 +135,16 @@ published via the announcement list and probably via Usenet. - Introduction ------------ - This is a brief overview how to use GnuPG - it is strongly suggested - that you read the manual^H^H^H more information about the use of + A draft version of the manual is included in the subdirectory doc + and some HOWTO documents are available online; dor a listing see: + + http://www.gnupg.org/docs.html#howtos + + Here is a brief overview on how to use GnuPG - it is strongly suggested + that you read the manual and other information about the use of cryptography. GnuPG is only a tool, secure results require that YOU KNOW WHAT YOU ARE DOING. @@ -510,19 +516,18 @@ Please direct bug reports to <[email protected]> or post them direct to the mailing list <[email protected]>. Please direct questions about GnuPG to the users mailing list or - one of the pgp newsgroups and give me more time to improve + one of the pgp newsgroups to give me more time to improve GnuPG. Commercial support for GnuPG is also available; please see the GNU service directory or search other resources. Have fun and remember: Echelon is looking at you kid. -- -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- -Version: GnuPG v0.9.9 (GNU/Linux) +Version: GnuPG v0.9.10 (GNU/Linux) Comment: For info see http://www.gnupg.org -iQB1AwUBN6figR0Z9MEMmFelAQHydwL+LuKC3W6kRkm0clwab3v8I7zlX0bagxzA -RStlHXdO6ln1Mo3s3nBuCfrS6LogiUgNRFhNJQ5+rjrTydz00nzcorbyTalqvMlq -Gnsu9Pd/pTPzvk6kP79yDdoBxfaQGcgw -=W8uz +iQB1AwUBN86L1h0Z9MEMmFelAQFQlQL/S5jDPpDFI3wDG/soA/qMTR79YX1IXDz9 +Izin49GkPHElRCoNbT3r3+T6V+lNtrZpah6JBR30//yo1OGUyoJ88yn3KC0JdtUq +NgJzX3yYUXD+Ojer+WHEL+O8D8qkZrAX +=wiUu -----END PGP SIGNATURE----- @@ -8,15 +8,20 @@ Scheduled for 1.1 * Allow a replacement for the progress functions in ./cipher - * add an option to use an OpenPGP packet as input (and don't build a literal - data packet) - * print a warning when a revoked/expired _secret_ key is used. * --disable-asm should still assemble _udiv_qrnnd when needed * Skip RO keyrings when importing a key. + * Use the newest encryption key if only the main key has been given. + + * replace the keyserver stuff either by a call to a specialized + utility and SOCKSify this utility. + + * Check the beginning of file to detect already compressed files (gzip, + bzip2, xdelta and some picture formats) + Nice to have ------------ @@ -24,8 +29,6 @@ Nice to have * use DEL and ^H for erasing the previous character (util/ttyio.c). or better readline. * Print a warning if the directory mode is wrong. - * replace the keyserver stuff either by a call to a specialized - utility and SOCKSify this utility. * Do a real fix for bug #7 or document that it is a PGP 5 error. * preferences of hash algorithms are not yet used. * Replace the SIGUSR1 stuff by semaphores to avoid loss of a signal. @@ -43,8 +46,6 @@ Nice to have 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 - * Check the beginning of file to detect already compressed files (gzip, - bzip2, xdelta and some picture formats) * Display more validity information about the user IDs at certain places. We need a more general function to extract such kind of info from the trustdb. @@ -1 +1 @@ -0.9.10a +0.9.11 diff --git a/g10/ChangeLog b/g10/ChangeLog index fe5c58312..10f889312 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,12 +1,17 @@ -Wed Sep 1 15:30:44 CEST 1999 Werner Koch <[email protected]> +Thu Sep 2 16:40:55 CEST 1999 Werner Koch <[email protected]> + + * import.c (merge_blocks): First add new subkeys, then merge subkey + certificates. + (merge_sigs): Don't merge subkey signatures here. + +Wed Sep 1 15:30:44 CEST 1999 Werner Koch <[email protected]> * keygen.c (ask_expire_interval): Fixed bug related to cpr_xx (tnx Francis J. Lacoste). Tue Aug 31 17:20:44 CEST 1999 Werner Koch <[email protected]> - * plaintext.c (do_hash): Hash CR,LF for a single CR. (ask_for_detached_datafile): Changed arguments to be closer to those of hash_datafiles and cleanup the code a bit. diff --git a/g10/import.c b/g10/import.c index 7cad61a6d..85a45582e 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1052,30 +1052,6 @@ merge_blocks( const char *fname, KBNODE keyblock_orig, KBNODE keyblock, } } - /* merge subkey certificates */ - for(onode=keyblock_orig->next; onode; onode=onode->next ) { - if( !(onode->flag & 1) - && ( onode->pkt->pkttype == PKT_PUBLIC_SUBKEY - || onode->pkt->pkttype == PKT_SECRET_SUBKEY) ) { - /* find the subkey in the imported keyblock */ - for(node=keyblock->next; node; node=node->next ) { - if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY - && !cmp_public_keys( onode->pkt->pkt.public_key, - node->pkt->pkt.public_key ) ) - break; - else if( node->pkt->pkttype == PKT_SECRET_SUBKEY - && !cmp_secret_keys( onode->pkt->pkt.secret_key, - node->pkt->pkt.secret_key ) ) - break; - } - if( node ) { /* found: merge */ - rc = merge_keysigs( onode, node, n_sigs, fname, keyid ); - if( rc ) - return rc; - } - } - } - /* add new subkeys */ for(node=keyblock->next; node; node=node->next ) { onode = NULL; @@ -1109,6 +1085,31 @@ merge_blocks( const char *fname, KBNODE keyblock_orig, KBNODE keyblock, } } + /* merge subkey certificates */ + for(onode=keyblock_orig->next; onode; onode=onode->next ) { + if( !(onode->flag & 1) + && ( onode->pkt->pkttype == PKT_PUBLIC_SUBKEY + || onode->pkt->pkttype == PKT_SECRET_SUBKEY) ) { + /* find the subkey in the imported keyblock */ + for(node=keyblock->next; node; node=node->next ) { + if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY + && !cmp_public_keys( onode->pkt->pkt.public_key, + node->pkt->pkt.public_key ) ) + break; + else if( node->pkt->pkttype == PKT_SECRET_SUBKEY + && !cmp_secret_keys( onode->pkt->pkt.secret_key, + node->pkt->pkt.secret_key ) ) + break; + } + if( node ) { /* found: merge */ + rc = merge_keysigs( onode, node, n_sigs, fname, keyid ); + if( rc ) + return rc; + } + } + } + + return 0; } @@ -1188,6 +1189,9 @@ merge_sigs( KBNODE dst, KBNODE src, int *n_sigs, for(n=src->next; n && n->pkt->pkttype != PKT_USER_ID; n = n->next ) { if( n->pkt->pkttype != PKT_SIGNATURE ) continue; + if( n->pkt->pkt.signature->sig_class == 0x18 + || n->pkt->pkt.signature->sig_class == 0x28 ) + continue; /* skip signatures which are only valid on subkeys */ found = 0; for(n2=dst->next; n2 && n2->pkt->pkttype != PKT_USER_ID; n2 = n2->next){ if( n2->pkt->pkttype == PKT_SIGNATURE @@ -1,9 +1,9 @@ # GnuPG german translation # Copyright (C) 1998 Free Software Foundation, Inc. # Walter Koch <[email protected]>, 1998. -msgid "" +msgid "" msgstr "" -"POT-Creation-Date: 1999-08-31 21:31+0200\n" +"POT-Creation-Date: 1999-09-02 14:44+0200\n" "PO-Revision-Date: 1999-08-31 21:36+0200\n" "Last-Translator: Walter Koch <[email protected]>\n" "Language-Team: German <[email protected]>\n" @@ -26,27 +26,27 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "" "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n" -#: util/miscutil.c:254 util/miscutil.c:283 +#: util/miscutil.c:277 util/miscutil.c:306 msgid "yes" msgstr "ja" -#: util/miscutil.c:255 util/miscutil.c:286 +#: util/miscutil.c:278 util/miscutil.c:309 msgid "yY" msgstr "jJyY" -#: util/miscutil.c:256 util/miscutil.c:284 +#: util/miscutil.c:279 util/miscutil.c:307 msgid "no" msgstr "nein" -#: util/miscutil.c:257 util/miscutil.c:287 +#: util/miscutil.c:280 util/miscutil.c:310 msgid "nN" msgstr "nN" -#: g10/keyedit.c:564 util/miscutil.c:285 +#: g10/keyedit.c:564 util/miscutil.c:308 msgid "quit" msgstr "quit" -#: util/miscutil.c:288 +#: util/miscutil.c:311 msgid "qQ" msgstr "qQ" @@ -615,7 +615,7 @@ msgstr "" #: g10/g10.c:370 msgid "Please report bugs to <[email protected]>.\n" -msgstr +msgstr "" "Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n" "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n" @@ -1329,11 +1329,11 @@ msgstr "Der Schl�ssel verf�llt nie.\n" msgid "Key expires at %s\n" msgstr "Der Schl�ssel verf�llt am %s\n" -#: g10/keygen.c:564 +#: g10/keygen.c:563 msgid "Is this correct (y/n)? " msgstr "Ist dies richtig? (j/n) " -#: g10/keygen.c:607 +#: g10/keygen.c:606 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1349,44 +1349,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) <[email protected]>\"\n" "\n" -#: g10/keygen.c:618 +#: g10/keygen.c:617 msgid "Real name: " msgstr "Ihr Name (\"Vorname Nachname\"): " -#: g10/keygen.c:622 +#: g10/keygen.c:621 msgid "Invalid character in name\n" msgstr "Ung�ltiges Zeichen im Namen\n" -#: g10/keygen.c:624 +#: g10/keygen.c:623 msgid "Name may not start with a digit\n" msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n" -#: g10/keygen.c:626 +#: g10/keygen.c:625 msgid "Name must be at least 5 characters long\n" msgstr "Der Name mu� min. 5 Zeichen lang sein.\n" -#: g10/keygen.c:634 +#: g10/keygen.c:633 msgid "Email address: " msgstr "E-Mail-Adresse: " -#: g10/keygen.c:645 +#: g10/keygen.c:644 msgid "Not a valid email address\n" msgstr "Diese E-Mail-Adresse ist ung�ltig\n" -#: g10/keygen.c:653 +#: g10/keygen.c:652 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:659 +#: g10/keygen.c:658 msgid "Invalid character in comment\n" msgstr "Ung�ltiges Zeichen im Kommentar.\n" -#: g10/keygen.c:681 +#: g10/keygen.c:680 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Sie benutzen den Zeichensatz `%s'\n" -#: g10/keygen.c:687 +#: g10/keygen.c:686 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1397,15 +1397,15 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:690 +#: g10/keygen.c:689 msgid "NnCcEeOoQq" msgstr "NnKkEeFfBb" -#: g10/keygen.c:700 +#: g10/keygen.c:699 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "�ndern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? " -#: g10/keygen.c:752 +#: g10/keygen.c:751 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1413,11 +1413,11 @@ msgstr "" "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n" "\n" -#: g10/keyedit.c:456 g10/keygen.c:760 +#: g10/keyedit.c:456 g10/keygen.c:759 msgid "passphrase not correctly repeated; try again.\n" msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n" -#: g10/keygen.c:766 +#: g10/keygen.c:765 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -1430,7 +1430,7 @@ msgstr "" "aufrufen.\n" "\n" -#: g10/keygen.c:787 +#: g10/keygen.c:786 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -1441,34 +1441,34 @@ msgstr "" "unterst�tzen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n" "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n" -#: g10/keygen.c:857 +#: g10/keygen.c:856 msgid "Key generation can only be used in interactive mode\n" -msgstr +msgstr "" "Die Schl�sselerzeugung kann nur im interaktiven Modus benutzt werden.\n" -#: g10/keygen.c:865 +#: g10/keygen.c:864 msgid "DSA keypair will have 1024 bits.\n" msgstr "Der DSA Schl�ssel wird 1024 Bits haben.\n" -#: g10/keygen.c:871 +#: g10/keygen.c:870 msgid "Key generation canceled.\n" msgstr "Schl�sselerzeugung abgebrochen.\n" -#: g10/keygen.c:881 +#: g10/keygen.c:880 #, c-format msgid "writing public certificate to `%s'\n" msgstr "schreiben des �ffentlichen Zertifikats nach '%s'\n" -#: g10/keygen.c:882 +#: g10/keygen.c:881 #, c-format msgid "writing secret certificate to `%s'\n" msgstr "schreiben des geheimen Zertifikats nach '%s'\n" -#: g10/keygen.c:959 +#: g10/keygen.c:958 msgid "public and secret key created and signed.\n" msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n" -#: g10/keygen.c:961 +#: g10/keygen.c:960 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1477,12 +1477,12 @@ msgstr "" "werden kann. Sie k�nnen aber mit dem Befehl \"--edit-key\" einen\n" "Zweitschl�ssel f�r diesem Zweck erzeugen.\n" -#: g10/keygen.c:975 g10/keygen.c:1074 +#: g10/keygen.c:974 g10/keygen.c:1073 #, c-format msgid "Key generation failed: %s\n" msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n" -#: g10/keygen.c:1019 g10/sig-check.c:312 g10/sign.c:105 +#: g10/keygen.c:1018 g10/sig-check.c:312 g10/sign.c:105 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1490,7 +1490,7 @@ msgstr "" "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren " "stimmen nicht �berein)\n" -#: g10/keygen.c:1021 g10/sig-check.c:314 g10/sign.c:107 +#: g10/keygen.c:1020 g10/sig-check.c:314 g10/sign.c:107 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1498,7 +1498,7 @@ msgstr "" "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder " "Uhren stimmen nicht �berein)\n" -#: g10/keygen.c:1052 +#: g10/keygen.c:1051 msgid "Really create? " msgstr "Wirklich erzeugen? " @@ -1560,11 +1560,13 @@ msgid "RSA key cannot be used in this version\n" msgstr "RSA-Schl�ssel k�nnen in dieser Version nicht verwendet werden\n" #: g10/getkey.c:1291 g10/getkey.c:1330 -msgid "No key for user-id\n" +#, fuzzy +msgid "No key for user ID\n" msgstr "Kein Schl�ssel f�r User-ID\n" #: g10/getkey.c:1369 g10/getkey.c:1409 -msgid "No user-id for key\n" +#, fuzzy +msgid "No user ID for key\n" msgstr "Keine User-ID f�r Schl�ssel\n" #: g10/getkey.c:1565 g10/getkey.c:1621 @@ -1649,13 +1651,13 @@ msgid " secret keys unchanged: %lu\n" msgstr " unver�nderte geh.Schl.: %lu\n" #: g10/import.c:362 g10/import.c:554 -#, c-format -msgid "key %08lX: no user id\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID\n" msgstr "Schl�ssel %08lX: Keine User-ID\n" #: g10/import.c:376 -#, c-format -msgid "key %08lX: no valid user ids\n" +#, fuzzy, c-format +msgid "key %08lX: no valid user IDs\n" msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n" #: g10/import.c:378 @@ -1710,13 +1712,13 @@ msgstr "" "Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n" #: g10/import.c:469 -#, c-format -msgid "key %08lX: 1 new user-id\n" +#, fuzzy, c-format +msgid "key %08lX: 1 new user ID\n" msgstr "Schl�ssel %08lX: 1 neue User-ID\n" #: g10/import.c:472 -#, c-format -msgid "key %08lX: %d new user-ids\n" +#, fuzzy, c-format +msgid "key %08lX: %d new user IDs\n" msgstr "Schl�ssel %08lX: %d neue User-IDs\n" #: g10/import.c:475 @@ -1778,8 +1780,8 @@ msgid "key %08lX: revocation certificate imported\n" msgstr "Schl�ssel %08lX: Widerrufzertifikat importiert\n" #: g10/import.c:711 -#, c-format -msgid "key %08lX: no user-id for signature\n" +#, fuzzy, 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:718 g10/import.c:742 @@ -1803,13 +1805,13 @@ msgid "key %08lX: invalid subkey binding\n" msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n" #: g10/import.c:769 -#, c-format -msgid "key %08lX: accepted non self-signed user-id '" +#, fuzzy, c-format +msgid "key %08lX: accepted non self-signed user ID '" msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID �bernommen'" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped user-id '" +#, fuzzy, c-format +msgid "key %08lX: skipped user ID '" msgstr "Schl�ssel %08lX: User-ID �bergangen '" #: g10/import.c:821 @@ -1846,7 +1848,7 @@ msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n" msgid "key %08lX: revocation certificate added\n" msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n" -#: g10/import.c:1127 g10/import.c:1182 +#: g10/import.c:1128 g10/import.c:1183 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n" @@ -1892,12 +1894,13 @@ msgid "%d signatures not checked due to errors\n" msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n" #: g10/keyedit.c:231 -msgid "1 user id without valid self-signature detected\n" +#, fuzzy +msgid "1 user ID without valid self-signature detected\n" msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n" #: g10/keyedit.c:233 -#, c-format -msgid "%d user ids without valid self-signatures detected\n" +#, fuzzy, c-format +msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n" #. Fixme: see whether there is a revocation in which @@ -2011,7 +2014,8 @@ msgid "list" msgstr "Liste der Schl�ssel" #: g10/keyedit.c:570 -msgid "list key and user ids" +#, fuzzy +msgid "list key and user IDs" msgstr "Schl�ssel und User-ID auflisten" #: g10/keyedit.c:571 @@ -2023,7 +2027,8 @@ msgid "uid" msgstr "uid" #: g10/keyedit.c:572 -msgid "select user id N" +#, fuzzy +msgid "select user ID N" msgstr "User-ID N ausw�hlen" #: g10/keyedit.c:573 @@ -2075,7 +2080,8 @@ msgid "adduid" msgstr "adduid" #: g10/keyedit.c:580 -msgid "add a user id" +#, fuzzy +msgid "add a user ID" msgstr "Eine User-ID hinzuf�gen" #: g10/keyedit.c:581 @@ -2083,7 +2089,8 @@ msgid "deluid" msgstr "deluid" #: g10/keyedit.c:581 -msgid "delete user id" +#, fuzzy +msgid "delete user ID" msgstr "User-ID entfernen" #: g10/keyedit.c:582 @@ -2205,11 +2212,13 @@ msgid "Need the secret key to do this.\n" msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n" #: g10/keyedit.c:758 -msgid "Really sign all user ids? " +#, fuzzy +msgid "Really sign all user IDs? " msgstr "Wirklich alle User-IDs beglaubigen? " #: g10/keyedit.c:759 -msgid "Hint: Select the user ids to sign\n" +#, fuzzy +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:786 g10/keyedit.c:968 @@ -2218,19 +2227,23 @@ 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" +#, fuzzy +msgid "You must select at least one user ID.\n" msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n" #: g10/keyedit.c:799 -msgid "You can't delete the last user id!\n" +#, fuzzy +msgid "You can't delete the last user ID!\n" msgstr "Die letzte User-ID kann nicht gel�scht werden!\n" #: g10/keyedit.c:802 -msgid "Really remove all selected user ids? " +#, fuzzy +msgid "Really remove all selected user IDs? " msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? " #: g10/keyedit.c:803 -msgid "Really remove this user id? " +#, fuzzy +msgid "Really remove this user ID? " msgstr "Diese User-ID wirklich entfernen? " #: g10/keyedit.c:839 g10/keyedit.c:861 @@ -2338,8 +2351,8 @@ msgid "No corresponding signature in secret ring\n" msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n" #: g10/keyedit.c:1566 -#, c-format -msgid "No user id with index %d\n" +#, fuzzy, c-format +msgid "No user ID with index %d\n" msgstr "Keine User-ID mit Index %d\n" #: g10/keyedit.c:1612 @@ -2465,11 +2478,11 @@ msgstr " alias \"" msgid "Can't check signature: %s\n" msgstr "Unterschrift kann nicht gepr�ft werden: %s\n" -#: g10/mainproc.c:1209 +#: g10/mainproc.c:1212 msgid "old style (PGP 2.x) signature\n" msgstr "Unterschrift nach alter (PGP 2.x) Art\n" -#: g10/mainproc.c:1214 +#: g10/mainproc.c:1217 msgid "invalid root packet detected in proc_tree()\n" msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n" @@ -2547,15 +2560,15 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "Daten wurden nicht gespeichert; verwenden Sie daf�r die Option \"--output\"\n" -#: g10/plaintext.c:266 +#: g10/plaintext.c:267 msgid "Please enter name of data file: " msgstr "Bitte geben Sie den Namen der Datendatei ein: " -#: g10/plaintext.c:287 +#: g10/plaintext.c:288 msgid "reading stdin ...\n" msgstr "lese stdin ...\n" -#: g10/plaintext.c:360 +#: g10/plaintext.c:371 #, c-format msgid "can't open signed data `%s'\n" msgstr "kann signierte Datei '%s' nicht �ffnen.\n" @@ -3018,7 +3031,8 @@ msgid "Ooops, no keys\n" msgstr "Huch, keine Schl�ssel\n" #: g10/trustdb.c:2061 -msgid "Ooops, no user ids\n" +#, fuzzy +msgid "Ooops, no user IDs\n" msgstr "Huch, keine User-IDs\n" #: g10/trustdb.c:2218 @@ -3198,21 +3212,22 @@ msgstr "" #: g10/helptext.c:53 msgid "If you want to use this revoked key anyway, answer \"yes\"." -msgstr +msgstr "" "Wenn Sie diesen widerrufenen Schl�ssel trotzdem benutzen wollen,\n" "so antworten Sie mit \"ja\"." #: g10/helptext.c:57 msgid "If you want to use this untrusted key anyway, answer \"yes\"." -msgstr -"Wenn Sie diesen nicht vertrauensw�rdigen Schl�ssel trotzdem benutzen wollen,\n" +msgstr "" +"Wenn Sie diesen nicht vertrauensw�rdigen Schl�ssel trotzdem benutzen " +"wollen,\n" "so antworten Sie mit \"ja\"." #: g10/helptext.c:61 +#, fuzzy msgid "" -"Enter the user id of the addressee to whom you want to send the message." -msgstr -"Geben Sie die User-ID dessen ein, dem Sie die Botschaft senden wollen." +"Enter the user ID of the addressee to whom you want to send the message." +msgstr "Geben Sie die User-ID dessen ein, dem Sie die Botschaft senden wollen." #: g10/helptext.c:65 msgid "" @@ -3233,14 +3248,16 @@ msgid "" "The first (primary) key must always be a key which is capable of signing;\n" "this is the reason why the encryption only ElGamal key is not available in\n" "this menu." -msgstr -"W�hlen Sie die zu verwendende Methode aus.\n\n" +msgstr "" +"W�hlen Sie die zu verwendende Methode aus.\n" +"\n" "DSA (alias DSS) bedeutet \"digital signature algorithm\" (Digitales\n" " Unterschrift-Verfahren). Es kann nur zum Unterschreiben und Beglaubigen\n" " benutzt werden. Dies ist das empfohlene Verfahren, da dessen �berpr�fung\n" " wesentlich schneller abl�uft, als die von \"ElGamal\".\n" "\n" -"ElGamal ist ein Verfahren f�r Unterschrift, Beglaubigung und Verschl�sselung\n" +"ElGamal ist ein Verfahren f�r Unterschrift, Beglaubigung und " +"Verschl�sselung\n" " OpenPGP unterscheidet zwischen zwei Arten von ElGamal: eines nur zum\n" " Unterschreiben/Beglaubigen und eines zus�tzlich zum Verschl�sseln.\n" " Eigentlich sind diese Arten identisch; allerdings m�ssen einige Parameter\n" @@ -3255,13 +3272,12 @@ msgstr "sein. Deshalb kann ein nur-Verschl�ssel-ElGamal-Schl�ssel daf�r nicht\n" "verwendet werden." - #: g10/helptext.c:85 msgid "" "Although these keys are defined in RFC2440 they are not suggested\n" "because they are not supported by all programs and signatures created\n" "with them are quite large and very slow to verify." -msgstr +msgstr "" "Obwohl diese Schl�ssel in RFC 2440 definiert sind, ist ihre Verwendung " "nicht\n" "empfohlen. Sie werden n�mlich nicht von allen Programmen unterst�tzt.\n" @@ -3278,12 +3294,13 @@ msgid "Answer \"yes\" or \"no\"" msgstr "Geben Sie \"ja\" oder \"nein\" ein" #: g10/helptext.c:106 +#, fuzzy msgid "" -"Enter the required value as shown in the pronpt.\n" +"Enter the required value as shown in the prompt.\n" "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n" "get a good error response - instead the system tries to interpret\n" "the given value as an interval." -msgstr +msgstr "" "Geben Sie den ben�tigten Wert so an, wie er im Prompt erscheint.\n" "Es ist zwar m�glich ein \"ISO\"-Datum (JJJJ-MM-DD) einzugeben, aber man\n" "erh�lt dann ggfs. keine brauchbaren Fehlermeldungen - stattdessen versucht\n" @@ -3295,11 +3312,10 @@ msgstr "Geben Sie den Namen des Schl�sselinhabers ein" #: g10/helptext.c:123 msgid "please enter an optional but highly suggested email address" -msgstr +msgstr "" "Geben Sie eine E-Mail-Adresse ein. Dies ist zwar nicht unbedingt notwendig,\n" "aber sehr empfehlenswert." - #: g10/helptext.c:127 msgid "Please enter an optional comment" msgstr "Geben Sie - bei Bedarf - einen Kommentar ein" @@ -3320,35 +3336,33 @@ msgstr "" #: g10/helptext.c:141 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." -msgstr +msgstr "" "Geben Sie \"ja\" (oder nur \"j\") ein, um den Unterschl�ssel zu erzeugen." - #: g10/helptext.c:164 msgid "Answer \"yes\" is you want to sign ALL the user IDs" -msgstr -"Geben Sie \"ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen" +msgstr "Geben Sie \"ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen" #: g10/helptext.c:168 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" -msgstr +msgstr "" "Geben Sie \"ja\" (oder nur \"j\") ein, um diese User-ID zu L�SCHEN.\n" "Alle Zertifikate werden dann auch weg sein!" - #: g10/helptext.c:173 msgid "Answer \"yes\" if it is okay to delete the subkey" -msgstr +msgstr "" "Geben Sie \"ja\" (oder nur \"j\") ein, um diesen Unterschl�ssel zu l�schen" #: g10/helptext.c:178 +#, fuzzy msgid "" "This is a valid signature on the key; you normally don't want\n" -"to delete this signature may be important to establish a trust\n" -"connection to the key or another key certified by this key." -msgstr +"to delete this signature because it may be important to establish a\n" +"trust connection to the key or another key certified by this key." +msgstr "" "Dies ist eine g�ltige Beglaubigung f�r den Schl�ssel. Es ist normalerweise\n" "unn�tig sie zu l�schen. Sie ist m�glicherweise sogar notwendig, um einen\n" "Trust-Weg zu diesem oder einem durch diesen Schl�ssel beglaubigten " @@ -3361,8 +3375,9 @@ msgid "" "corresponding key. You should postpone its deletion until you\n" "know which key was used because this signing key might establisha trust " "connection through another already certified key." -msgstr -"Diese Beglaubigung kann nicht gepr�ft werden, da Sie den passenden Schl�ssel\n" +msgstr "" +"Diese Beglaubigung kann nicht gepr�ft werden, da Sie den passenden " +"Schl�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." @@ -3371,11 +3386,10 @@ msgstr msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." -msgstr +msgstr "" "Diese Beglaubigung ist ung�ltig. Es ist sinnvoll sie aus Ihrem\n" "Schl�sselbund zu entfernen." - #: g10/helptext.c:193 msgid "" "This is a signature which binds the user ID to the key. It is\n" @@ -3383,10 +3397,11 @@ msgid "" "GnuPG might not be able to use this key anymore. So do this\n" "only if this self-signature is for some reason not valid and\n" "a second one is available." -msgstr +msgstr "" "Diese Beglaubigung bindet die User-ID an den Schl�ssel. Normalerweise ist\n" "es nicht gut, solche Beglaubigungen zu entfernen. Um ehrlich zu sein:\n" -"Es k�nnte dann sein, da� GnuPG diesen Schl�ssel gar nicht mehr benutzen kann.\n" +"Es k�nnte dann sein, da� GnuPG diesen Schl�ssel gar nicht mehr benutzen " +"kann.\n" "Sie sollten diese Eigenbeglaubigung also nur dann entfernen, wenn sie aus\n" "irgendeinem Grund nicht g�ltig ist und eine zweite Beglaubigung verf�gbar " "ist." @@ -3395,7 +3410,7 @@ msgstr msgid "" "Please enter the passhrase; this is a secret sentence \n" " Blurb, blurb,.... " -msgstr +msgstr "" "Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz, der aus\n" "beliebigen Zeichen bestehen kann. Was Sie eingegeben wird nicht angezeigt.\n" "\n" @@ -3408,17 +3423,16 @@ msgstr "werden,\n" "sind i.d.R. eine gute Wahl" - #: g10/helptext.c:209 msgid "Please repeat the last passphrase, so you are sure what you typed in." -msgstr +msgstr "" "Um sicher zu gehen, da� Sie sich bei der Eingabe des Mantras nicht\n" "vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n" "�bereinstimmen, wird das Mantra akzeptiert." #: g10/helptext.c:213 msgid "Give the name fo the file to which the signature applies" -msgstr +msgstr "" "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift geh�rt" #: g10/helptext.c:218 @@ -3429,12 +3443,11 @@ msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei �berschreiben m�chten" msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." -msgstr +msgstr "" "Geben Sie bitte einen neuen Dateinamen ein. Falls Sie nur die\n" "Eingabetaste bet�tigen, wird der (in Klammern angezeigte) Standarddateiname\n" "verwendet." - #: g10/helptext.c:237 msgid "No help available" msgstr "Keine Hilfe vorhanden." diff --git a/po/es_ES.po b/po/es_ES.po index 3acdf86d7..57386890c 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ # GPG version: 0.9.7 msgid "" msgstr "" -"POT-Creation-Date: 1999-08-30 19:40+0200\n" +"POT-Creation-Date: 1999-09-02 14:44+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" @@ -34,27 +34,27 @@ msgstr "operaci�n imposible sin memoria segura inicializada\n" msgid "(you may have used the wrong program for this task)\n" msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n" -#: util/miscutil.c:254 util/miscutil.c:283 +#: util/miscutil.c:277 util/miscutil.c:306 msgid "yes" msgstr "s�" -#: util/miscutil.c:255 util/miscutil.c:286 +#: util/miscutil.c:278 util/miscutil.c:309 msgid "yY" msgstr "sS" -#: util/miscutil.c:256 util/miscutil.c:284 +#: util/miscutil.c:279 util/miscutil.c:307 msgid "no" msgstr "" -#: util/miscutil.c:257 util/miscutil.c:287 +#: util/miscutil.c:280 util/miscutil.c:310 msgid "nN" msgstr "" -#: g10/keyedit.c:564 util/miscutil.c:285 +#: g10/keyedit.c:564 util/miscutil.c:308 msgid "quit" msgstr "" -#: util/miscutil.c:288 +#: util/miscutil.c:311 msgid "qQ" msgstr "" @@ -1333,11 +1333,11 @@ msgstr "La clave nunca caduca\n" msgid "Key expires at %s\n" msgstr "La clave caduca el %s\n" -#: g10/keygen.c:564 +#: g10/keygen.c:563 msgid "Is this correct (y/n)? " msgstr "�Es correcto (s/n)? " -#: g10/keygen.c:607 +#: g10/keygen.c:606 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1355,44 +1355,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) <[email protected]>\"\n" "\n" -#: g10/keygen.c:618 +#: g10/keygen.c:617 msgid "Real name: " msgstr "Nombre y apellidos: " -#: g10/keygen.c:622 +#: g10/keygen.c:621 msgid "Invalid character in name\n" msgstr "Caracter no v�lido en el nombre\n" -#: g10/keygen.c:624 +#: g10/keygen.c:623 msgid "Name may not start with a digit\n" msgstr "El nombre no puede empezar con un n�mero\n" -#: g10/keygen.c:626 +#: g10/keygen.c:625 msgid "Name must be at least 5 characters long\n" msgstr "El nombre debe tener al menos 5 caracteres\n" -#: g10/keygen.c:634 +#: g10/keygen.c:633 msgid "Email address: " msgstr "Direcci�n de correo electr�nico: " -#: g10/keygen.c:645 +#: g10/keygen.c:644 msgid "Not a valid email address\n" msgstr "Direcci�n no v�lida\n" -#: g10/keygen.c:653 +#: g10/keygen.c:652 msgid "Comment: " msgstr "Comentario: " -#: g10/keygen.c:659 +#: g10/keygen.c:658 msgid "Invalid character in comment\n" msgstr "Caracter no v�lido en el comentario\n" -#: g10/keygen.c:681 +#: g10/keygen.c:680 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Est� usando el juego de caracteres `%s'.\n" -#: g10/keygen.c:687 +#: g10/keygen.c:686 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1403,15 +1403,15 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:690 +#: g10/keygen.c:689 msgid "NnCcEeOoQq" msgstr "NnCcDdVvSs" -#: g10/keygen.c:700 +#: g10/keygen.c:699 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? " -#: g10/keygen.c:752 +#: g10/keygen.c:751 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1419,11 +1419,11 @@ msgstr "" "Necesita una contrase�a para proteger su clave secreta.\n" "\n" -#: g10/keyedit.c:456 g10/keygen.c:760 +#: g10/keyedit.c:456 g10/keygen.c:759 msgid "passphrase not correctly repeated; try again.\n" msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n" -#: g10/keygen.c:766 +#: g10/keygen.c:765 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -1435,7 +1435,7 @@ msgstr "" "la opci�n \"--edit-key\".\n" "\n" -#: g10/keygen.c:787 +#: g10/keygen.c:786 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -1448,34 +1448,34 @@ msgstr "" "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n" "entrop�a.\n" -#: g10/keygen.c:857 +#: g10/keygen.c:856 msgid "Key generation can only be used in interactive mode\n" msgstr "La creaci�n de claves s�lo es posible en modo interactivo\n" -#: g10/keygen.c:865 +#: g10/keygen.c:864 msgid "DSA keypair will have 1024 bits.\n" msgstr "El par de claves DSA tendr� 1024 bits.\n" -#: g10/keygen.c:871 +#: g10/keygen.c:870 #, fuzzy msgid "Key generation canceled.\n" msgstr "Creaci�n de claves cancelada.\n" -#: g10/keygen.c:881 +#: g10/keygen.c:880 #, c-format msgid "writing public certificate to `%s'\n" msgstr "escribiendo certificado p�blico en `%s'\n" -#: g10/keygen.c:882 +#: g10/keygen.c:881 #, c-format msgid "writing secret certificate to `%s'\n" msgstr "escribiendo certificado privado en `%s'\n" -#: g10/keygen.c:959 +#: g10/keygen.c:958 msgid "public and secret key created and signed.\n" msgstr "Claves p�blica y secreta creadas y firmadas.\n" -#: g10/keygen.c:961 +#: g10/keygen.c:960 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1484,12 +1484,12 @@ msgstr "" "el comando \"--edit-key\" para crear una clave secundaria con este " "prop�sito.\n" -#: g10/keygen.c:975 g10/keygen.c:1074 +#: g10/keygen.c:974 g10/keygen.c:1073 #, c-format msgid "Key generation failed: %s\n" msgstr "Creaci�n de la clave fallida: %s\n" -#: g10/keygen.c:1019 g10/sig-check.c:312 g10/sign.c:105 +#: g10/keygen.c:1018 g10/sig-check.c:312 g10/sign.c:105 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1497,7 +1497,7 @@ msgstr "" "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/keygen.c:1021 g10/sig-check.c:314 g10/sign.c:107 +#: g10/keygen.c:1020 g10/sig-check.c:314 g10/sign.c:107 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1505,7 +1505,7 @@ msgstr "" "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/keygen.c:1052 +#: g10/keygen.c:1051 msgid "Really create? " msgstr "�Crear de verdad? " @@ -1568,12 +1568,12 @@ msgstr "" #: g10/getkey.c:1291 g10/getkey.c:1330 #, fuzzy -msgid "No key for user-id\n" +msgid "No key for user ID\n" msgstr "clave %08lX: no hay identificativo de usuario\n" #: g10/getkey.c:1369 g10/getkey.c:1409 #, fuzzy -msgid "No user-id for key\n" +msgid "No user ID for key\n" msgstr "no hay clave secreta\n" #: g10/getkey.c:1565 g10/getkey.c:1621 @@ -1657,13 +1657,13 @@ msgid " secret keys unchanged: %lu\n" msgstr "claves secretas sin cambios: %lu\n" #: g10/import.c:362 g10/import.c:554 -#, c-format -msgid "key %08lX: no user id\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID\n" msgstr "clave %08lX: no hay identificativo de usuario\n" #: g10/import.c:376 -#, c-format -msgid "key %08lX: no valid user ids\n" +#, fuzzy, c-format +msgid "key %08lX: no valid user IDs\n" msgstr "clave %08lX: no hay identificativos de usuario v�lidos\n" #: g10/import.c:378 @@ -1715,13 +1715,13 @@ 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:469 -#, c-format -msgid "key %08lX: 1 new user-id\n" +#, fuzzy, c-format +msgid "key %08lX: 1 new user ID\n" msgstr "clave %08lX: 1 nuevo identificativo de usuario\n" #: g10/import.c:472 -#, c-format -msgid "key %08lX: %d new user-ids\n" +#, fuzzy, c-format +msgid "key %08lX: %d new user IDs\n" msgstr "clave %08lX: %d nuevos identificativos de usuario\n" #: g10/import.c:475 @@ -1783,8 +1783,8 @@ msgid "key %08lX: revocation certificate imported\n" msgstr "clave %08lX: certificado de revocaci�n importado\n" #: g10/import.c:711 -#, c-format -msgid "key %08lX: no user-id for signature\n" +#, fuzzy, 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:718 g10/import.c:742 @@ -1809,12 +1809,12 @@ msgstr "clave %08lX.%lu: uni�n de subclave no v�lida\n" #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed user-id '" +msgid "key %08lX: accepted non self-signed user ID '" msgstr "clave %08lX: ignorado identificativo de usuario '" #: g10/import.c:798 #, fuzzy, c-format -msgid "key %08lX: skipped user-id '" +msgid "key %08lX: skipped user ID '" msgstr "clave %08lX: ignorado identificativo de usuario '" #: g10/import.c:821 @@ -1852,7 +1852,7 @@ msgstr "clave %08lX: detectado usuario duplicado - fusionada\n" msgid "key %08lX: revocation certificate added\n" msgstr "clave %08lX: certificado de revocaci�n a�adido\n" -#: g10/import.c:1127 g10/import.c:1182 +#: g10/import.c:1128 g10/import.c:1183 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "clave %08lX: nuestra copia no tiene autofirma\n" @@ -1898,12 +1898,13 @@ msgid "%d signatures not checked due to errors\n" msgstr "%d firmas no comprobadas por causa de un error\n" #: g10/keyedit.c:231 -msgid "1 user id without valid self-signature detected\n" +#, fuzzy +msgid "1 user ID without valid self-signature detected\n" msgstr "Detectado 1 identificativo de usuario sin autofirma v�lida\n" #: g10/keyedit.c:233 -#, c-format -msgid "%d user ids without valid self-signatures detected\n" +#, fuzzy, c-format +msgid "%d user IDs without valid self-signatures detected\n" msgstr "Detectados %d identificativos de usuario sin autofirma v�lida\n" #. Fixme: see whether there is a revocation in which @@ -2017,7 +2018,8 @@ msgid "list" msgstr "" #: g10/keyedit.c:570 -msgid "list key and user ids" +#, fuzzy +msgid "list key and user IDs" msgstr "lista clave e identificativos de usuario" #: g10/keyedit.c:571 @@ -2029,7 +2031,8 @@ msgid "uid" msgstr "" #: g10/keyedit.c:572 -msgid "select user id N" +#, fuzzy +msgid "select user ID N" msgstr "selecciona identificativo de usuario N" #: g10/keyedit.c:573 @@ -2082,7 +2085,8 @@ msgid "adduid" msgstr "" #: g10/keyedit.c:580 -msgid "add a user id" +#, fuzzy +msgid "add a user ID" msgstr "a�ade un identificativo de usuario" #: g10/keyedit.c:581 @@ -2090,7 +2094,8 @@ msgid "deluid" msgstr "" #: g10/keyedit.c:581 -msgid "delete user id" +#, fuzzy +msgid "delete user ID" msgstr "borra un identificativo de usuario" #: g10/keyedit.c:582 @@ -2216,11 +2221,13 @@ msgid "Need the secret key to do this.\n" msgstr "Se necesita la clave secreta para hacer esto.\n" #: g10/keyedit.c:758 -msgid "Really sign all user ids? " +#, fuzzy +msgid "Really sign all user IDs? " msgstr "�Firmar realmente todos los identificativos de usuario? " #: g10/keyedit.c:759 -msgid "Hint: Select the user ids to sign\n" +#, fuzzy +msgid "Hint: Select the user IDs to sign\n" msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n" #: g10/keyedit.c:786 g10/keyedit.c:968 @@ -2229,19 +2236,23 @@ 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" +#, fuzzy +msgid "You must select at least one user ID.\n" msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n" #: g10/keyedit.c:799 -msgid "You can't delete the last user id!\n" +#, fuzzy +msgid "You can't delete the last user ID!\n" msgstr "�No puede borrar el �ltimo identificativo de usuario!\n" #: g10/keyedit.c:802 -msgid "Really remove all selected user ids? " +#, fuzzy +msgid "Really remove all selected user IDs? " msgstr "�Borrar realmente todos los identificativos seleccionados? " #: g10/keyedit.c:803 -msgid "Really remove this user id? " +#, fuzzy +msgid "Really remove this user ID? " msgstr "�Borrar realmente este identificativo? " #: g10/keyedit.c:839 g10/keyedit.c:861 @@ -2354,8 +2365,8 @@ msgid "No corresponding signature in secret ring\n" msgstr "No hay firma correspondiente en anillo secreto\n" #: g10/keyedit.c:1566 -#, c-format -msgid "No user id with index %d\n" +#, fuzzy, 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:1612 @@ -2479,11 +2490,11 @@ msgstr "tambi�n conocido como \"" msgid "Can't check signature: %s\n" msgstr "Imposible comprobar la firma: %s\n" -#: g10/mainproc.c:1209 +#: g10/mainproc.c:1212 msgid "old style (PGP 2.x) signature\n" msgstr "firma viejo estilo (PGP 2.x)\n" -#: g10/mainproc.c:1214 +#: g10/mainproc.c:1217 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquete ra�z no v�lido detectado en proc_tree()\n" @@ -2561,15 +2572,15 @@ msgstr "Repita contrase�a: " msgid "data not saved; use option \"--output\" to save it\n" msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n" -#: g10/plaintext.c:266 +#: g10/plaintext.c:267 msgid "Please enter name of data file: " msgstr "Introduzca el nombre del fichero de datos: " -#: g10/plaintext.c:287 +#: g10/plaintext.c:288 msgid "reading stdin ...\n" msgstr "leyendo stdin...\n" -#: g10/plaintext.c:360 +#: g10/plaintext.c:371 #, c-format msgid "can't open signed data `%s'\n" msgstr "imposible abrir datos firmados `%s'\n" @@ -3026,7 +3037,8 @@ msgid "Ooops, no keys\n" msgstr "Oh oh, no hay claves\n" #: g10/trustdb.c:2061 -msgid "Ooops, no user ids\n" +#, fuzzy +msgid "Ooops, no user IDs\n" msgstr "Oh oh, no hay identificativos de usuario\n" #: g10/trustdb.c:2218 @@ -3209,66 +3221,69 @@ msgstr "" #: g10/helptext.c:61 msgid "" -"Enter the user id of the addressee to whom you want to send the message." +"Enter the user ID of the addressee to whom you want to send the message." msgstr "" #: g10/helptext.c:65 msgid "" "Select the algorithm to use.\n" +"\n" "DSA (aka DSS) is the digital signature algorithm which can only be used\n" "for signatures. This is the suggested algorithm because verification of\n" "DSA signatures are much faster than those of ElGamal.\n" +"\n" "ElGamal is an algorithm which can be used for signatures and encryption.\n" -"OpenPGP distunguishs between two flavors of this algorithms: an encrypt " +"OpenPGP distinguishs between two flavors of this algorithms: an encrypt " "only\n" "and a sign+encrypt; actually it is the same, but some parameters must be\n" "selected in a special way to create a safe key for signatures: this program\n" "does this but other OpenPGP implementations are not required to understand\n" "the signature+encryption flavor.\n" +"\n" "The first (primary) key must always be a key which is capable of signing;\n" "this is the reason why the encryption only ElGamal key is not available in\n" "this menu." msgstr "" -#: g10/helptext.c:82 +#: g10/helptext.c:85 msgid "" "Although these keys are defined in RFC2440 they are not suggested\n" "because they are not supported by all programs and signatures created\n" "with them are quite large and very slow to verify." msgstr "" -#: g10/helptext.c:89 +#: g10/helptext.c:92 #, fuzzy msgid "Enter the size of the key" msgstr "Introduzca el ID de usuario: " -#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142 -#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157 +#: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145 +#: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160 msgid "Answer \"yes\" or \"no\"" msgstr "" -#: g10/helptext.c:103 +#: g10/helptext.c:106 msgid "" -"Enter the required value as shown in the pronpt.\n" +"Enter the required value as shown in the prompt.\n" "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n" "get a good error response - instead the system tries to interpret\n" "the given value as an interval." msgstr "" -#: g10/helptext.c:115 +#: g10/helptext.c:118 msgid "Enter the name of the key holder" msgstr "" -#: g10/helptext.c:120 +#: g10/helptext.c:123 msgid "please enter an optional but highly suggested email address" msgstr "" -#: g10/helptext.c:124 +#: g10/helptext.c:127 #, fuzzy msgid "Please enter an optional comment" msgstr "Introduzca el nombre del fichero de datos: " -#: g10/helptext.c:129 +#: g10/helptext.c:132 msgid "" "N to change the name.\n" "C to change the comment.\n" @@ -3277,32 +3292,32 @@ msgid "" "Q to to quit the key generation." msgstr "" -#: g10/helptext.c:138 +#: g10/helptext.c:141 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." msgstr "" -#: g10/helptext.c:161 +#: g10/helptext.c:164 msgid "Answer \"yes\" is you want to sign ALL the user IDs" msgstr "" -#: g10/helptext.c:165 +#: g10/helptext.c:168 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -#: g10/helptext.c:170 +#: g10/helptext.c:173 msgid "Answer \"yes\" if it is okay to delete the subkey" msgstr "" -#: g10/helptext.c:175 +#: g10/helptext.c:178 msgid "" "This is a valid signature on the key; you normally don't want\n" -"to delete this signature may be important to establish a trust\n" -"connection to the key or another key certified by this key." +"to delete this signature because it may be important to establish a\n" +"trust connection to the key or another key certified by this key." msgstr "" -#: g10/helptext.c:180 +#: g10/helptext.c:183 msgid "" "This signature can't be checked because you don't have the\n" "corresponding key. You should postpone its deletion until you\n" @@ -3310,13 +3325,13 @@ msgid "" "connection through another already certified key." msgstr "" -#: g10/helptext.c:186 +#: g10/helptext.c:189 msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." msgstr "" -#: g10/helptext.c:190 +#: g10/helptext.c:193 msgid "" "This is a signature which binds the user ID to the key. It is\n" "usually not a good idea to remove such a signature. Actually\n" @@ -3325,35 +3340,35 @@ msgid "" "a second one is available." msgstr "" -#: g10/helptext.c:199 +#: g10/helptext.c:202 msgid "" "Please enter the passhrase; this is a secret sentence \n" " Blurb, blurb,.... " msgstr "" -#: g10/helptext.c:206 +#: g10/helptext.c:209 msgid "Please repeat the last passphrase, so you are sure what you typed in." msgstr "" -#: g10/helptext.c:210 +#: g10/helptext.c:213 msgid "Give the name fo the file to which the signature applies" msgstr "" -#: g10/helptext.c:215 +#: g10/helptext.c:218 msgid "Answer \"yes\" if it is okay to overwrite the file" msgstr "" -#: g10/helptext.c:220 +#: g10/helptext.c:223 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." msgstr "" -#: g10/helptext.c:234 +#: g10/helptext.c:237 msgid "No help available" msgstr "Ayuda no disponible" -#: g10/helptext.c:242 +#: g10/helptext.c:245 #, c-format msgid "No help available for `%s'" msgstr "Ayuda no disponible para `%s'" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0\n" -"POT-Creation-Date: 1999-08-30 19:40+0200\n" +"POT-Creation-Date: 1999-09-02 14:44+0200\n" "PO-Revision-Date: 1999-08-08 04:01+02:00\n" "Last-Translator: Ga�l Qu�ri <[email protected]>\n" "Language-Team: French <[email protected]>\n" @@ -27,27 +27,27 @@ msgstr "" msgid "(you may have used the wrong program for this task)\n" msgstr "(vous avez peut-�tre utilis� le mauvais programme pour cette tache)\n" -#: util/miscutil.c:254 util/miscutil.c:283 +#: util/miscutil.c:277 util/miscutil.c:306 msgid "yes" msgstr "oui" -#: util/miscutil.c:255 util/miscutil.c:286 +#: util/miscutil.c:278 util/miscutil.c:309 msgid "yY" msgstr "oO" -#: util/miscutil.c:256 util/miscutil.c:284 +#: util/miscutil.c:279 util/miscutil.c:307 msgid "no" msgstr "" -#: util/miscutil.c:257 util/miscutil.c:287 +#: util/miscutil.c:280 util/miscutil.c:310 msgid "nN" msgstr "" -#: g10/keyedit.c:564 util/miscutil.c:285 +#: g10/keyedit.c:564 util/miscutil.c:308 msgid "quit" msgstr "quitter" -#: util/miscutil.c:288 +#: util/miscutil.c:311 msgid "qQ" msgstr "qQ" @@ -1323,11 +1323,11 @@ msgstr "La cl� n'expire pas du tout\n" msgid "Key expires at %s\n" msgstr "La cl� expire le %s\n" -#: g10/keygen.c:564 +#: g10/keygen.c:563 msgid "Is this correct (y/n)? " msgstr "Est-ce correct (o/n) ? " -#: g10/keygen.c:607 +#: g10/keygen.c:606 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1343,44 +1343,44 @@ msgstr "" " � Heinrich Heine (Der Dichter) <[email protected]> �\n" "\n" -#: g10/keygen.c:618 +#: g10/keygen.c:617 msgid "Real name: " msgstr "Nom r�el : " -#: g10/keygen.c:622 +#: g10/keygen.c:621 msgid "Invalid character in name\n" msgstr "Caract�re invalide dans le nom\n" -#: g10/keygen.c:624 +#: g10/keygen.c:623 msgid "Name may not start with a digit\n" msgstr "Le nom ne doit pas commencer par un chiffre\n" -#: g10/keygen.c:626 +#: g10/keygen.c:625 msgid "Name must be at least 5 characters long\n" msgstr "Le nom doit faire au moins 5 caract�res de long\n" -#: g10/keygen.c:634 +#: g10/keygen.c:633 msgid "Email address: " msgstr "Adresse e-mail : " -#: g10/keygen.c:645 +#: g10/keygen.c:644 msgid "Not a valid email address\n" msgstr "Ce n'est pas une adresse e-mail valide\n" -#: g10/keygen.c:653 +#: g10/keygen.c:652 msgid "Comment: " msgstr "Commentaire : " -#: g10/keygen.c:659 +#: g10/keygen.c:658 msgid "Invalid character in comment\n" msgstr "Caract�re invalide dans le commentaire\n" -#: g10/keygen.c:681 +#: g10/keygen.c:680 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Vous utilisez le jeu de caract�res '%s'.\n" -#: g10/keygen.c:687 +#: g10/keygen.c:686 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1391,15 +1391,15 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:690 +#: g10/keygen.c:689 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:700 +#: g10/keygen.c:699 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter? " -#: g10/keygen.c:752 +#: g10/keygen.c:751 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1407,11 +1407,11 @@ msgstr "" "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n" "\n" -#: g10/keyedit.c:456 g10/keygen.c:760 +#: g10/keyedit.c:456 g10/keygen.c:759 msgid "passphrase not correctly repeated; try again.\n" msgstr "le mot de passe n'a pas �t� r�p�t� � l'identique ; recommencez.\n" -#: g10/keygen.c:766 +#: g10/keygen.c:765 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -1423,7 +1423,7 @@ msgstr "" "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n" "\n" -#: g10/keygen.c:787 +#: g10/keygen.c:786 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -1435,33 +1435,33 @@ msgstr "" "pendant la g�n�ration de nombres premiers ; cela donne au g�n�rateur de\n" "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n" -#: g10/keygen.c:857 +#: g10/keygen.c:856 msgid "Key generation can only be used in interactive mode\n" msgstr "La g�n�ration de cl� ne peut �tre faite qu'en mode interactif\n" -#: g10/keygen.c:865 +#: g10/keygen.c:864 msgid "DSA keypair will have 1024 bits.\n" msgstr "La paire de cl�s DSA fera 1024 bits.\n" -#: g10/keygen.c:871 +#: g10/keygen.c:870 msgid "Key generation canceled.\n" msgstr "La g�n�ration de cl� a �t� annul�e.\n" -#: g10/keygen.c:881 +#: g10/keygen.c:880 #, c-format msgid "writing public certificate to `%s'\n" msgstr "�criture d'un certificat public � `%s'\n" -#: g10/keygen.c:882 +#: g10/keygen.c:881 #, c-format msgid "writing secret certificate to `%s'\n" msgstr "�criture d'un certificat secret � `%s'\n" -#: g10/keygen.c:959 +#: g10/keygen.c:958 msgid "public and secret key created and signed.\n" msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n" -#: g10/keygen.c:961 +#: g10/keygen.c:960 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1470,13 +1470,13 @@ msgstr "" "utiliser la commande � --edit-key � pour g�n�rer une cl� secondaire �\n" "cette fin.\n" -#: g10/keygen.c:975 g10/keygen.c:1074 +#: g10/keygen.c:974 g10/keygen.c:1073 #, c-format msgid "Key generation failed: %s\n" msgstr "La g�n�ration de cl� a �chou� : %s\n" # on s'amuse comme on peut... -#: g10/keygen.c:1019 g10/sig-check.c:312 g10/sign.c:105 +#: g10/keygen.c:1018 g10/sig-check.c:312 g10/sign.c:105 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1484,7 +1484,7 @@ msgstr "" "la cl� a �t� cr��e %lu seconde dans le futur (discontinuit� temporelle ou\n" "probl�me d'horloge)\n" -#: g10/keygen.c:1021 g10/sig-check.c:314 g10/sign.c:107 +#: g10/keygen.c:1020 g10/sig-check.c:314 g10/sign.c:107 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1492,7 +1492,7 @@ msgstr "" "la cl� a �t� cr��e %lu secondes dans le futur (discontinuit� temporelle ou\n" "probl�me d'horloge\n" -#: g10/keygen.c:1052 +#: g10/keygen.c:1051 msgid "Really create? " msgstr "Cr�er vraiment ? " @@ -1554,11 +1554,13 @@ msgid "RSA key cannot be used in this version\n" msgstr "les cl�s RSA ne peuvent �tre utilis�es dans cette version\n" #: g10/getkey.c:1291 g10/getkey.c:1330 -msgid "No key for user-id\n" +#, fuzzy +msgid "No key for user ID\n" msgstr "Pas de cl� pour cet utilisateur\n" #: g10/getkey.c:1369 g10/getkey.c:1409 -msgid "No user-id for key\n" +#, fuzzy +msgid "No user ID for key\n" msgstr "Pas d'utilisateur pour cette cl�\n" #: g10/getkey.c:1565 g10/getkey.c:1621 @@ -1644,13 +1646,13 @@ msgid " secret keys unchanged: %lu\n" msgstr " cl�s secr�tes inchang�es : %lu\n" #: g10/import.c:362 g10/import.c:554 -#, c-format -msgid "key %08lX: no user id\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID\n" msgstr "cl� %08lX : pas de nom d'utilisateur\n" #: g10/import.c:376 -#, c-format -msgid "key %08lX: no valid user ids\n" +#, fuzzy, c-format +msgid "key %08lX: no valid user IDs\n" msgstr "cl� %08lX : pas de nom d'utilisateur valide\n" #: g10/import.c:378 @@ -1702,13 +1704,13 @@ 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:469 -#, c-format -msgid "key %08lX: 1 new user-id\n" +#, fuzzy, c-format +msgid "key %08lX: 1 new user ID\n" msgstr "cl� %08lX : un nouvel utilisateur\n" #: g10/import.c:472 -#, c-format -msgid "key %08lX: %d new user-ids\n" +#, fuzzy, c-format +msgid "key %08lX: %d new user IDs\n" msgstr "cl� %08lX : %d nouveaux utilisateurs\n" #: g10/import.c:475 @@ -1770,8 +1772,8 @@ msgid "key %08lX: revocation certificate imported\n" msgstr "cl� %08lX : certificat de r�vocation import�\n" #: g10/import.c:711 -#, c-format -msgid "key %08lX: no user-id for signature\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID for signature\n" msgstr "cl� %08lX : pas d'utilisateur pour la signature\n" #: g10/import.c:718 g10/import.c:742 @@ -1795,13 +1797,13 @@ msgid "key %08lX: invalid subkey binding\n" msgstr "cl� %08lX : liaison avec la sous-cl� invalide\n" #: g10/import.c:769 -#, c-format -msgid "key %08lX: accepted non self-signed user-id '" +#, fuzzy, c-format +msgid "key %08lX: accepted non self-signed user ID '" msgstr "cl� %08lX : utilisateur non sign� par lui-m�me accept� : '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped user-id '" +#, fuzzy, c-format +msgid "key %08lX: skipped user ID '" msgstr "cl� %08lX : utilisateur non pris en compte : '" #: g10/import.c:821 @@ -1838,7 +1840,7 @@ msgstr "cl� %08lX: nom d'utilisateur doublon fusionn�\n" msgid "key %08lX: revocation certificate added\n" msgstr "cl� %08lX : certificat de r�vocation ajout�\n" -#: g10/import.c:1127 g10/import.c:1182 +#: g10/import.c:1128 g10/import.c:1183 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "cl� %08lX : notre copie n'a pas d'auto-signature\n" @@ -1884,12 +1886,13 @@ msgid "%d signatures not checked due to errors\n" msgstr "%d signatures non v�rifi�es � cause d'erreurs\n" #: g10/keyedit.c:231 -msgid "1 user id without valid self-signature detected\n" +#, fuzzy +msgid "1 user ID without valid self-signature detected\n" msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n" #: g10/keyedit.c:233 -#, c-format -msgid "%d user ids without valid self-signatures detected\n" +#, fuzzy, c-format +msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n" #. Fixme: see whether there is a revocation in which @@ -2004,7 +2007,8 @@ msgid "list" msgstr "lister" #: g10/keyedit.c:570 -msgid "list key and user ids" +#, fuzzy +msgid "list key and user IDs" msgstr "lister la cl� et les noms d'utilisateurs" #: g10/keyedit.c:571 @@ -2016,7 +2020,8 @@ msgid "uid" msgstr "uid" #: g10/keyedit.c:572 -msgid "select user id N" +#, fuzzy +msgid "select user ID N" msgstr "s�lectionner le nom d'utilisateur N" #: g10/keyedit.c:573 @@ -2068,7 +2073,8 @@ msgid "adduid" msgstr "aj.ut" #: g10/keyedit.c:580 -msgid "add a user id" +#, fuzzy +msgid "add a user ID" msgstr "ajouter un utilisateur" #: g10/keyedit.c:581 @@ -2076,7 +2082,8 @@ msgid "deluid" msgstr "suppr.ut" #: g10/keyedit.c:581 -msgid "delete user id" +#, fuzzy +msgid "delete user ID" msgstr "enlever un utilisateur" #: g10/keyedit.c:582 @@ -2199,11 +2206,13 @@ msgid "Need the secret key to do this.\n" msgstr "Il faut la cl� secr�te pour faire cela.\n" #: g10/keyedit.c:758 -msgid "Really sign all user ids? " +#, fuzzy +msgid "Really sign all user IDs? " msgstr "Signer vraiment tous les utilisateurs ? " #: g10/keyedit.c:759 -msgid "Hint: Select the user ids to sign\n" +#, fuzzy +msgid "Hint: Select the user IDs to sign\n" msgstr "Aide : S�lectionner les utilisateurs � signer\n" #: g10/keyedit.c:786 g10/keyedit.c:968 @@ -2212,19 +2221,23 @@ 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" +#, fuzzy +msgid "You must select at least one user ID.\n" msgstr "Vous devez s�lectionner au moins un utilisateur.\n" #: g10/keyedit.c:799 -msgid "You can't delete the last user id!\n" +#, fuzzy +msgid "You can't delete the last user ID!\n" msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n" #: g10/keyedit.c:802 -msgid "Really remove all selected user ids? " +#, fuzzy +msgid "Really remove all selected user IDs? " msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? " #: g10/keyedit.c:803 -msgid "Really remove this user id? " +#, fuzzy +msgid "Really remove this user ID? " msgstr "Enlever r�ellement cet utilisateur ? " #: g10/keyedit.c:839 g10/keyedit.c:861 @@ -2332,8 +2345,8 @@ msgid "No corresponding signature in secret ring\n" msgstr "Pas de signature correspondante dans le porte-cl�s secret\n" #: g10/keyedit.c:1566 -#, c-format -msgid "No user id with index %d\n" +#, fuzzy, c-format +msgid "No user ID with index %d\n" msgstr "Pas d'utilisateur avec l'index %d\n" #: g10/keyedit.c:1612 @@ -2455,11 +2468,11 @@ msgstr " alias \"" msgid "Can't check signature: %s\n" msgstr "Ne peut v�rifier la signature : %s\n" -#: g10/mainproc.c:1209 +#: g10/mainproc.c:1212 msgid "old style (PGP 2.x) signature\n" msgstr "signature d'un ancien style (PGP 2.x)\n" -#: g10/mainproc.c:1214 +#: g10/mainproc.c:1217 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquet racine invalide d�tect� dans proc_tree()\n" @@ -2538,15 +2551,15 @@ msgstr "" "donn�es non enregistr�es ; utilisez l'option \"--output\" pour\n" "les enregistrer\n" -#: g10/plaintext.c:266 +#: g10/plaintext.c:267 msgid "Please enter name of data file: " msgstr "Entrez le nom d'un fichier de donn�es : " -#: g10/plaintext.c:287 +#: g10/plaintext.c:288 msgid "reading stdin ...\n" msgstr "lecture de l'entr�e standard...\n" -#: g10/plaintext.c:360 +#: g10/plaintext.c:371 #, c-format msgid "can't open signed data `%s'\n" msgstr "ne peut ouvir les donn�es sign�es `%s'\n" @@ -3012,7 +3025,8 @@ msgid "Ooops, no keys\n" msgstr "Ooops, pas de cl�\n" #: g10/trustdb.c:2061 -msgid "Ooops, no user ids\n" +#, fuzzy +msgid "Ooops, no user IDs\n" msgstr "Ooops, pas de nom d'utilisateur\n" #: g10/trustdb.c:2218 @@ -3201,66 +3215,69 @@ msgstr "" #: g10/helptext.c:61 msgid "" -"Enter the user id of the addressee to whom you want to send the message." +"Enter the user ID of the addressee to whom you want to send the message." msgstr "" #: g10/helptext.c:65 msgid "" "Select the algorithm to use.\n" +"\n" "DSA (aka DSS) is the digital signature algorithm which can only be used\n" "for signatures. This is the suggested algorithm because verification of\n" "DSA signatures are much faster than those of ElGamal.\n" +"\n" "ElGamal is an algorithm which can be used for signatures and encryption.\n" -"OpenPGP distunguishs between two flavors of this algorithms: an encrypt " +"OpenPGP distinguishs between two flavors of this algorithms: an encrypt " "only\n" "and a sign+encrypt; actually it is the same, but some parameters must be\n" "selected in a special way to create a safe key for signatures: this program\n" "does this but other OpenPGP implementations are not required to understand\n" "the signature+encryption flavor.\n" +"\n" "The first (primary) key must always be a key which is capable of signing;\n" "this is the reason why the encryption only ElGamal key is not available in\n" "this menu." msgstr "" -#: g10/helptext.c:82 +#: g10/helptext.c:85 msgid "" "Although these keys are defined in RFC2440 they are not suggested\n" "because they are not supported by all programs and signatures created\n" "with them are quite large and very slow to verify." msgstr "" -#: g10/helptext.c:89 +#: g10/helptext.c:92 #, fuzzy msgid "Enter the size of the key" msgstr "Entrez le nom d'utilisateur : " -#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142 -#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157 +#: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145 +#: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160 msgid "Answer \"yes\" or \"no\"" msgstr "" -#: g10/helptext.c:103 +#: g10/helptext.c:106 msgid "" -"Enter the required value as shown in the pronpt.\n" +"Enter the required value as shown in the prompt.\n" "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n" "get a good error response - instead the system tries to interpret\n" "the given value as an interval." msgstr "" -#: g10/helptext.c:115 +#: g10/helptext.c:118 msgid "Enter the name of the key holder" msgstr "" -#: g10/helptext.c:120 +#: g10/helptext.c:123 msgid "please enter an optional but highly suggested email address" msgstr "" -#: g10/helptext.c:124 +#: g10/helptext.c:127 #, fuzzy msgid "Please enter an optional comment" msgstr "Entrez le nom d'un fichier de donn�es : " -#: g10/helptext.c:129 +#: g10/helptext.c:132 msgid "" "N to change the name.\n" "C to change the comment.\n" @@ -3269,32 +3286,32 @@ msgid "" "Q to to quit the key generation." msgstr "" -#: g10/helptext.c:138 +#: g10/helptext.c:141 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." msgstr "" -#: g10/helptext.c:161 +#: g10/helptext.c:164 msgid "Answer \"yes\" is you want to sign ALL the user IDs" msgstr "" -#: g10/helptext.c:165 +#: g10/helptext.c:168 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -#: g10/helptext.c:170 +#: g10/helptext.c:173 msgid "Answer \"yes\" if it is okay to delete the subkey" msgstr "" -#: g10/helptext.c:175 +#: g10/helptext.c:178 msgid "" "This is a valid signature on the key; you normally don't want\n" -"to delete this signature may be important to establish a trust\n" -"connection to the key or another key certified by this key." +"to delete this signature because it may be important to establish a\n" +"trust connection to the key or another key certified by this key." msgstr "" -#: g10/helptext.c:180 +#: g10/helptext.c:183 msgid "" "This signature can't be checked because you don't have the\n" "corresponding key. You should postpone its deletion until you\n" @@ -3302,13 +3319,13 @@ msgid "" "connection through another already certified key." msgstr "" -#: g10/helptext.c:186 +#: g10/helptext.c:189 msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." msgstr "" -#: g10/helptext.c:190 +#: g10/helptext.c:193 msgid "" "This is a signature which binds the user ID to the key. It is\n" "usually not a good idea to remove such a signature. Actually\n" @@ -3317,35 +3334,35 @@ msgid "" "a second one is available." msgstr "" -#: g10/helptext.c:199 +#: g10/helptext.c:202 msgid "" "Please enter the passhrase; this is a secret sentence \n" " Blurb, blurb,.... " msgstr "" -#: g10/helptext.c:206 +#: g10/helptext.c:209 msgid "Please repeat the last passphrase, so you are sure what you typed in." msgstr "" -#: g10/helptext.c:210 +#: g10/helptext.c:213 msgid "Give the name fo the file to which the signature applies" msgstr "" -#: g10/helptext.c:215 +#: g10/helptext.c:218 msgid "Answer \"yes\" if it is okay to overwrite the file" msgstr "" -#: g10/helptext.c:220 +#: g10/helptext.c:223 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." msgstr "" -#: g10/helptext.c:234 +#: g10/helptext.c:237 msgid "No help available" msgstr "Pas d'aide disponible" -#: g10/helptext.c:242 +#: g10/helptext.c:245 #, c-format msgid "No help available for `%s'" msgstr "Pas d'aide disponible pour `%s'" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.9.7\n" -"POT-Creation-Date: 1999-08-30 19:40+0200\n" +"POT-Creation-Date: 1999-09-02 14:44+0200\n" "PO-Revision-Date: 1999-08-17 23:04+02:00\n" "Last-Translator: Marco d'Itri <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" @@ -25,27 +25,27 @@ msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n" msgid "(you may have used the wrong program for this task)\n" msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n" -#: util/miscutil.c:254 util/miscutil.c:283 +#: util/miscutil.c:277 util/miscutil.c:306 msgid "yes" msgstr "s�" -#: util/miscutil.c:255 util/miscutil.c:286 +#: util/miscutil.c:278 util/miscutil.c:309 msgid "yY" msgstr "sS" -#: util/miscutil.c:256 util/miscutil.c:284 +#: util/miscutil.c:279 util/miscutil.c:307 msgid "no" msgstr "" -#: util/miscutil.c:257 util/miscutil.c:287 +#: util/miscutil.c:280 util/miscutil.c:310 msgid "nN" msgstr "" -#: g10/keyedit.c:564 util/miscutil.c:285 +#: g10/keyedit.c:564 util/miscutil.c:308 msgid "quit" msgstr "quit" -#: util/miscutil.c:288 +#: util/miscutil.c:311 msgid "qQ" msgstr "qQ" @@ -1310,11 +1310,11 @@ msgstr "La chiave non scade\n" msgid "Key expires at %s\n" msgstr "La chiave scadr� il %s\n" -#: g10/keygen.c:564 +#: g10/keygen.c:563 msgid "Is this correct (y/n)? " msgstr "� giusto (s/n)? " -#: g10/keygen.c:607 +#: g10/keygen.c:606 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1330,44 +1330,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) <[email protected]>\"\n" "\n" -#: g10/keygen.c:618 +#: g10/keygen.c:617 msgid "Real name: " msgstr "Nome e Cognome: " -#: g10/keygen.c:622 +#: g10/keygen.c:621 msgid "Invalid character in name\n" msgstr "Carattere non valido nel nome\n" -#: g10/keygen.c:624 +#: g10/keygen.c:623 msgid "Name may not start with a digit\n" msgstr "Il nome non pu� iniziare con una cifra\n" -#: g10/keygen.c:626 +#: g10/keygen.c:625 msgid "Name must be at least 5 characters long\n" msgstr "Il nome deve essere lungo almeno 5 caratteri\n" -#: g10/keygen.c:634 +#: g10/keygen.c:633 msgid "Email address: " msgstr "Indirizzo di Email: " -#: g10/keygen.c:645 +#: g10/keygen.c:644 msgid "Not a valid email address\n" msgstr "L'indirizzo di email non � valido\n" -#: g10/keygen.c:653 +#: g10/keygen.c:652 msgid "Comment: " msgstr "Commento: " -#: g10/keygen.c:659 +#: g10/keygen.c:658 msgid "Invalid character in comment\n" msgstr "Carattere non valido nel commento\n" -#: g10/keygen.c:681 +#: g10/keygen.c:680 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Stai usando il set di caratteri `%s'.\n" -#: g10/keygen.c:687 +#: g10/keygen.c:686 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1378,15 +1378,15 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:690 +#: g10/keygen.c:689 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:700 +#: g10/keygen.c:699 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? " -#: g10/keygen.c:752 +#: g10/keygen.c:751 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1394,11 +1394,11 @@ msgstr "" "Ti serve una passphrase per proteggere la tua chiave segreta.\n" "\n" -#: g10/keyedit.c:456 g10/keygen.c:760 +#: g10/keyedit.c:456 g10/keygen.c:759 msgid "passphrase not correctly repeated; try again.\n" msgstr "passphrase non ripetuta correttamente; riprova.\n" -#: g10/keygen.c:766 +#: g10/keygen.c:765 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -1410,7 +1410,7 @@ msgstr "" "programma con l'opzione \"--edit-key\".\n" "\n" -#: g10/keygen.c:787 +#: g10/keygen.c:786 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -1422,33 +1422,33 @@ msgstr "" "dischi) durante la generazione dei numeri primi; questo da al generatore di\n" "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n" -#: g10/keygen.c:857 +#: g10/keygen.c:856 msgid "Key generation can only be used in interactive mode\n" msgstr "Una chiave pu� essere generata solo in modo interattivo\n" -#: g10/keygen.c:865 +#: g10/keygen.c:864 msgid "DSA keypair will have 1024 bits.\n" msgstr "La coppia DSA avr� 1024 bit.\n" -#: g10/keygen.c:871 +#: g10/keygen.c:870 msgid "Key generation canceled.\n" msgstr "Generazione della chiave annullata.\n" -#: g10/keygen.c:881 +#: g10/keygen.c:880 #, c-format msgid "writing public certificate to `%s'\n" msgstr "scrittura del certificato pubblico in `%s'\n" -#: g10/keygen.c:882 +#: g10/keygen.c:881 #, c-format msgid "writing secret certificate to `%s'\n" msgstr "scrittura del certificato segreto in `%s'\n" -#: g10/keygen.c:959 +#: g10/keygen.c:958 msgid "public and secret key created and signed.\n" msgstr "chiavi pubbliche e segrete create e firmate.\n" -#: g10/keygen.c:961 +#: g10/keygen.c:960 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1457,12 +1457,12 @@ msgstr "" "il comando \"--edit-key\" per generare una chiave secondaria per questo " "scopo.\n" -#: g10/keygen.c:975 g10/keygen.c:1074 +#: g10/keygen.c:974 g10/keygen.c:1073 #, c-format msgid "Key generation failed: %s\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/keygen.c:1019 g10/sig-check.c:312 g10/sign.c:105 +#: g10/keygen.c:1018 g10/sig-check.c:312 g10/sign.c:105 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1470,7 +1470,7 @@ msgstr "" "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/keygen.c:1021 g10/sig-check.c:314 g10/sign.c:107 +#: g10/keygen.c:1020 g10/sig-check.c:314 g10/sign.c:107 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1478,7 +1478,7 @@ msgstr "" "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/keygen.c:1052 +#: g10/keygen.c:1051 msgid "Really create? " msgstr "Crea davvero? " @@ -1540,11 +1540,13 @@ msgid "RSA key cannot be used in this version\n" msgstr "In questa versione non possono essere usate chiavi RSA\n" #: g10/getkey.c:1291 g10/getkey.c:1330 -msgid "No key for user-id\n" +#, fuzzy +msgid "No key for user ID\n" msgstr "Non ci sono chiavi per questo user-id\n" #: g10/getkey.c:1369 g10/getkey.c:1409 -msgid "No user-id for key\n" +#, fuzzy +msgid "No user ID for key\n" msgstr "Non ci sono user-id per questa chiave\n" #: g10/getkey.c:1565 g10/getkey.c:1621 @@ -1628,13 +1630,13 @@ msgid " secret keys unchanged: %lu\n" msgstr "chiavi segrete non cambiate: %lu\n" #: g10/import.c:362 g10/import.c:554 -#, c-format -msgid "key %08lX: no user id\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID\n" msgstr "chiave %08lX: nessun user id\n" #: g10/import.c:376 -#, c-format -msgid "key %08lX: no valid user ids\n" +#, fuzzy, c-format +msgid "key %08lX: no valid user IDs\n" msgstr "chiave %08lX: nessun user id valido\n" #: g10/import.c:378 @@ -1686,13 +1688,13 @@ msgid "key %08lX: can't read original keyblock: %s\n" msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n" #: g10/import.c:469 -#, c-format -msgid "key %08lX: 1 new user-id\n" +#, fuzzy, c-format +msgid "key %08lX: 1 new user ID\n" msgstr "chiave %08lX: un nuovo user id\n" #: g10/import.c:472 -#, c-format -msgid "key %08lX: %d new user-ids\n" +#, fuzzy, c-format +msgid "key %08lX: %d new user IDs\n" msgstr "chiave %08lX: %d nuovi user id\n" #: g10/import.c:475 @@ -1754,8 +1756,8 @@ msgid "key %08lX: revocation certificate imported\n" msgstr "chiave %08lX: certificato di revoca importato\n" #: g10/import.c:711 -#, c-format -msgid "key %08lX: no user-id for signature\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID for signature\n" msgstr "chiave %08lX: nessun user id per la firma\n" #: g10/import.c:718 g10/import.c:742 @@ -1779,13 +1781,13 @@ msgid "key %08lX: invalid subkey binding\n" msgstr "chiave %08lX: legame con la subchiave non valido:\n" #: g10/import.c:769 -#, c-format -msgid "key %08lX: accepted non self-signed user-id '" +#, fuzzy, c-format +msgid "key %08lX: accepted non self-signed user ID '" msgstr "chiave %08lX: accettato l'user-id non autofirmato '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped user-id '" +#, fuzzy, c-format +msgid "key %08lX: skipped user ID '" msgstr "chiave %08lX: saltato l'user-id '" #: g10/import.c:821 @@ -1822,7 +1824,7 @@ msgstr "chiave %08lX: trovato un user ID duplicato - unito\n" msgid "key %08lX: revocation certificate added\n" msgstr "chiave %08lX: certificato di revoca aggiunto\n" -#: g10/import.c:1127 g10/import.c:1182 +#: g10/import.c:1128 g10/import.c:1183 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "chiave %08lX: la nostra copia non ha autofirma\n" @@ -1868,12 +1870,13 @@ msgid "%d signatures not checked due to errors\n" msgstr "%d firme non controllate a causa di errori\n" #: g10/keyedit.c:231 -msgid "1 user id without valid self-signature detected\n" +#, fuzzy +msgid "1 user ID without valid self-signature detected\n" msgstr "Trovato 1 user id senza autofirma valida\n" #: g10/keyedit.c:233 -#, c-format -msgid "%d user ids without valid self-signatures detected\n" +#, fuzzy, c-format +msgid "%d user IDs without valid self-signatures detected\n" msgstr "Trovati %d user id senza autofirme valide\n" #. Fixme: see whether there is a revocation in which @@ -1987,7 +1990,8 @@ msgid "list" msgstr "list" #: g10/keyedit.c:570 -msgid "list key and user ids" +#, fuzzy +msgid "list key and user IDs" msgstr "elenca le chiavi e gli user id" #: g10/keyedit.c:571 @@ -1999,7 +2003,8 @@ msgid "uid" msgstr "uid" #: g10/keyedit.c:572 -msgid "select user id N" +#, fuzzy +msgid "select user ID N" msgstr "scegli l'user id N" #: g10/keyedit.c:573 @@ -2051,7 +2056,8 @@ msgid "adduid" msgstr "adduid" #: g10/keyedit.c:580 -msgid "add a user id" +#, fuzzy +msgid "add a user ID" msgstr "aggiungi un user id" #: g10/keyedit.c:581 @@ -2059,7 +2065,8 @@ msgid "deluid" msgstr "deluid" #: g10/keyedit.c:581 -msgid "delete user id" +#, fuzzy +msgid "delete user ID" msgstr "cancella un user id" #: g10/keyedit.c:582 @@ -2181,11 +2188,13 @@ msgid "Need the secret key to do this.\n" msgstr "Per fare questo serve la chiave segreta.\n" #: g10/keyedit.c:758 -msgid "Really sign all user ids? " +#, fuzzy +msgid "Really sign all user IDs? " msgstr "Firmo davvero tutti gli user id? " #: g10/keyedit.c:759 -msgid "Hint: Select the user ids to sign\n" +#, fuzzy +msgid "Hint: Select the user IDs to sign\n" msgstr "Suggerimento: seleziona gli user id da firmare\n" #: g10/keyedit.c:786 g10/keyedit.c:968 @@ -2194,19 +2203,23 @@ 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" +#, fuzzy +msgid "You must select at least one user ID.\n" msgstr "Devi selezionare almeno un user id.\n" #: g10/keyedit.c:799 -msgid "You can't delete the last user id!\n" +#, fuzzy +msgid "You can't delete the last user ID!\n" msgstr "Non puoi cancellare l'ultimo user id!\n" #: g10/keyedit.c:802 -msgid "Really remove all selected user ids? " +#, fuzzy +msgid "Really remove all selected user IDs? " msgstr "Tolgo davvero tutti gli user id selezionati? " #: g10/keyedit.c:803 -msgid "Really remove this user id? " +#, fuzzy +msgid "Really remove this user ID? " msgstr "Tolgo davvero questo user id? " #: g10/keyedit.c:839 g10/keyedit.c:861 @@ -2314,8 +2327,8 @@ msgid "No corresponding signature in secret ring\n" msgstr "Manca la firma corrispondente nel portachiavi segreto\n" #: g10/keyedit.c:1566 -#, c-format -msgid "No user id with index %d\n" +#, fuzzy, c-format +msgid "No user ID with index %d\n" msgstr "Nessun user id con l'indice %d\n" #: g10/keyedit.c:1612 @@ -2438,11 +2451,11 @@ msgstr " anche noto come \"" msgid "Can't check signature: %s\n" msgstr "Impossibile controllare la firma: %s\n" -#: g10/mainproc.c:1209 +#: g10/mainproc.c:1212 msgid "old style (PGP 2.x) signature\n" msgstr "firma vecchio stile (PGP 2.x)\n" -#: g10/mainproc.c:1214 +#: g10/mainproc.c:1217 msgid "invalid root packet detected in proc_tree()\n" msgstr "individuato un pacchetto radice non valido in proc_tree()\n" @@ -2519,15 +2532,15 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n" -#: g10/plaintext.c:266 +#: g10/plaintext.c:267 msgid "Please enter name of data file: " msgstr "Inserisci il nome del file di dati: " -#: g10/plaintext.c:287 +#: g10/plaintext.c:288 msgid "reading stdin ...\n" msgstr "viene letto stdin...\n" -#: g10/plaintext.c:360 +#: g10/plaintext.c:371 #, c-format msgid "can't open signed data `%s'\n" msgstr "impossibile aprire i dati firmati `%s'\n" @@ -2982,7 +2995,8 @@ msgid "Ooops, no keys\n" msgstr "Ooops, mancano le chiavi\n" #: g10/trustdb.c:2061 -msgid "Ooops, no user ids\n" +#, fuzzy +msgid "Ooops, no user IDs\n" msgstr "Ooops, mancano gli user id\n" #: g10/trustdb.c:2218 @@ -3167,66 +3181,69 @@ msgstr "" #: g10/helptext.c:61 msgid "" -"Enter the user id of the addressee to whom you want to send the message." +"Enter the user ID of the addressee to whom you want to send the message." msgstr "" #: g10/helptext.c:65 msgid "" "Select the algorithm to use.\n" +"\n" "DSA (aka DSS) is the digital signature algorithm which can only be used\n" "for signatures. This is the suggested algorithm because verification of\n" "DSA signatures are much faster than those of ElGamal.\n" +"\n" "ElGamal is an algorithm which can be used for signatures and encryption.\n" -"OpenPGP distunguishs between two flavors of this algorithms: an encrypt " +"OpenPGP distinguishs between two flavors of this algorithms: an encrypt " "only\n" "and a sign+encrypt; actually it is the same, but some parameters must be\n" "selected in a special way to create a safe key for signatures: this program\n" "does this but other OpenPGP implementations are not required to understand\n" "the signature+encryption flavor.\n" +"\n" "The first (primary) key must always be a key which is capable of signing;\n" "this is the reason why the encryption only ElGamal key is not available in\n" "this menu." msgstr "" -#: g10/helptext.c:82 +#: g10/helptext.c:85 msgid "" "Although these keys are defined in RFC2440 they are not suggested\n" "because they are not supported by all programs and signatures created\n" "with them are quite large and very slow to verify." msgstr "" -#: g10/helptext.c:89 +#: g10/helptext.c:92 #, fuzzy msgid "Enter the size of the key" msgstr "Inserisci l'user ID: " -#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142 -#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157 +#: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145 +#: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160 msgid "Answer \"yes\" or \"no\"" msgstr "" -#: g10/helptext.c:103 +#: g10/helptext.c:106 msgid "" -"Enter the required value as shown in the pronpt.\n" +"Enter the required value as shown in the prompt.\n" "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n" "get a good error response - instead the system tries to interpret\n" "the given value as an interval." msgstr "" -#: g10/helptext.c:115 +#: g10/helptext.c:118 msgid "Enter the name of the key holder" msgstr "" -#: g10/helptext.c:120 +#: g10/helptext.c:123 msgid "please enter an optional but highly suggested email address" msgstr "" -#: g10/helptext.c:124 +#: g10/helptext.c:127 #, fuzzy msgid "Please enter an optional comment" msgstr "Inserisci il nome del file di dati: " -#: g10/helptext.c:129 +#: g10/helptext.c:132 msgid "" "N to change the name.\n" "C to change the comment.\n" @@ -3235,32 +3252,32 @@ msgid "" "Q to to quit the key generation." msgstr "" -#: g10/helptext.c:138 +#: g10/helptext.c:141 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." msgstr "" -#: g10/helptext.c:161 +#: g10/helptext.c:164 msgid "Answer \"yes\" is you want to sign ALL the user IDs" msgstr "" -#: g10/helptext.c:165 +#: g10/helptext.c:168 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -#: g10/helptext.c:170 +#: g10/helptext.c:173 msgid "Answer \"yes\" if it is okay to delete the subkey" msgstr "" -#: g10/helptext.c:175 +#: g10/helptext.c:178 msgid "" "This is a valid signature on the key; you normally don't want\n" -"to delete this signature may be important to establish a trust\n" -"connection to the key or another key certified by this key." +"to delete this signature because it may be important to establish a\n" +"trust connection to the key or another key certified by this key." msgstr "" -#: g10/helptext.c:180 +#: g10/helptext.c:183 msgid "" "This signature can't be checked because you don't have the\n" "corresponding key. You should postpone its deletion until you\n" @@ -3268,13 +3285,13 @@ msgid "" "connection through another already certified key." msgstr "" -#: g10/helptext.c:186 +#: g10/helptext.c:189 msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." msgstr "" -#: g10/helptext.c:190 +#: g10/helptext.c:193 msgid "" "This is a signature which binds the user ID to the key. It is\n" "usually not a good idea to remove such a signature. Actually\n" @@ -3283,35 +3300,35 @@ msgid "" "a second one is available." msgstr "" -#: g10/helptext.c:199 +#: g10/helptext.c:202 msgid "" "Please enter the passhrase; this is a secret sentence \n" " Blurb, blurb,.... " msgstr "" -#: g10/helptext.c:206 +#: g10/helptext.c:209 msgid "Please repeat the last passphrase, so you are sure what you typed in." msgstr "" -#: g10/helptext.c:210 +#: g10/helptext.c:213 msgid "Give the name fo the file to which the signature applies" msgstr "" -#: g10/helptext.c:215 +#: g10/helptext.c:218 msgid "Answer \"yes\" if it is okay to overwrite the file" msgstr "" -#: g10/helptext.c:220 +#: g10/helptext.c:223 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." msgstr "" -#: g10/helptext.c:234 +#: g10/helptext.c:237 msgid "No help available" msgstr "Non � disponibile un aiuto" -#: g10/helptext.c:242 +#: g10/helptext.c:245 #, c-format msgid "No help available for `%s'" msgstr "Non � disponibile un aiuto per `%s'" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.9.7\n" -"POT-Creation-Date: 1999-08-30 19:40+0200\n" +"POT-Creation-Date: 1999-09-02 14:44+0200\n" "PO-Revision-Date: 1999-05-30 19:08+02:00\n" "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" @@ -34,27 +34,27 @@ msgstr "operacja niemo�liwa do wykonania bez dost�pnej pami�ci bezpiecznej\n" msgid "(you may have used the wrong program for this task)\n" msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n" -#: util/miscutil.c:254 util/miscutil.c:283 +#: util/miscutil.c:277 util/miscutil.c:306 msgid "yes" msgstr "tak" -#: util/miscutil.c:255 util/miscutil.c:286 +#: util/miscutil.c:278 util/miscutil.c:309 msgid "yY" msgstr "tT" -#: util/miscutil.c:256 util/miscutil.c:284 +#: util/miscutil.c:279 util/miscutil.c:307 msgid "no" msgstr "" -#: util/miscutil.c:257 util/miscutil.c:287 +#: util/miscutil.c:280 util/miscutil.c:310 msgid "nN" msgstr "" -#: g10/keyedit.c:564 util/miscutil.c:285 +#: g10/keyedit.c:564 util/miscutil.c:308 msgid "quit" msgstr "wyj�cie" -#: util/miscutil.c:288 +#: util/miscutil.c:311 #, fuzzy msgid "qQ" msgstr "w" @@ -1333,11 +1333,11 @@ msgstr "Klucz nie ma daty wa�no�ci (nie traci wa�no�ci z up�ywem czasu).\n" msgid "Key expires at %s\n" msgstr "Data wa�no�ci klucza: %s\n" -#: g10/keygen.c:564 +#: g10/keygen.c:563 msgid "Is this correct (y/n)? " msgstr "Dane poprawne (t/n)? " -#: g10/keygen.c:607 +#: g10/keygen.c:606 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1353,44 +1353,44 @@ msgstr "" " \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n" "\n" -#: g10/keygen.c:618 +#: g10/keygen.c:617 msgid "Real name: " msgstr "Imi� i nazwisko: " -#: g10/keygen.c:622 +#: g10/keygen.c:621 msgid "Invalid character in name\n" msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n" -#: g10/keygen.c:624 +#: g10/keygen.c:623 msgid "Name may not start with a digit\n" msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n" -#: g10/keygen.c:626 +#: g10/keygen.c:625 msgid "Name must be at least 5 characters long\n" msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n" -#: g10/keygen.c:634 +#: g10/keygen.c:633 msgid "Email address: " msgstr "Adres poczty elektronicznej: " -#: g10/keygen.c:645 +#: g10/keygen.c:644 msgid "Not a valid email address\n" msgstr "To nie jest poprawny adres poczty elektronicznej\n" -#: g10/keygen.c:653 +#: g10/keygen.c:652 msgid "Comment: " msgstr "Komentarz: " -#: g10/keygen.c:659 +#: g10/keygen.c:658 msgid "Invalid character in comment\n" msgstr "Niew�a�ciwy znak w komentarzu\n" -#: g10/keygen.c:681 +#: g10/keygen.c:680 #, c-format msgid "You are using the `%s' character set.\n" msgstr "U�ywasz zestawu znak�w %s.\n" -#: g10/keygen.c:687 +#: g10/keygen.c:686 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1401,31 +1401,31 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:690 +#: g10/keygen.c:689 msgid "NnCcEeOoQq" msgstr "IiKkEeDdWw" -#: g10/keygen.c:700 +#: g10/keygen.c:699 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n" "przej�� (D)alej czy (W)yj�� z programu ? " -#: g10/keygen.c:752 +#: g10/keygen.c:751 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" msgstr "" "Musisz poda� wyra�enie przej�ciowe (has�o) aby ochroni� sw�j klucz tajny.\n" -#: g10/keyedit.c:456 g10/keygen.c:760 +#: g10/keyedit.c:456 g10/keygen.c:759 msgid "passphrase not correctly repeated; try again.\n" msgstr "" "Powt�rzone wyra�enie przej�ciowe nie zgadza si� z podanym w pierwszej " "pr�bie;\n" "spr�buj jeszcze raz.\n" -#: g10/keygen.c:766 +#: g10/keygen.c:765 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -1437,7 +1437,7 @@ msgstr "" "i opcji \"--edit-key\".\n" "\n" -#: g10/keygen.c:787 +#: g10/keygen.c:786 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -1451,34 +1451,34 @@ msgstr "" "generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci " "entropii.\n" -#: g10/keygen.c:857 +#: g10/keygen.c:856 msgid "Key generation can only be used in interactive mode\n" msgstr "Generacj� klucza mo�na wykonywa� tylko w trybie interaktywnym\n" -#: g10/keygen.c:865 +#: g10/keygen.c:864 msgid "DSA keypair will have 1024 bits.\n" msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n" -#: g10/keygen.c:871 +#: g10/keygen.c:870 #, fuzzy msgid "Key generation canceled.\n" msgstr "Procedura generacji klucza zosta�a anulowana.\n" -#: g10/keygen.c:881 +#: g10/keygen.c:880 #, c-format msgid "writing public certificate to `%s'\n" msgstr "zapisuj� certyfikat publiczny w '%s'\n" -#: g10/keygen.c:882 +#: g10/keygen.c:881 #, c-format msgid "writing secret certificate to `%s'\n" msgstr "zapisuj� certyfikat prywatny w '%s'\n" -#: g10/keygen.c:959 +#: g10/keygen.c:958 msgid "public and secret key created and signed.\n" msgstr "Prywatny i publiczny klucz zosta� stworzony i podpisany.\n" -#: g10/keygen.c:961 +#: g10/keygen.c:960 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1486,12 +1486,12 @@ msgstr "" "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\" \n" "mo�na doda� do niego podklucz u�ywany do szyfrowania.\n" -#: g10/keygen.c:975 g10/keygen.c:1074 +#: g10/keygen.c:974 g10/keygen.c:1073 #, c-format msgid "Key generation failed: %s\n" msgstr "Generacja klucza nie powiod�a si�: %s\n" -#: g10/keygen.c:1019 g10/sig-check.c:312 g10/sign.c:105 +#: g10/keygen.c:1018 g10/sig-check.c:312 g10/sign.c:105 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1499,7 +1499,7 @@ msgstr "" "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n" "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n" -#: g10/keygen.c:1021 g10/sig-check.c:314 g10/sign.c:107 +#: g10/keygen.c:1020 g10/sig-check.c:314 g10/sign.c:107 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1507,7 +1507,7 @@ msgstr "" "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n" "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n" -#: g10/keygen.c:1052 +#: g10/keygen.c:1051 msgid "Really create? " msgstr "Na pewno generowa�? " @@ -1570,12 +1570,12 @@ msgstr "" #: g10/getkey.c:1291 g10/getkey.c:1330 #, fuzzy -msgid "No key for user-id\n" +msgid "No key for user ID\n" msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n" #: g10/getkey.c:1369 g10/getkey.c:1409 #, fuzzy -msgid "No user-id for key\n" +msgid "No user ID for key\n" msgstr "brak klucza prywatnego\n" #: g10/getkey.c:1565 g10/getkey.c:1621 @@ -1659,13 +1659,13 @@ msgid " secret keys unchanged: %lu\n" msgstr " tajnych kluczy bez zmian: %lu\n" #: g10/import.c:362 g10/import.c:554 -#, c-format -msgid "key %08lX: no user id\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID\n" msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n" #: g10/import.c:376 -#, c-format -msgid "key %08lX: no valid user ids\n" +#, fuzzy, c-format +msgid "key %08lX: no valid user IDs\n" msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n" #: g10/import.c:378 @@ -1717,13 +1717,13 @@ 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:469 -#, c-format -msgid "key %08lX: 1 new user-id\n" +#, fuzzy, c-format +msgid "key %08lX: 1 new user ID\n" msgstr "klucz %08lX: 1 nowy identyfikator u�ytkownika\n" #: g10/import.c:472 -#, c-format -msgid "key %08lX: %d new user-ids\n" +#, fuzzy, c-format +msgid "key %08lX: %d new user IDs\n" msgstr "klucz %08lX: %d nowych identyfikator�w u�ytkownika\n" #: g10/import.c:475 @@ -1787,8 +1787,8 @@ msgid "key %08lX: revocation certificate imported\n" msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n" #: g10/import.c:711 -#, c-format -msgid "key %08lX: no user-id for signature\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID for signature\n" msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n" #: g10/import.c:718 g10/import.c:742 @@ -1814,12 +1814,12 @@ msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n" #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed user-id '" +msgid "key %08lX: accepted non self-signed user ID '" msgstr "klucz %08lX: zosta� pomini�ty identyfikator u�ytkownika '" #: g10/import.c:798 #, fuzzy, c-format -msgid "key %08lX: skipped user-id '" +msgid "key %08lX: skipped user ID '" msgstr "klucz %08lX: zosta� pomini�ty identyfikator u�ytkownika '" #: g10/import.c:821 @@ -1858,7 +1858,7 @@ msgstr "key %08lX: powt�rzony identyfikator u�ytkownika - do��czony\n" msgid "key %08lX: revocation certificate added\n" msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n" -#: g10/import.c:1127 g10/import.c:1182 +#: g10/import.c:1128 g10/import.c:1183 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n" @@ -1904,12 +1904,13 @@ msgid "%d signatures not checked due to errors\n" msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n" #: g10/keyedit.c:231 -msgid "1 user id without valid self-signature detected\n" +#, fuzzy +msgid "1 user ID without valid self-signature detected\n" msgstr "wykryto 1 identyfikator u�ytkownika bez podpisu w�a�ciciela klucza\n" #: g10/keyedit.c:233 -#, c-format -msgid "%d user ids without valid self-signatures detected\n" +#, fuzzy, c-format +msgid "%d user IDs without valid self-signatures detected\n" msgstr "" "wykryto %d identyfikator�w u�ytkownika bez podpis�w w�a�ciciela klucza\n" @@ -2024,7 +2025,8 @@ msgid "list" msgstr "lista" #: g10/keyedit.c:570 -msgid "list key and user ids" +#, fuzzy +msgid "list key and user IDs" msgstr "lista kluczy i identyfikator�w u�ytkownik�w" #: g10/keyedit.c:571 @@ -2036,7 +2038,8 @@ msgid "uid" msgstr "id" #: g10/keyedit.c:572 -msgid "select user id N" +#, fuzzy +msgid "select user ID N" msgstr "wyb�r identyfikatora u�ytkownika N" #: g10/keyedit.c:573 @@ -2088,7 +2091,8 @@ msgid "adduid" msgstr "dodid" #: g10/keyedit.c:580 -msgid "add a user id" +#, fuzzy +msgid "add a user ID" msgstr "dodanie nowego identyfikatora u�ytkownika do klucza" #: g10/keyedit.c:581 @@ -2096,7 +2100,8 @@ msgid "deluid" msgstr "usid" #: g10/keyedit.c:581 -msgid "delete user id" +#, fuzzy +msgid "delete user ID" msgstr "usuni�cie identyfikatora u�ytkownika z klucza" #: g10/keyedit.c:582 @@ -2222,11 +2227,13 @@ msgid "Need the secret key to do this.\n" msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n" #: g10/keyedit.c:758 -msgid "Really sign all user ids? " +#, fuzzy +msgid "Really sign all user IDs? " msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? " #: g10/keyedit.c:759 -msgid "Hint: Select the user ids to sign\n" +#, fuzzy +msgid "Hint: Select the user IDs to sign\n" msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n" #: g10/keyedit.c:786 g10/keyedit.c:968 @@ -2235,19 +2242,23 @@ 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" +#, fuzzy +msgid "You must select at least one user ID.\n" msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n" #: g10/keyedit.c:799 -msgid "You can't delete the last user id!\n" +#, fuzzy +msgid "You can't delete the last user ID!\n" msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n" #: g10/keyedit.c:802 -msgid "Really remove all selected user ids? " +#, fuzzy +msgid "Really remove all selected user IDs? " msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? " #: g10/keyedit.c:803 -msgid "Really remove this user id? " +#, fuzzy +msgid "Really remove this user ID? " msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? " #: g10/keyedit.c:839 g10/keyedit.c:861 @@ -2362,8 +2373,8 @@ msgid "No corresponding signature in secret ring\n" msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n" #: g10/keyedit.c:1566 -#, c-format -msgid "No user id with index %d\n" +#, fuzzy, c-format +msgid "No user ID with index %d\n" msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n" #: g10/keyedit.c:1612 @@ -2491,11 +2502,11 @@ msgstr " alias \"" msgid "Can't check signature: %s\n" msgstr "Nie mog� sprawdzi� podpisu: %s\n" -#: g10/mainproc.c:1209 +#: g10/mainproc.c:1212 msgid "old style (PGP 2.x) signature\n" msgstr "podpis starego typu (PGP 2.x)\n" -#: g10/mainproc.c:1214 +#: g10/mainproc.c:1217 msgid "invalid root packet detected in proc_tree()\n" msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n" @@ -2574,15 +2585,15 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "dane nie zosta�y zapisane; nale�y u�y� opcji \"--output\" aby je zapisa�\n" -#: g10/plaintext.c:266 +#: g10/plaintext.c:267 msgid "Please enter name of data file: " msgstr "Nazwa pliku danych: " -#: g10/plaintext.c:287 +#: g10/plaintext.c:288 msgid "reading stdin ...\n" msgstr "czytam strumie� standardowego wej�cia\n" -#: g10/plaintext.c:360 +#: g10/plaintext.c:371 #, c-format msgid "can't open signed data `%s'\n" msgstr "nie mo�na otworzy� podpisanego pliku '%s'\n" @@ -3042,7 +3053,8 @@ msgid "Ooops, no keys\n" msgstr "Oops, brak kluczy\n" #: g10/trustdb.c:2061 -msgid "Ooops, no user ids\n" +#, fuzzy +msgid "Ooops, no user IDs\n" msgstr "Oops, brak identyfikator�w u�ytkownik�w\n" #: g10/trustdb.c:2218 @@ -3227,66 +3239,69 @@ msgstr "" #: g10/helptext.c:61 msgid "" -"Enter the user id of the addressee to whom you want to send the message." +"Enter the user ID of the addressee to whom you want to send the message." msgstr "" #: g10/helptext.c:65 msgid "" "Select the algorithm to use.\n" +"\n" "DSA (aka DSS) is the digital signature algorithm which can only be used\n" "for signatures. This is the suggested algorithm because verification of\n" "DSA signatures are much faster than those of ElGamal.\n" +"\n" "ElGamal is an algorithm which can be used for signatures and encryption.\n" -"OpenPGP distunguishs between two flavors of this algorithms: an encrypt " +"OpenPGP distinguishs between two flavors of this algorithms: an encrypt " "only\n" "and a sign+encrypt; actually it is the same, but some parameters must be\n" "selected in a special way to create a safe key for signatures: this program\n" "does this but other OpenPGP implementations are not required to understand\n" "the signature+encryption flavor.\n" +"\n" "The first (primary) key must always be a key which is capable of signing;\n" "this is the reason why the encryption only ElGamal key is not available in\n" "this menu." msgstr "" -#: g10/helptext.c:82 +#: g10/helptext.c:85 msgid "" "Although these keys are defined in RFC2440 they are not suggested\n" "because they are not supported by all programs and signatures created\n" "with them are quite large and very slow to verify." msgstr "" -#: g10/helptext.c:89 +#: g10/helptext.c:92 #, fuzzy msgid "Enter the size of the key" msgstr "Wprowad� identyfikator u�ytkownika (user ID): " -#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142 -#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157 +#: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145 +#: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160 msgid "Answer \"yes\" or \"no\"" msgstr "" -#: g10/helptext.c:103 +#: g10/helptext.c:106 msgid "" -"Enter the required value as shown in the pronpt.\n" +"Enter the required value as shown in the prompt.\n" "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n" "get a good error response - instead the system tries to interpret\n" "the given value as an interval." msgstr "" -#: g10/helptext.c:115 +#: g10/helptext.c:118 msgid "Enter the name of the key holder" msgstr "" -#: g10/helptext.c:120 +#: g10/helptext.c:123 msgid "please enter an optional but highly suggested email address" msgstr "" -#: g10/helptext.c:124 +#: g10/helptext.c:127 #, fuzzy msgid "Please enter an optional comment" msgstr "Nazwa pliku danych: " -#: g10/helptext.c:129 +#: g10/helptext.c:132 msgid "" "N to change the name.\n" "C to change the comment.\n" @@ -3295,32 +3310,32 @@ msgid "" "Q to to quit the key generation." msgstr "" -#: g10/helptext.c:138 +#: g10/helptext.c:141 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." msgstr "" -#: g10/helptext.c:161 +#: g10/helptext.c:164 msgid "Answer \"yes\" is you want to sign ALL the user IDs" msgstr "" -#: g10/helptext.c:165 +#: g10/helptext.c:168 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -#: g10/helptext.c:170 +#: g10/helptext.c:173 msgid "Answer \"yes\" if it is okay to delete the subkey" msgstr "" -#: g10/helptext.c:175 +#: g10/helptext.c:178 msgid "" "This is a valid signature on the key; you normally don't want\n" -"to delete this signature may be important to establish a trust\n" -"connection to the key or another key certified by this key." +"to delete this signature because it may be important to establish a\n" +"trust connection to the key or another key certified by this key." msgstr "" -#: g10/helptext.c:180 +#: g10/helptext.c:183 msgid "" "This signature can't be checked because you don't have the\n" "corresponding key. You should postpone its deletion until you\n" @@ -3328,13 +3343,13 @@ msgid "" "connection through another already certified key." msgstr "" -#: g10/helptext.c:186 +#: g10/helptext.c:189 msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." msgstr "" -#: g10/helptext.c:190 +#: g10/helptext.c:193 msgid "" "This is a signature which binds the user ID to the key. It is\n" "usually not a good idea to remove such a signature. Actually\n" @@ -3343,35 +3358,35 @@ msgid "" "a second one is available." msgstr "" -#: g10/helptext.c:199 +#: g10/helptext.c:202 msgid "" "Please enter the passhrase; this is a secret sentence \n" " Blurb, blurb,.... " msgstr "" -#: g10/helptext.c:206 +#: g10/helptext.c:209 msgid "Please repeat the last passphrase, so you are sure what you typed in." msgstr "" -#: g10/helptext.c:210 +#: g10/helptext.c:213 msgid "Give the name fo the file to which the signature applies" msgstr "" -#: g10/helptext.c:215 +#: g10/helptext.c:218 msgid "Answer \"yes\" if it is okay to overwrite the file" msgstr "" -#: g10/helptext.c:220 +#: g10/helptext.c:223 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." msgstr "" -#: g10/helptext.c:234 +#: g10/helptext.c:237 msgid "No help available" msgstr "Pomoc niedost�pna" -#: g10/helptext.c:242 +#: g10/helptext.c:245 #, c-format msgid "No help available for `%s'" msgstr "Brak pomocy o '%s'" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6c9eadb92..e3f7dd346 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1999-08-30 19:40+0200\n" +"POT-Creation-Date: 1999-09-02 14:44+0200\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-20 23:46:36-0200\n" "From: Thiago Jung Bauermann <[email protected]>\n" @@ -29,29 +29,29 @@ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n" msgid "(you may have used the wrong program for this task)\n" msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n" -#: util/miscutil.c:254 util/miscutil.c:283 +#: util/miscutil.c:277 util/miscutil.c:306 msgid "yes" msgstr "sim" -#: util/miscutil.c:255 util/miscutil.c:286 +#: util/miscutil.c:278 util/miscutil.c:309 msgid "yY" msgstr "sS" -#: util/miscutil.c:256 util/miscutil.c:284 +#: util/miscutil.c:279 util/miscutil.c:307 msgid "no" msgstr "" -#: util/miscutil.c:257 util/miscutil.c:287 +#: util/miscutil.c:280 util/miscutil.c:310 msgid "nN" msgstr "" # INICIO MENU -#: g10/keyedit.c:564 util/miscutil.c:285 +#: g10/keyedit.c:564 util/miscutil.c:308 msgid "quit" msgstr "sair" # XXX -#: util/miscutil.c:288 +#: util/miscutil.c:311 #, fuzzy msgid "qQ" msgstr "s" @@ -1344,11 +1344,11 @@ msgstr "A chave n�o expira nunca\n" msgid "Key expires at %s\n" msgstr "A chave expira em %s\n" -#: g10/keygen.c:564 +#: g10/keygen.c:563 msgid "Is this correct (y/n)? " msgstr "Est� correto (s/n)? " -#: g10/keygen.c:607 +#: g10/keygen.c:606 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1364,44 +1364,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) <[email protected]>\"\n" "\n" -#: g10/keygen.c:618 +#: g10/keygen.c:617 msgid "Real name: " msgstr "Nome completo: " -#: g10/keygen.c:622 +#: g10/keygen.c:621 msgid "Invalid character in name\n" msgstr "Caractere inv�lido no nome\n" -#: g10/keygen.c:624 +#: g10/keygen.c:623 msgid "Name may not start with a digit\n" msgstr "O nome n�o pode come�ar com um d�gito\n" -#: g10/keygen.c:626 +#: g10/keygen.c:625 msgid "Name must be at least 5 characters long\n" msgstr "O nome deve ter pelo menos 5 caracteres\n" -#: g10/keygen.c:634 +#: g10/keygen.c:633 msgid "Email address: " msgstr "Endere�o de correio eletr�nico: " -#: g10/keygen.c:645 +#: g10/keygen.c:644 msgid "Not a valid email address\n" msgstr "Endere�o eletr�nico inv�lido\n" -#: g10/keygen.c:653 +#: g10/keygen.c:652 msgid "Comment: " msgstr "Coment�rio: " -#: g10/keygen.c:659 +#: g10/keygen.c:658 msgid "Invalid character in comment\n" msgstr "Caractere inv�lido no coment�rio\n" -#: g10/keygen.c:681 +#: g10/keygen.c:680 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n" -#: g10/keygen.c:687 +#: g10/keygen.c:686 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1412,15 +1412,15 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:690 +#: g10/keygen.c:689 msgid "NnCcEeOoQq" msgstr "NnCcEeOoSs" -#: g10/keygen.c:700 +#: g10/keygen.c:699 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? " -#: g10/keygen.c:752 +#: g10/keygen.c:751 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1428,11 +1428,11 @@ msgstr "" "Voc� precisa de uma frase secreta para proteger sua chave.\n" "\n" -#: g10/keyedit.c:456 g10/keygen.c:760 +#: g10/keyedit.c:456 g10/keygen.c:759 msgid "passphrase not correctly repeated; try again.\n" msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n" -#: g10/keygen.c:766 +#: g10/keygen.c:765 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -1444,7 +1444,7 @@ msgstr "" "qualquer hora, usando este programa com a op��o \"--edit-key\".\n" "\n" -#: g10/keygen.c:787 +#: g10/keygen.c:786 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -1456,33 +1456,33 @@ msgstr "" "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n" "uma chance melhor de conseguir entropia suficiente.\n" -#: g10/keygen.c:857 +#: g10/keygen.c:856 msgid "Key generation can only be used in interactive mode\n" msgstr "A gera��o de chaves s� pode ser feita em modo interativo\n" -#: g10/keygen.c:865 +#: g10/keygen.c:864 msgid "DSA keypair will have 1024 bits.\n" msgstr "O par de chaves DSA ter� 1024 bits.\n" -#: g10/keygen.c:871 +#: g10/keygen.c:870 msgid "Key generation canceled.\n" msgstr "Gera��o de chaves cancelada.\n" -#: g10/keygen.c:881 +#: g10/keygen.c:880 #, c-format msgid "writing public certificate to `%s'\n" msgstr "escrevendo certificado p�blico para `%s'\n" -#: g10/keygen.c:882 +#: g10/keygen.c:881 #, c-format msgid "writing secret certificate to `%s'\n" msgstr "escrevendo certificado privado para `%s'\n" -#: g10/keygen.c:959 +#: g10/keygen.c:958 msgid "public and secret key created and signed.\n" msgstr "chaves p�blica e privada criadas e assinadas.\n" -#: g10/keygen.c:961 +#: g10/keygen.c:960 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1490,12 +1490,12 @@ msgstr "" "Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n" "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n" -#: g10/keygen.c:975 g10/keygen.c:1074 +#: g10/keygen.c:974 g10/keygen.c:1073 #, c-format msgid "Key generation failed: %s\n" msgstr "A gera��o de chaves falhou: %s\n" -#: g10/keygen.c:1019 g10/sig-check.c:312 g10/sign.c:105 +#: g10/keygen.c:1018 g10/sig-check.c:312 g10/sign.c:105 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1503,7 +1503,7 @@ msgstr "" "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no rel�gio)\n" -#: g10/keygen.c:1021 g10/sig-check.c:314 g10/sign.c:107 +#: g10/keygen.c:1020 g10/sig-check.c:314 g10/sign.c:107 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1511,7 +1511,7 @@ msgstr "" "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no rel�gio)\n" -#: g10/keygen.c:1052 +#: g10/keygen.c:1051 msgid "Really create? " msgstr "Realmente criar? " @@ -1573,11 +1573,13 @@ msgid "RSA key cannot be used in this version\n" msgstr "chave RSA n�o pode ser usada nesta vers�o\n" #: g10/getkey.c:1291 g10/getkey.c:1330 -msgid "No key for user-id\n" +#, fuzzy +msgid "No key for user ID\n" msgstr "Nenhuma chave para identificador de usu�rio\n" #: g10/getkey.c:1369 g10/getkey.c:1409 -msgid "No user-id for key\n" +#, fuzzy +msgid "No user ID for key\n" msgstr "Nenhum identificador de usu�rio para chave\n" #: g10/getkey.c:1565 g10/getkey.c:1621 @@ -1661,13 +1663,13 @@ msgid " secret keys unchanged: %lu\n" msgstr " chaves secretas n�o modificadas: %lu\n" #: g10/import.c:362 g10/import.c:554 -#, c-format -msgid "key %08lX: no user id\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID\n" msgstr "chave %08lX: sem id de usu�rio\n" #: g10/import.c:376 -#, c-format -msgid "key %08lX: no valid user ids\n" +#, fuzzy, c-format +msgid "key %08lX: no valid user IDs\n" msgstr "chave %08lX: sem ids de usu�rios v�lidos\n" #: g10/import.c:378 @@ -1719,13 +1721,13 @@ 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:469 -#, c-format -msgid "key %08lX: 1 new user-id\n" +#, fuzzy, c-format +msgid "key %08lX: 1 new user ID\n" msgstr "chave %8lX: 1 novo id de usu�rio\n" #: g10/import.c:472 -#, c-format -msgid "key %08lX: %d new user-ids\n" +#, fuzzy, c-format +msgid "key %08lX: %d new user IDs\n" msgstr "chave %08lX: %d novos ids de usu�rios\n" #: g10/import.c:475 @@ -1787,8 +1789,8 @@ msgid "key %08lX: revocation certificate imported\n" msgstr "chave %08lX: certificado de revoga��o importado\n" #: g10/import.c:711 -#, c-format -msgid "key %08lX: no user-id for signature\n" +#, fuzzy, 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:718 g10/import.c:742 @@ -1812,13 +1814,13 @@ msgid "key %08lX: invalid subkey binding\n" msgstr "chave %08lX: liga��o de subchave inv�lida\n" #: g10/import.c:769 -#, c-format -msgid "key %08lX: accepted non self-signed user-id '" +#, fuzzy, c-format +msgid "key %08lX: accepted non self-signed user ID '" msgstr "chave %08lX: id de usu�rio sem auto-assinatura aceito '" #: g10/import.c:798 -#, c-format -msgid "key %08lX: skipped user-id '" +#, fuzzy, c-format +msgid "key %08lX: skipped user ID '" msgstr "chave %08lX: id de usu�rio ignorado '" #: g10/import.c:821 @@ -1855,7 +1857,7 @@ msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n" msgid "key %08lX: revocation certificate added\n" msgstr "chave %08lX: certificado de revoga��o adicionado\n" -#: g10/import.c:1127 g10/import.c:1182 +#: g10/import.c:1128 g10/import.c:1183 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n" @@ -1901,12 +1903,13 @@ msgid "%d signatures not checked due to errors\n" msgstr "%d assinaturas n�o verificadas devido a erros\n" #: g10/keyedit.c:231 -msgid "1 user id without valid self-signature detected\n" +#, fuzzy +msgid "1 user ID without valid self-signature detected\n" msgstr "1 id de usu�rio sem auto-assinatura v�lida detectado\n" #: g10/keyedit.c:233 -#, c-format -msgid "%d user ids without valid self-signatures detected\n" +#, fuzzy, c-format +msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d ids de usu�rios sem auto-assinaturas v�lidas detectados\n" #. Fixme: see whether there is a revocation in which @@ -2025,7 +2028,8 @@ msgid "list" msgstr "lista" #: g10/keyedit.c:570 -msgid "list key and user ids" +#, fuzzy +msgid "list key and user IDs" msgstr "lista chave e identifica��es de usu�rios" # ??? @@ -2040,7 +2044,8 @@ msgid "uid" msgstr "uid" #: g10/keyedit.c:572 -msgid "select user id N" +#, fuzzy +msgid "select user ID N" msgstr "seleciona id de usu�rio N" #: g10/keyedit.c:573 @@ -2101,7 +2106,8 @@ msgid "adduid" msgstr "" #: g10/keyedit.c:580 -msgid "add a user id" +#, fuzzy +msgid "add a user ID" msgstr "adiciona um novo id de usu�rio" #: g10/keyedit.c:581 @@ -2109,7 +2115,8 @@ msgid "deluid" msgstr "" #: g10/keyedit.c:581 -msgid "delete user id" +#, fuzzy +msgid "delete user ID" msgstr "remove id de usu�rio" #: g10/keyedit.c:582 @@ -2240,11 +2247,13 @@ msgid "Need the secret key to do this.\n" msgstr "A chave secreta � necess�ria para fazer isto.\n" #: g10/keyedit.c:758 -msgid "Really sign all user ids? " +#, fuzzy +msgid "Really sign all user IDs? " msgstr "Realmente assinar todos os ids de usu�rio? " #: g10/keyedit.c:759 -msgid "Hint: Select the user ids to sign\n" +#, fuzzy +msgid "Hint: Select the user IDs to sign\n" msgstr "Sugest�o: Selecione os ids de usu�rio para assinar\n" #: g10/keyedit.c:786 g10/keyedit.c:968 @@ -2253,19 +2262,23 @@ 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" +#, fuzzy +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:799 -msgid "You can't delete the last user id!\n" +#, fuzzy +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:802 -msgid "Really remove all selected user ids? " +#, fuzzy +msgid "Really remove all selected user IDs? " msgstr "Realmente remover todos os ids de usu�rio selecionados? " #: g10/keyedit.c:803 -msgid "Really remove this user id? " +#, fuzzy +msgid "Really remove this user ID? " msgstr "Realmente remover este id de usu�rio? " #: g10/keyedit.c:839 g10/keyedit.c:861 @@ -2374,8 +2387,8 @@ msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n" #: g10/keyedit.c:1566 -#, c-format -msgid "No user id with index %d\n" +#, fuzzy, c-format +msgid "No user ID with index %d\n" msgstr "Nenhum id de usu�rio com �ndice %d\n" #: g10/keyedit.c:1612 @@ -2497,11 +2510,11 @@ msgstr " ou \"" msgid "Can't check signature: %s\n" msgstr "Imposs�vel verificar assinatura: %s\n" -#: g10/mainproc.c:1209 +#: g10/mainproc.c:1212 msgid "old style (PGP 2.x) signature\n" msgstr "formato de assinatura antigo (PGP2.x)\n" -#: g10/mainproc.c:1214 +#: g10/mainproc.c:1217 msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz inv�lido detectado em proc_tree()\n" @@ -2578,15 +2591,15 @@ msgstr "Repita a frase secreta: " msgid "data not saved; use option \"--output\" to save it\n" msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n" -#: g10/plaintext.c:266 +#: g10/plaintext.c:267 msgid "Please enter name of data file: " msgstr "Por favor digite o nome do arquivo de dados: " -#: g10/plaintext.c:287 +#: g10/plaintext.c:288 msgid "reading stdin ...\n" msgstr "lendo de \"stdin\" ...\n" -#: g10/plaintext.c:360 +#: g10/plaintext.c:371 #, c-format msgid "can't open signed data `%s'\n" msgstr "imposs�vel abrir dados assinados `%s'\n" @@ -3039,7 +3052,8 @@ msgid "Ooops, no keys\n" msgstr "Ooops, nenhuma chave\n" #: g10/trustdb.c:2061 -msgid "Ooops, no user ids\n" +#, fuzzy +msgid "Ooops, no user IDs\n" msgstr "Ooops, nenhum id de usu�rio\n" #: g10/trustdb.c:2218 @@ -3224,66 +3238,69 @@ msgstr "" #: g10/helptext.c:61 msgid "" -"Enter the user id of the addressee to whom you want to send the message." +"Enter the user ID of the addressee to whom you want to send the message." msgstr "" #: g10/helptext.c:65 msgid "" "Select the algorithm to use.\n" +"\n" "DSA (aka DSS) is the digital signature algorithm which can only be used\n" "for signatures. This is the suggested algorithm because verification of\n" "DSA signatures are much faster than those of ElGamal.\n" +"\n" "ElGamal is an algorithm which can be used for signatures and encryption.\n" -"OpenPGP distunguishs between two flavors of this algorithms: an encrypt " +"OpenPGP distinguishs between two flavors of this algorithms: an encrypt " "only\n" "and a sign+encrypt; actually it is the same, but some parameters must be\n" "selected in a special way to create a safe key for signatures: this program\n" "does this but other OpenPGP implementations are not required to understand\n" "the signature+encryption flavor.\n" +"\n" "The first (primary) key must always be a key which is capable of signing;\n" "this is the reason why the encryption only ElGamal key is not available in\n" "this menu." msgstr "" -#: g10/helptext.c:82 +#: g10/helptext.c:85 msgid "" "Although these keys are defined in RFC2440 they are not suggested\n" "because they are not supported by all programs and signatures created\n" "with them are quite large and very slow to verify." msgstr "" -#: g10/helptext.c:89 +#: g10/helptext.c:92 #, fuzzy msgid "Enter the size of the key" msgstr "Digite o identificador de usu�rio: " -#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142 -#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157 +#: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145 +#: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160 msgid "Answer \"yes\" or \"no\"" msgstr "" -#: g10/helptext.c:103 +#: g10/helptext.c:106 msgid "" -"Enter the required value as shown in the pronpt.\n" +"Enter the required value as shown in the prompt.\n" "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n" "get a good error response - instead the system tries to interpret\n" "the given value as an interval." msgstr "" -#: g10/helptext.c:115 +#: g10/helptext.c:118 msgid "Enter the name of the key holder" msgstr "" -#: g10/helptext.c:120 +#: g10/helptext.c:123 msgid "please enter an optional but highly suggested email address" msgstr "" -#: g10/helptext.c:124 +#: g10/helptext.c:127 #, fuzzy msgid "Please enter an optional comment" msgstr "Por favor digite o nome do arquivo de dados: " -#: g10/helptext.c:129 +#: g10/helptext.c:132 msgid "" "N to change the name.\n" "C to change the comment.\n" @@ -3292,32 +3309,32 @@ msgid "" "Q to to quit the key generation." msgstr "" -#: g10/helptext.c:138 +#: g10/helptext.c:141 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." msgstr "" -#: g10/helptext.c:161 +#: g10/helptext.c:164 msgid "Answer \"yes\" is you want to sign ALL the user IDs" msgstr "" -#: g10/helptext.c:165 +#: g10/helptext.c:168 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -#: g10/helptext.c:170 +#: g10/helptext.c:173 msgid "Answer \"yes\" if it is okay to delete the subkey" msgstr "" -#: g10/helptext.c:175 +#: g10/helptext.c:178 msgid "" "This is a valid signature on the key; you normally don't want\n" -"to delete this signature may be important to establish a trust\n" -"connection to the key or another key certified by this key." +"to delete this signature because it may be important to establish a\n" +"trust connection to the key or another key certified by this key." msgstr "" -#: g10/helptext.c:180 +#: g10/helptext.c:183 msgid "" "This signature can't be checked because you don't have the\n" "corresponding key. You should postpone its deletion until you\n" @@ -3325,13 +3342,13 @@ msgid "" "connection through another already certified key." msgstr "" -#: g10/helptext.c:186 +#: g10/helptext.c:189 msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." msgstr "" -#: g10/helptext.c:190 +#: g10/helptext.c:193 msgid "" "This is a signature which binds the user ID to the key. It is\n" "usually not a good idea to remove such a signature. Actually\n" @@ -3340,35 +3357,35 @@ msgid "" "a second one is available." msgstr "" -#: g10/helptext.c:199 +#: g10/helptext.c:202 msgid "" "Please enter the passhrase; this is a secret sentence \n" " Blurb, blurb,.... " msgstr "" -#: g10/helptext.c:206 +#: g10/helptext.c:209 msgid "Please repeat the last passphrase, so you are sure what you typed in." msgstr "" -#: g10/helptext.c:210 +#: g10/helptext.c:213 msgid "Give the name fo the file to which the signature applies" msgstr "" -#: g10/helptext.c:215 +#: g10/helptext.c:218 msgid "Answer \"yes\" if it is okay to overwrite the file" msgstr "" -#: g10/helptext.c:220 +#: g10/helptext.c:223 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." msgstr "" -#: g10/helptext.c:234 +#: g10/helptext.c:237 msgid "No help available" msgstr "Nenhuma ajuda dispon�vel" -#: g10/helptext.c:242 +#: g10/helptext.c:245 #, c-format msgid "No help available for `%s'" msgstr "Nenhuma ajuda dispon�vel para `%s'" @@ -9,7 +9,7 @@ # QingLong <qinglong@Bolizm> (couldn't send an email to let you know) msgid "" msgstr "" -"POT-Creation-Date: 1999-08-30 19:40+0200\n" +"POT-Creation-Date: 1999-09-02 14:44+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck <[email protected]>\n" @@ -36,27 +36,27 @@ msgstr "" msgid "(you may have used the wrong program for this task)\n" msgstr "" -#: util/miscutil.c:254 util/miscutil.c:283 +#: util/miscutil.c:277 util/miscutil.c:306 msgid "yes" msgstr "��(y)" -#: util/miscutil.c:255 util/miscutil.c:286 +#: util/miscutil.c:278 util/miscutil.c:309 msgid "yY" msgstr "yY" -#: util/miscutil.c:256 util/miscutil.c:284 +#: util/miscutil.c:279 util/miscutil.c:307 msgid "no" msgstr "" -#: util/miscutil.c:257 util/miscutil.c:287 +#: util/miscutil.c:280 util/miscutil.c:310 msgid "nN" msgstr "" -#: g10/keyedit.c:564 util/miscutil.c:285 +#: g10/keyedit.c:564 util/miscutil.c:308 msgid "quit" msgstr "�����" -#: util/miscutil.c:288 +#: util/miscutil.c:311 msgid "qQ" msgstr "" @@ -1392,11 +1392,11 @@ msgstr "���������� ����.\n" msgid "Key expires at %s\n" msgstr "���� ��������� �� %s\n" -#: g10/keygen.c:564 +#: g10/keygen.c:563 msgid "Is this correct (y/n)? " msgstr "��� �����? (y/n) " -#: g10/keygen.c:607 +#: g10/keygen.c:606 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1412,44 +1412,44 @@ msgstr "" " \"Vasya Pupkin (KRUTOI) <[email protected]>\"\n" "\n" -#: g10/keygen.c:618 +#: g10/keygen.c:617 msgid "Real name: " msgstr "���� ��� (\"��� �������\"): " -#: g10/keygen.c:622 +#: g10/keygen.c:621 msgid "Invalid character in name\n" msgstr "������������ ������ � �����\n" -#: g10/keygen.c:624 +#: g10/keygen.c:623 msgid "Name may not start with a digit\n" msgstr "������ ��� �� ����� ���������� � �����.\n" -#: g10/keygen.c:626 +#: g10/keygen.c:625 msgid "Name must be at least 5 characters long\n" msgstr "������ ��� ������ �������� �� ����� ��� �� 5�� ��������.\n" -#: g10/keygen.c:634 +#: g10/keygen.c:633 msgid "Email address: " msgstr "E-Mail: " -#: g10/keygen.c:645 +#: g10/keygen.c:644 msgid "Not a valid email address\n" msgstr "������������ E-Mail\n" -#: g10/keygen.c:653 +#: g10/keygen.c:652 msgid "Comment: " msgstr "�����������: " -#: g10/keygen.c:659 +#: g10/keygen.c:658 msgid "Invalid character in comment\n" msgstr "������������ ������ � �����������.\n" -#: g10/keygen.c:681 +#: g10/keygen.c:680 #, c-format msgid "You are using the `%s' character set.\n" msgstr "" -#: g10/keygen.c:687 +#: g10/keygen.c:686 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1460,16 +1460,16 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:690 +#: g10/keygen.c:689 msgid "NnCcEeOoQq" msgstr "" -#: g10/keygen.c:700 +#: g10/keygen.c:699 #, fuzzy msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "��������: N=���, C=�����������, E=E-Mail, O=Okay/Q=�����? " -#: g10/keygen.c:752 +#: g10/keygen.c:751 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1477,11 +1477,11 @@ msgstr "" "��� ������ ������ ����� ����� �������� �����.\n" "\n" -#: g10/keyedit.c:456 g10/keygen.c:760 +#: g10/keyedit.c:456 g10/keygen.c:759 msgid "passphrase not correctly repeated; try again.\n" msgstr "�������� ����� �� ���� ��������������, ���������� �����.\n" -#: g10/keygen.c:766 +#: g10/keygen.c:765 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -1493,7 +1493,7 @@ msgstr "" "�����, �������� ��� ��������� � ���������� \"--edit-key\".\n" "\n" -#: g10/keygen.c:787 +#: g10/keygen.c:786 #, fuzzy msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" @@ -1506,34 +1506,34 @@ msgstr "" "��������� ������� ��� �������� ����������). ��� ���� ���������� ���������\n" "����� ����������� ������� ���������� ��������.\n" -#: g10/keygen.c:857 +#: g10/keygen.c:856 msgid "Key generation can only be used in interactive mode\n" msgstr "��������� ����� ����� ���� ��������� ������ � ������������� ������.\n" -#: g10/keygen.c:865 +#: g10/keygen.c:864 msgid "DSA keypair will have 1024 bits.\n" msgstr "�������� ���� DSA ����� ����� ����� 1024 ����.\n" -#: g10/keygen.c:871 +#: g10/keygen.c:870 #, fuzzy msgid "Key generation canceled.\n" msgstr "��������� ����� ��������: %s\n" -#: g10/keygen.c:881 +#: g10/keygen.c:880 #, c-format msgid "writing public certificate to `%s'\n" msgstr "�������� ���������� ������������ � `%s'\n" -#: g10/keygen.c:882 +#: g10/keygen.c:881 #, c-format msgid "writing secret certificate to `%s'\n" msgstr "��������� ���������� ������������ � `%s'\n" -#: g10/keygen.c:959 +#: g10/keygen.c:958 msgid "public and secret key created and signed.\n" msgstr "�������� � ��������� ����� ������� � ���������.\n" -#: g10/keygen.c:961 +#: g10/keygen.c:960 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -1544,12 +1544,12 @@ msgstr "" "���������������\n" "����� ��� ����������.\n" -#: g10/keygen.c:975 g10/keygen.c:1074 +#: g10/keygen.c:974 g10/keygen.c:1073 #, c-format msgid "Key generation failed: %s\n" msgstr "��������� ����� �� �������: %s\n" -#: g10/keygen.c:1019 g10/sig-check.c:312 g10/sign.c:105 +#: g10/keygen.c:1018 g10/sig-check.c:312 g10/sign.c:105 #, fuzzy, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1557,7 +1557,7 @@ msgstr "" "�������� ���� ������������ � ������� (����������� ������� ��� ����������� " "����������� ����)\n" -#: g10/keygen.c:1021 g10/sig-check.c:314 g10/sign.c:107 +#: g10/keygen.c:1020 g10/sig-check.c:314 g10/sign.c:107 #, fuzzy, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1565,7 +1565,7 @@ msgstr "" "�������� ���� ������������ � ������� (����������� ������� ��� ����������� " "����������� ����)\n" -#: g10/keygen.c:1052 +#: g10/keygen.c:1051 #, fuzzy msgid "Really create? " msgstr "������������� �������? " @@ -1630,12 +1630,12 @@ msgstr "" #: g10/getkey.c:1291 g10/getkey.c:1330 #, fuzzy -msgid "No key for user-id\n" +msgid "No key for user ID\n" msgstr "���� %08lX: ��� �������������� ������������\n" #: g10/getkey.c:1369 g10/getkey.c:1409 #, fuzzy -msgid "No user-id for key\n" +msgid "No user ID for key\n" msgstr "������ ��������� ����" #: g10/getkey.c:1565 g10/getkey.c:1621 @@ -1719,13 +1719,13 @@ msgid " secret keys unchanged: %lu\n" msgstr "����������� ������������ ��������� ����" #: g10/import.c:362 g10/import.c:554 -#, c-format -msgid "key %08lX: no user id\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID\n" msgstr "���� %08lX: ��� �������������� ������������\n" #: g10/import.c:376 -#, c-format -msgid "key %08lX: no valid user ids\n" +#, fuzzy, c-format +msgid "key %08lX: no valid user IDs\n" msgstr "���� %08lX: ��� ���������� ��������������� �������������\n" #: g10/import.c:378 @@ -1777,13 +1777,13 @@ msgid "key %08lX: can't read original keyblock: %s\n" msgstr "���� %08lX: ���������� ��������� original keyblock: %s\n" #: g10/import.c:469 -#, c-format -msgid "key %08lX: 1 new user-id\n" +#, fuzzy, c-format +msgid "key %08lX: 1 new user ID\n" msgstr "���� %08lX: 1 ����� ������������� ������������\n" #: g10/import.c:472 -#, c-format -msgid "key %08lX: %d new user-ids\n" +#, fuzzy, c-format +msgid "key %08lX: %d new user IDs\n" msgstr "���� %08lX: %d ����� ��������������� �������������\n" #: g10/import.c:475 @@ -1845,8 +1845,8 @@ msgid "key %08lX: revocation certificate imported\n" msgstr "���� %08lX: ���������� ���������� ������������\n" #: g10/import.c:711 -#, c-format -msgid "key %08lX: no user-id for signature\n" +#, fuzzy, c-format +msgid "key %08lX: no user ID for signature\n" msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n" #: g10/import.c:718 g10/import.c:742 @@ -1871,12 +1871,12 @@ msgstr "���� %08lX: ��� ���������� ��������������� �������������\n" #: g10/import.c:769 #, fuzzy, c-format -msgid "key %08lX: accepted non self-signed user-id '" +msgid "key %08lX: accepted non self-signed user ID '" msgstr "���� %08lX: �������� ������������� ������������ '" #: g10/import.c:798 #, fuzzy, c-format -msgid "key %08lX: skipped user-id '" +msgid "key %08lX: skipped user ID '" msgstr "���� %08lX: �������� ������������� ������������ '" #: g10/import.c:821 @@ -1913,7 +1913,7 @@ msgstr "" msgid "key %08lX: revocation certificate added\n" msgstr "���� %08lX: ���������� ���������� ��������\n" -#: g10/import.c:1127 g10/import.c:1182 +#: g10/import.c:1128 g10/import.c:1183 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n" @@ -1964,12 +1964,12 @@ msgstr "%s �������� �� ��������� ��-�� ������\n" #: g10/keyedit.c:231 #, fuzzy -msgid "1 user id without valid self-signature detected\n" +msgid "1 user ID without valid self-signature detected\n" msgstr "��������� 1 ������������� ������������ ��� ���������� ����-�������\n" #: g10/keyedit.c:233 -#, c-format -msgid "%d user ids without valid self-signatures detected\n" +#, fuzzy, c-format +msgid "%d user IDs without valid self-signatures detected\n" msgstr "" "���������� %d ��������������� ������������� ��� ���������� ����-��������\n" @@ -2084,7 +2084,7 @@ msgstr "������" #: g10/keyedit.c:570 #, fuzzy -msgid "list key and user ids" +msgid "list key and user IDs" msgstr "������ ������ � ��������������� �������������" #: g10/keyedit.c:571 @@ -2096,7 +2096,8 @@ msgid "uid" msgstr "" #: g10/keyedit.c:572 -msgid "select user id N" +#, fuzzy +msgid "select user ID N" msgstr "������� ������������� ������������ N" #: g10/keyedit.c:573 @@ -2152,7 +2153,8 @@ msgid "adduid" msgstr "" #: g10/keyedit.c:580 -msgid "add a user id" +#, fuzzy +msgid "add a user ID" msgstr "�������� ������������� ������������" #: g10/keyedit.c:581 @@ -2161,7 +2163,7 @@ msgstr "" #: g10/keyedit.c:581 #, fuzzy -msgid "delete user id" +msgid "delete user ID" msgstr "������� ������������� ������������" #: g10/keyedit.c:582 @@ -2297,11 +2299,13 @@ msgid "Need the secret key to do this.\n" msgstr "����� ��� �������, ����� ��������� ����.\n" #: g10/keyedit.c:758 -msgid "Really sign all user ids? " +#, fuzzy +msgid "Really sign all user IDs? " msgstr "������������� ��������� ��� �������������� ������������? " #: g10/keyedit.c:759 -msgid "Hint: Select the user ids to sign\n" +#, fuzzy +msgid "Hint: Select the user IDs to sign\n" msgstr "" "���������: �������� �������������� ������������ ������� ������ ���������\n" @@ -2311,21 +2315,23 @@ 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" +#, fuzzy +msgid "You must select at least one user ID.\n" msgstr "�� ������ ������� ���� �� ���� ������������� ������������.\n" #: g10/keyedit.c:799 -msgid "You can't delete the last user id!\n" +#, fuzzy +msgid "You can't delete the last user ID!\n" msgstr "�� �� ������ ������� ��������� ������������� ������������!\n" #: g10/keyedit.c:802 #, fuzzy -msgid "Really remove all selected user ids? " +msgid "Really remove all selected user IDs? " msgstr "������������� ������� ��� ��������� �������������� ������������? " #: g10/keyedit.c:803 #, fuzzy -msgid "Really remove this user id? " +msgid "Really remove this user ID? " msgstr "������������� ������� ���� ������������� ������������? " #: g10/keyedit.c:839 g10/keyedit.c:861 @@ -2442,8 +2448,8 @@ msgid "No corresponding signature in secret ring\n" msgstr "" #: g10/keyedit.c:1566 -#, c-format -msgid "No user id with index %d\n" +#, fuzzy, c-format +msgid "No user ID with index %d\n" msgstr "��� �������������� ������������ � �������� %d\n" #: g10/keyedit.c:1612 @@ -2572,11 +2578,11 @@ msgstr "" msgid "Can't check signature: %s\n" msgstr "���������� ��������� �������: %s\n" -#: g10/mainproc.c:1209 +#: g10/mainproc.c:1212 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:1214 +#: g10/mainproc.c:1217 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -2654,15 +2660,15 @@ msgstr "��������� �������� �����: %s\n" msgid "data not saved; use option \"--output\" to save it\n" msgstr "������ �� ���� ���������; �������������� --\"output\" ��� ����������\n" -#: g10/plaintext.c:266 +#: g10/plaintext.c:267 msgid "Please enter name of data file: " msgstr "����������, ������� ��� ����� ������: " -#: g10/plaintext.c:287 +#: g10/plaintext.c:288 msgid "reading stdin ...\n" msgstr "" -#: g10/plaintext.c:360 +#: g10/plaintext.c:371 #, c-format msgid "can't open signed data `%s'\n" msgstr "���������� ������� ����������� ������ `%s' .\n" @@ -3124,7 +3130,7 @@ msgstr "" #: g10/trustdb.c:2061 #, fuzzy -msgid "Ooops, no user ids\n" +msgid "Ooops, no user IDs\n" msgstr "������ ������ � ��������������� �������������" #: g10/trustdb.c:2218 @@ -3313,66 +3319,69 @@ msgstr "" #: g10/helptext.c:61 msgid "" -"Enter the user id of the addressee to whom you want to send the message." +"Enter the user ID of the addressee to whom you want to send the message." msgstr "" #: g10/helptext.c:65 msgid "" "Select the algorithm to use.\n" +"\n" "DSA (aka DSS) is the digital signature algorithm which can only be used\n" "for signatures. This is the suggested algorithm because verification of\n" "DSA signatures are much faster than those of ElGamal.\n" +"\n" "ElGamal is an algorithm which can be used for signatures and encryption.\n" -"OpenPGP distunguishs between two flavors of this algorithms: an encrypt " +"OpenPGP distinguishs between two flavors of this algorithms: an encrypt " "only\n" "and a sign+encrypt; actually it is the same, but some parameters must be\n" "selected in a special way to create a safe key for signatures: this program\n" "does this but other OpenPGP implementations are not required to understand\n" "the signature+encryption flavor.\n" +"\n" "The first (primary) key must always be a key which is capable of signing;\n" "this is the reason why the encryption only ElGamal key is not available in\n" "this menu." msgstr "" -#: g10/helptext.c:82 +#: g10/helptext.c:85 msgid "" "Although these keys are defined in RFC2440 they are not suggested\n" "because they are not supported by all programs and signatures created\n" "with them are quite large and very slow to verify." msgstr "" -#: g10/helptext.c:89 +#: g10/helptext.c:92 #, fuzzy msgid "Enter the size of the key" msgstr "������� ������������� ������������: " -#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142 -#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157 +#: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145 +#: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160 msgid "Answer \"yes\" or \"no\"" msgstr "" -#: g10/helptext.c:103 +#: g10/helptext.c:106 msgid "" -"Enter the required value as shown in the pronpt.\n" +"Enter the required value as shown in the prompt.\n" "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n" "get a good error response - instead the system tries to interpret\n" "the given value as an interval." msgstr "" -#: g10/helptext.c:115 +#: g10/helptext.c:118 msgid "Enter the name of the key holder" msgstr "" -#: g10/helptext.c:120 +#: g10/helptext.c:123 msgid "please enter an optional but highly suggested email address" msgstr "" -#: g10/helptext.c:124 +#: g10/helptext.c:127 #, fuzzy msgid "Please enter an optional comment" msgstr "����������, ������� ��� ����� ������: " -#: g10/helptext.c:129 +#: g10/helptext.c:132 msgid "" "N to change the name.\n" "C to change the comment.\n" @@ -3381,32 +3390,32 @@ msgid "" "Q to to quit the key generation." msgstr "" -#: g10/helptext.c:138 +#: g10/helptext.c:141 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." msgstr "" -#: g10/helptext.c:161 +#: g10/helptext.c:164 msgid "Answer \"yes\" is you want to sign ALL the user IDs" msgstr "" -#: g10/helptext.c:165 +#: g10/helptext.c:168 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -#: g10/helptext.c:170 +#: g10/helptext.c:173 msgid "Answer \"yes\" if it is okay to delete the subkey" msgstr "" -#: g10/helptext.c:175 +#: g10/helptext.c:178 msgid "" "This is a valid signature on the key; you normally don't want\n" -"to delete this signature may be important to establish a trust\n" -"connection to the key or another key certified by this key." +"to delete this signature because it may be important to establish a\n" +"trust connection to the key or another key certified by this key." msgstr "" -#: g10/helptext.c:180 +#: g10/helptext.c:183 msgid "" "This signature can't be checked because you don't have the\n" "corresponding key. You should postpone its deletion until you\n" @@ -3414,13 +3423,13 @@ msgid "" "connection through another already certified key." msgstr "" -#: g10/helptext.c:186 +#: g10/helptext.c:189 msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." msgstr "" -#: g10/helptext.c:190 +#: g10/helptext.c:193 msgid "" "This is a signature which binds the user ID to the key. It is\n" "usually not a good idea to remove such a signature. Actually\n" @@ -3429,35 +3438,35 @@ msgid "" "a second one is available." msgstr "" -#: g10/helptext.c:199 +#: g10/helptext.c:202 msgid "" "Please enter the passhrase; this is a secret sentence \n" " Blurb, blurb,.... " msgstr "" -#: g10/helptext.c:206 +#: g10/helptext.c:209 msgid "Please repeat the last passphrase, so you are sure what you typed in." msgstr "" -#: g10/helptext.c:210 +#: g10/helptext.c:213 msgid "Give the name fo the file to which the signature applies" msgstr "" -#: g10/helptext.c:215 +#: g10/helptext.c:218 msgid "Answer \"yes\" if it is okay to overwrite the file" msgstr "" -#: g10/helptext.c:220 +#: g10/helptext.c:223 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." msgstr "" -#: g10/helptext.c:234 +#: g10/helptext.c:237 msgid "No help available" msgstr "������ �����������." -#: g10/helptext.c:242 +#: g10/helptext.c:245 #, c-format msgid "No help available for `%s'" msgstr "������ ��� `%s' �����������." diff --git a/scripts/ChangeLog b/scripts/ChangeLog index f602ba426..d26cae273 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 2 16:40:55 CEST 1999 Werner Koch <[email protected]> + + + * mkdiff: changed format of diff file name and made script more + general. + Wed Aug 4 10:34:18 CEST 1999 Werner Koch <[email protected]> diff --git a/scripts/mkdiff b/scripts/mkdiff index d180aaade..4f7bfc77a 100755 --- a/scripts/mkdiff +++ b/scripts/mkdiff @@ -1,48 +1,64 @@ #!/bin/sh +if [ $# != 1 ] ; then + echo "usage: mkdiff package-name" >&2 + exit 1 +fi + +pack="$1" + set -e -curr_ver=$(ls gnupg-*.tar.gz | sort -r -t '.' -n +0.4 -1 +1 -2 +2 \ - | head -1 | sed -e 's/gnupg-\(.*\).tar.gz/\1/' ) -prev_ver=$(ls gnupg-*.tar.gz | sort -r -t '.' -n +0.4 -1 +1 -2 +2 \ - | head -2 | tail -1 | sed -e 's/gnupg-\(.*\).tar.gz/\1/' ) +curr_ver=$(ls $pack-*.tar.gz 2>/dev/null | sort -r -t '.' -n +0.4 -1 +1 -2 +2 \ + | head -1 | sed -e 's/'$pack'-\(.*\).tar.gz/\1/' ) +if [ ! -f $pack-$curr_ver.tar.gz ]; then + echo "mkdiff: no current version of package $pack found" >&2 + exit 1 +fi +prev_ver=$(ls $pack-*.tar.gz 2>/dev/null | sort -r -t '.' -n +0.4 -1 +1 -2 +2 \ + | head -2 | tail -1 | sed -e 's/'$pack'-\(.*\).tar.gz/\1/' ) +if [ "$prev_ver" = "$curr_ver" ]; then + echo "mkdiff: no previous version of package $pack found" >&2 + exit 1 +fi + +echo "Current is: $pack-$curr_ver" +echo "Previous is: $pack-$prev_ver" -echo "Current is: $curr_ver" -echo "Previous is: $prev_ver" echo "Removing old directories" -[ -d "gnupg-$curr_ver" ] && rm -rf "gnupg-$curr_ver" -[ -d "gnupg-$prev_ver" ] && rm -rf "gnupg-$prev_ver" +[ -d "$pack-$curr_ver" ] && rm -rf "$pack-$curr_ver" +[ -d "$pack-$prev_ver" ] && rm -rf "$pack-$prev_ver" echo "Unpacking previous and current tar" -tar xzf "gnupg-$curr_ver.tar.gz" -rm -f gnupg-${curr_ver}/po/*.gmo -tar xzf "gnupg-$prev_ver.tar.gz" -rm -f gnupg-${prev_ver}/po/*.gmo +tar xzf "$pack-$curr_ver.tar.gz" +rm -f $pack-${curr_ver}/po/*.gmo +tar xzf "$pack-$prev_ver.tar.gz" +rm -f $pack-${prev_ver}/po/*.gmo echo "Diffing" -tmp_name="gnupg-$curr_ver.diff.tmp" -diff_name="gnupg-$curr_ver.diff" +tmp_name="$pack-$prev_ver-$curr_ver.diff.tmp" +diff_name="$pack-$prev_ver-$curr_ver.diff" -diff -urN "gnupg-$prev_ver/" "gnupg-$curr_ver/" > $tmp_name || true +diff -urN "$pack-$prev_ver/" "$pack-$curr_ver/" > $tmp_name || true echo "Making patch file" cat <<EOF > $diff_name -This is a patch file against $prev_ver. +This is a patch file to create version $curr_ver from $prev_ver. Please check the signature of this patch file: - zcat somepath/gnupg-$curr_ver.diff.gz | gpg --verify + zcat somepath/$pack-$prev_ver-$curr_ver.diff.gz | gpg --verify -Change to directory gnupg-$prev_ver (or however you renamed it) +Change to directory $pack-$prev_ver (or however you renamed it) and give this command: - zcat somepath/gnupg-$curr_ver.diff.gz | patch -p1 + zcat somepath/$pack-$prev_ver-$curr_ver.diff.gz | patch -p1 -It is a good idea to rename your current directory to gnupg-$curr_ver now. +It is a good idea to rename your current directory to $pack-$curr_ver now. @@ -57,17 +73,17 @@ sed -e '/^diff.*VERSION/,/^+[0-9][0-9]*/ d' $tmp_name >> $diff_name rm $tmp_name echo "Signing and compressing patch file" -gpg --clearsign --not-dash-escaped -u "(gnupg sig)" \ +gpg --clearsign --not-dash-escaped -u 57548DCD \ < $diff_name | gzip --best > $diff_name.gz rm $diff_name echo "Checking patch file" -cd gnupg-$prev_ver +cd $pack-$prev_ver zcat ../$diff_name.gz | patch -s -p1 rm $(find . -name "*.orig") 2>/dev/null || true cd .. -if ! diff -urN "gnupg-$prev_ver/" "gnupg-$curr_ver/" >/dev/null ; then +if ! diff -urN "$pack-$prev_ver/" "$pack-$curr_ver/" >/dev/null ; then echo "compare failed" exit 1 fi @@ -79,10 +95,8 @@ fi echo "cleaning up" -rm -rf "gnupg-$curr_ver" -rm -rf "gnupg-$prev_ver" +rm -rf "$pack-$curr_ver" +rm -rf "$pack-$prev_ver" echo "Patch file $diff_name.gz is good." - - diff --git a/scripts/mksnapshot b/scripts/mksnapshot index c766501c9..cca19d98d 100755 --- a/scripts/mksnapshot +++ b/scripts/mksnapshot @@ -1,7 +1,9 @@ #!/bin/sh # Make a snapshot of the CVS head revision -# Fixme: we should either run autoconf here or make a real distribution +exec >>/home/koch/mksnapshot.log 2>&1 + +echo "Started at `date`." set -e ftp_dir=$1 @@ -29,13 +31,23 @@ EOF build_dist () { set +e - nice scripts/autogen.sh && nice ./configure && nice make dist - rm $ftp_dir/gnupg-*snap*-*-*.tar.gz - mv gnupg-*.tar.gz $ftp_dir/ + nice scripts/autogen.sh && nice ./configure && nice make dist + if ! awk ' +/^diff gnupg-snapshot\/VERSION/ { getline; getline; getline; getline; next } +/^Common subdirectories:/ { next } +/~$/ { next } +{ exit 1 } +' ; then + # Okay, we have some changes and it is not only the version number + rm $ftp_dir/gnupg-*snap*-*-*.tar.gz + mv gnupg-*.tar.gz $ftp_dir/ + fi + make distclean set -e } + do_export () { pgm=$1 mod=$2 @@ -46,8 +58,8 @@ do_export () { fix_version $pgm.new if [ -n "$ftp_dir" ]; then here=$(pwd) - cd $pgm.new - build_dist + cd $pgm.new + build_dist cd $here fi [ -d $pgm ] && mv $pgm $pgm.old @@ -62,6 +74,6 @@ do_export () { do_export gnupg-snapshot gnupg - +echo "Ended at `date`." exit 0 diff --git a/scripts/mkwebpage b/scripts/mkwebpage index 6ab4771e9..b39feb176 100755 --- a/scripts/mkwebpage +++ b/scripts/mkwebpage @@ -1,7 +1,5 @@ #!/bin/sh # Make a snapshot of the CVS head revision for the gnupg webpages -# and put them into the FTP directory (so that the mirrors w/o rsync -# can access them set -e @@ -98,9 +96,9 @@ EOF do_export gnupg-www gnupg-www -cd gnupg-www -tar czf /home/ftp/pub/gcrypt/old/webpages.tmp * -mv /home/ftp/pub/gcrypt/old/webpages.tmp /home/ftp/pub/gcrypt/old/webpages.tar.gz +#cd gnupg-www +#tar czf /home/ftp/pub/gcrypt/.old/webpages.tmp * +#mv /home/ftp/pub/gcrypt/old/webpages.tmp /home/ftp/pub/gcrypt/old/webpages.tar.gz exit 0 |