diff options
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | TODO | 7 | ||||
| -rwxr-xr-x | checks/clearsig.test | 24 | ||||
| -rw-r--r-- | cipher/ChangeLog | 5 | ||||
| -rw-r--r-- | cipher/elgamal.c | 2 | ||||
| -rw-r--r-- | cipher/pubkey.c | 57 | ||||
| -rw-r--r-- | doc/DETAILS | 9 | ||||
| -rw-r--r-- | g10/ChangeLog | 22 | ||||
| -rw-r--r-- | g10/armor.c | 2 | ||||
| -rw-r--r-- | g10/cipher.c | 3 | ||||
| -rw-r--r-- | g10/encr-data.c | 3 | ||||
| -rw-r--r-- | g10/keygen.c | 105 | ||||
| -rw-r--r-- | g10/mainproc.c | 33 | ||||
| -rw-r--r-- | g10/options.h | 2 | ||||
| -rw-r--r-- | g10/seckey-cert.c | 14 | ||||
| -rw-r--r-- | g10/sign.c | 30 | ||||
| -rw-r--r-- | g10/status.c | 1 | ||||
| -rw-r--r-- | g10/status.h | 1 | ||||
| -rw-r--r-- | po/de.po | 53 | ||||
| -rw-r--r-- | po/eo.po | 50 | ||||
| -rw-r--r-- | po/es_ES.po | 50 | ||||
| -rw-r--r-- | po/fr.po | 50 | ||||
| -rw-r--r-- | po/id.po | 50 | ||||
| -rw-r--r-- | po/it.po | 50 | ||||
| -rw-r--r-- | po/ja.po | 50 | ||||
| -rw-r--r-- | po/nl.po | 50 | ||||
| -rw-r--r-- | po/pl.po | 50 | ||||
| -rw-r--r-- | po/pt_BR.po | 50 | ||||
| -rw-r--r-- | po/pt_PT.po | 50 | ||||
| -rw-r--r-- | po/ru.po | 50 | ||||
| -rw-r--r-- | po/sv.po | 50 |
31 files changed, 614 insertions, 360 deletions
@@ -116,6 +116,7 @@ Steffen Ullrich [email protected] Steffen Zahn [email protected] Steven Bakker [email protected] Susanne Schultz [email protected] +Ted Cabeen [email protected] Thiago Jung Bauermann [email protected] Thomas Roessler [email protected] Tim Mooney [email protected] @@ -1,5 +1,7 @@ - * check that --allow0non-selfsigned does really work + * Use DSA keys with the test suite. + + * check that --allow-non-selfsigned does really work * g10/trustdb.c (make_sig_records): fix the fixme. @@ -25,8 +27,6 @@ Scheduled for 1.1 * Speed up calculation of key validation. - * Allow a replacement for the progress functions in ./cipher - * print a warning when a revoked/expired _secret_ key is used. * --disable-asm should still assemble _udiv_qrnnd when needed @@ -47,7 +47,6 @@ Scheduled for 1.1 Nice to have ------------ - * Official test vectors for 3DES-EDE3 * use DEL and ^H for erasing the previous character (util/ttyio.c). or better readline. * Print a warning if the directory mode is wrong. diff --git a/checks/clearsig.test b/checks/clearsig.test index f77fd5db0..8e502b41d 100755 --- a/checks/clearsig.test +++ b/checks/clearsig.test @@ -46,6 +46,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx EOF echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 --clearsign -o x --yes y $srcdir/run-gpg --verify x +# ====================================== # and one with an empty body # ====================================== cat >y <<EOF @@ -68,9 +69,8 @@ $srcdir/run-gpg --verify x # ====================================== -# I think this file will be contructed wrong (gpg 0.9.3) +# I think this file will be constructed wrong (gpg 0.9.3) # but it should verify okay anyway. -# bash's builtin echo needs the option -e so we use the external one. # ====================================== echo "this is a sig test" >y echo_n " " >>y @@ -78,6 +78,26 @@ echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 --clearsign -o x --yes y $srcdir/run-gpg --verify x +# ====================================== +# check our special diff mode +# ====================================== +cat >y <<EOF +--- mainproc.c Tue Jun 27 09:28:11 2000 ++++ mainproc.c~ Thu Jun 8 22:50:25 2000 +@@ -1190,16 +1190,13 @@ + md_enable( c->mfx.md, n1->pkt->pkt.signature->digest_algo); + } + /* ask for file and hash it */ +- if( c->sigs_only ) { ++ if( c->sigs_only ) + rc = hash_datafiles( c->mfx.md, NULL, + c->signed_data, c->sigfilename, + n1? (n1->pkt->pkt.onepass_sig->sig_class == 0x01):0 ); +EOF +echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 \ + --not-dash-escaped --clearsign -o x --yes y +$srcdir/run-gpg --verify x + diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 92b6303a4..06466ca5e 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 28 11:54:44 CEST 2000 Werner Koch <wk@> + + * rsa.c, rsa.h: New based on the old module version (only in CVS for now). + * pubkey.c (setup_pubkey_table): Added commented support for RSA. + Fri Jun 9 10:09:52 CEST 2000 Werner Koch <[email protected]> * rndunix.c (waitpid): New. For UTS 2.1. All by Dave Dykstra. diff --git a/cipher/elgamal.c b/cipher/elgamal.c index 74e159684..02469d6ce 100644 --- a/cipher/elgamal.c +++ b/cipher/elgamal.c @@ -623,7 +623,7 @@ elg_verify( int algo, MPI hash, MPI *data, MPI *pkey, -unsigned +unsigned int elg_get_nbits( int algo, MPI *pkey ) { if( !is_ELGAMAL(algo) ) diff --git a/cipher/pubkey.c b/cipher/pubkey.c index a03af3026..abe39cb14 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -30,6 +30,9 @@ #include "cipher.h" #include "elgamal.h" #include "dsa.h" +#if 0 +#include "rsa.h" +#endif #include "dynload.h" @@ -150,6 +153,60 @@ setup_pubkey_table(void) BUG(); i++; + #if 0 + pubkey_table[i].algo = PUBKEY_ALGO_RSA; + pubkey_table[i].name = rsa_get_info( pubkey_table[i].algo, + &pubkey_table[i].npkey, + &pubkey_table[i].nskey, + &pubkey_table[i].nenc, + &pubkey_table[i].nsig, + &pubkey_table[i].use ); + pubkey_table[i].generate = rsa_generate; + pubkey_table[i].check_secret_key = rsa_check_secret_key; + pubkey_table[i].encrypt = rsa_encrypt; + pubkey_table[i].decrypt = rsa_decrypt; + pubkey_table[i].sign = rsa_sign; + pubkey_table[i].verify = rsa_verify; + pubkey_table[i].get_nbits = rsa_get_nbits; + if( !pubkey_table[i].name ) + BUG(); + i++; + pubkey_table[i].algo = PUBKEY_ALGO_RSA_E; + pubkey_table[i].name = rsa_get_info( pubkey_table[i].algo, + &pubkey_table[i].npkey, + &pubkey_table[i].nskey, + &pubkey_table[i].nenc, + &pubkey_table[i].nsig, + &pubkey_table[i].use ); + pubkey_table[i].generate = rsa_generate; + pubkey_table[i].check_secret_key = rsa_check_secret_key; + pubkey_table[i].encrypt = rsa_encrypt; + pubkey_table[i].decrypt = rsa_decrypt; + pubkey_table[i].sign = dummy_sign; + pubkey_table[i].verify = dummy_verify; + pubkey_table[i].get_nbits = rsa_get_nbits; + if( !pubkey_table[i].name ) + BUG(); + i++; + pubkey_table[i].algo = PUBKEY_ALGO_RSA_S; + pubkey_table[i].name = rsa_get_info( pubkey_table[i].algo, + &pubkey_table[i].npkey, + &pubkey_table[i].nskey, + &pubkey_table[i].nenc, + &pubkey_table[i].nsig, + &pubkey_table[i].use ); + pubkey_table[i].generate = rsa_generate; + pubkey_table[i].check_secret_key = rsa_check_secret_key; + pubkey_table[i].encrypt = dummy_encrypt; + pubkey_table[i].decrypt = dummy_decrypt; + pubkey_table[i].sign = rsa_sign; + pubkey_table[i].verify = rsa_verify; + pubkey_table[i].get_nbits = rsa_get_nbits; + if( !pubkey_table[i].name ) + BUG(); + i++; + #endif + for( ; i < TABLE_SIZE; i++ ) pubkey_table[i].name = NULL; } diff --git a/doc/DETAILS b/doc/DETAILS index ecb3d009a..ac8b577a8 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -217,6 +217,15 @@ more arguments in future versions. the toatal amount is not known. 100/100 may be used to detect the end of operation. + SIG_CREATED <type> <pubkey algo> <hash algo> <class> <timestamp> <key fpr> + A signature has been created using these parameters. + type: 'D' = detached + 'C' = cleartext + 'S' = standard + (only the first character should be checked) + class: 2 hex digits with the signature class + + Key generation ============== diff --git a/g10/ChangeLog b/g10/ChangeLog index 0a538b4f6..30032047d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,23 @@ +Wed Jun 28 11:54:44 CEST 2000 Werner Koch <wk@> + + * armor.c (armor_filter): Set sigclass to 0 in case of non-dash-escaped + clearsig. This makes this mode work again. + + * mainproc.c (proc_tree): Fixed handling of one-pass-sig packets in textmode. + Disabled the ugly workaround for PGP 5 - let's see whether thi breaks less + cases. Found by Ted Cabeen. + + * options.h (DBG_HASHING): New. All commented md_start_debug are now + controlled by this debug option. + + * sign.c (print_status_sig_created): New and called from 2 places. + + * keygen.c (gen_rsa): New, but commented. + (ask_algo): Commented support for RSA. + + * seckey-cert.c (protect_secret_key): Started to fix the code for v4 RSA + keys - it is not solved yet. However, we have time until, Sep 20th ;) + Wed Jun 14 12:27:09 CEST 2000 Werner Koch <[email protected]> * status.c (init_shm_coprocessing): Changed the sequence of the get,attach @@ -267,7 +287,7 @@ Wed Jan 5 11:51:17 CET 2000 Werner Koch <[email protected]> * g10.c (main): Reset new global flag opt.pgp2_workarounds when --openpgp is used. * mainproc.c (proc_plaintext): Do the PGP2,5 workarounds only - when the global falg is set. + when the global flag is set. (proc_tree): Ditto. * textfilter.c (copy_clearsig_text): Ditto. * armor.c (armor_filter): Ditto. diff --git a/g10/armor.c b/g10/armor.c index 4384131ff..7622dd039 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -847,7 +847,7 @@ armor_filter( void *opaque, int control, buf[n++] = 0x90; /* old format, type 4, 1 length byte */ buf[n++] = 13; /* length */ buf[n++] = 3; /* version */ - buf[n++] = 0x01; /* sigclass 0x01 (canonical text mode)*/ + buf[n++] = afx->not_dash_escaped? 0:1; /* sigclass */ if( hashes & 1 ) { hashes &= ~1; buf[n++] = DIGEST_ALGO_RMD160; diff --git a/g10/cipher.c b/g10/cipher.c index e2972297d..c45fa1e70 100644 --- a/g10/cipher.c +++ b/g10/cipher.c @@ -63,7 +63,8 @@ write_header( cipher_filter_context_t *cfx, IOBUF a ) if( use_mdc ) { ed.mdc_method = DIGEST_ALGO_SHA1; cfx->mdc_hash = md_open( DIGEST_ALGO_SHA1, 0 ); - /*md_start_debug( cfx->mdc_hash, "creatmdc" );*/ + if ( DBG_HASHING ) + md_start_debug( cfx->mdc_hash, "creatmdc" ); } init_packet( &pkt ); pkt.pkttype = use_mdc? PKT_ENCRYPTED_MDC : PKT_ENCRYPTED; diff --git a/g10/encr-data.c b/g10/encr-data.c index 1ee2bbed8..5e1fdabed 100644 --- a/g10/encr-data.c +++ b/g10/encr-data.c @@ -78,7 +78,8 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek ) if( ed->mdc_method ) { dfx.mdc_hash = md_open( ed->mdc_method, 0 ); - /*md_start_debug(dfx.mdc_hash, "checkmdc");*/ + if ( DBG_HASHING ) + md_start_debug(dfx.mdc_hash, "checkmdc"); } dfx.cipher_hd = cipher_open( dek->algo, ed->mdc_method? CIPHER_MODE_CFB diff --git a/g10/keygen.c b/g10/keygen.c index d0083d13d..58642e103 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -414,6 +414,87 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek, return 0; } +#if 0 +static int +gen_rsa(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek, + STRING2KEY *s2k, PKT_secret_key **ret_sk, u32 expireval ) +{ + int rc; + PACKET *pkt; + PKT_secret_key *sk; + PKT_public_key *pk; + MPI skey[4]; + MPI *factors; + + assert( is_RSA(algo) ); + + if( nbits < 1024 ) { + nbits = 1024; + log_info(_("keysize invalid; using %u bits\n"), nbits ); + } + + if( (nbits % 32) ) { + nbits = ((nbits + 31) / 32) * 32; + log_info(_("keysize rounded up to %u bits\n"), nbits ); + } + + rc = pubkey_generate( algo, nbits, skey, &factors ); + if( rc ) { + log_error("pubkey_generate failed: %s\n", g10_errstr(rc) ); + return rc; + } + + sk = m_alloc_clear( sizeof *sk ); + pk = m_alloc_clear( sizeof *pk ); + sk->timestamp = pk->timestamp = make_timestamp(); + sk->version = pk->version = 4; + if( expireval ) { + sk->expiredate = pk->expiredate = sk->timestamp + expireval; + } + sk->pubkey_algo = pk->pubkey_algo = algo; + pk->pkey[0] = mpi_copy( skey[0] ); + pk->pkey[1] = mpi_copy( skey[1] ); + sk->skey[0] = skey[0]; + sk->skey[1] = skey[1]; + sk->skey[2] = skey[2]; + sk->skey[3] = skey[3]; + sk->skey[4] = skey[4]; + sk->skey[5] = skey[5]; + sk->is_protected = 0; + sk->protect.algo = 0; + + sk->csum = checksum_mpi_counted_nbits( sk->skey[2] ); + sk->csum += checksum_mpi_counted_nbits( sk->skey[3] ); + sk->csum += checksum_mpi_counted_nbits( sk->skey[4] ); + sk->csum += checksum_mpi_counted_nbits( sk->skey[5] ); + if( ret_sk ) /* not a subkey: return an unprotected version of the sk */ + *ret_sk = copy_secret_key( NULL, sk ); + + if( dek ) { + sk->protect.algo = dek->algo; + sk->protect.s2k = *s2k; + rc = protect_secret_key( sk, dek ); + if( rc ) { + log_error("protect_secret_key failed: %s\n", g10_errstr(rc) ); + free_public_key(pk); + free_secret_key(sk); + return rc; + } + } + + pkt = m_alloc_clear(sizeof *pkt); + pkt->pkttype = ret_sk ? PKT_PUBLIC_KEY : PKT_PUBLIC_SUBKEY; + pkt->pkt.public_key = pk; + add_kbnode(pub_root, new_kbnode( pkt )); + + pkt = m_alloc_clear(sizeof *pkt); + pkt->pkttype = ret_sk ? PKT_SECRET_KEY : PKT_SECRET_SUBKEY; + pkt->pkt.secret_key = sk; + add_kbnode(sec_root, new_kbnode( pkt )); + + return 0; +} +#endif /**************** @@ -460,6 +541,9 @@ ask_algo( int addmode ) if( addmode ) tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 ); tty_printf( _(" (%d) ElGamal (sign and encrypt)\n"), 4 ); + #if 0 + tty_printf( _(" (%d) RSA (sign and encrypt)\n"), 5 ); + #endif for(;;) { answer = cpr_get("keygen.algo",_("Your selection? ")); @@ -470,6 +554,15 @@ ask_algo( int addmode ) algo = 0; /* create both keys */ break; } + #if 0 + else if( algo == 5 ) { + if( cpr_get_answer_is_yes("keygen.algo.rsa_se",_( + "Do you really want to create a sign and encrypt key? "))) { + algo = PUBKEY_ALGO_RSA; + break; + } + } + #endif else if( algo == 4 ) { if( cpr_get_answer_is_yes("keygen.algo.elg_se",_( "Do you really want to create a sign and encrypt key? "))) { @@ -513,6 +606,9 @@ ask_keysize( int algo ) tty_printf(_("DSA only allows keysizes from 512 to 1024\n")); else if( nbits < 768 ) tty_printf(_("keysize too small; 768 is smallest value allowed.\n")); + else if( algo == PUBKEY_ALGO_RSA && nbits < 1024 ) + tty_printf(_("keysize too small;" + " 1024 is smallest value allowed for RSA.\n")); else if( nbits > 4096 ) { /* It is ridiculous and an annoyance to use larger key sizes! * GnuPG can handle much larger sizes; but it takes an eternity @@ -537,7 +633,7 @@ ask_keysize( int algo ) break; } } - else if( nbits > 1536 && !cpr_enabled() ) { + else if( nbits > 1536 && !cpr_enabled() && algo != PUBKEY_ALGO_RSA ) { if( cpr_get_answer_is_yes("keygen.size.large.okay",_( "Do you really need such a large keysize? ")) ) break; @@ -882,10 +978,13 @@ do_create( int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, "generator a better chance to gain enough entropy.\n") ); if( algo == PUBKEY_ALGO_ELGAMAL || algo == PUBKEY_ALGO_ELGAMAL_E ) - rc = gen_elg(algo, nbits, pub_root, sec_root, dek, s2k, - sk, expiredate ); + rc = gen_elg(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate); else if( algo == PUBKEY_ALGO_DSA ) rc = gen_dsa(nbits, pub_root, sec_root, dek, s2k, sk, expiredate); + #if 0 + else if( algo == PUBKEY_ALGO_RSA ) + rc = gen_rsa(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate); + #endif else BUG(); diff --git a/g10/mainproc.c b/g10/mainproc.c index 99806313a..a12dbd873 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -424,10 +424,11 @@ proc_plaintext( CTX c, PACKET *pkt ) */ c->mfx.md2 = md_open( DIGEST_ALGO_MD5, 0); } - #if 0 - #warning md_start_debug is enabled - md_start_debug( c->mfx.md, "verify" ); - #endif + if ( DBG_HASHING ) { + md_start_debug( c->mfx.md, "verify" ); + if ( c->mfx.md2 ) + md_start_debug( c->mfx.md2, "verify2" ); + } rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig ); if( rc == G10ERR_CREATE_FILE && !c->sigs_only) { /* can't write output but we hash it anyway to @@ -1190,13 +1191,16 @@ proc_tree( CTX c, KBNODE node ) md_enable( c->mfx.md, n1->pkt->pkt.signature->digest_algo); } /* ask for file and hash it */ - if( c->sigs_only ) + if( c->sigs_only ) { rc = hash_datafiles( c->mfx.md, NULL, c->signed_data, c->sigfilename, n1? (n1->pkt->pkt.onepass_sig->sig_class == 0x01):0 ); - else + } + else { rc = ask_for_detached_datafile( c->mfx.md, c->mfx.md2, - iobuf_get_fname(c->iobuf), 0 ); + iobuf_get_fname(c->iobuf), + n1? (n1->pkt->pkt.onepass_sig->sig_class == 0x01):0 ); + } if( rc ) { log_error("can't hash datafile: %s\n", g10_errstr(rc)); return; @@ -1230,6 +1234,7 @@ proc_tree( CTX c, KBNODE node ) * signature has been created in textmode */ c->mfx.md2 = md_open( sig->digest_algo, 0 ); } + #if 0 /* workaround disabled */ /* Here we have another hack to work around a pgp 2 bug * It works by not using the textmode for detached signatures; * this will let the first signature check (on md) fail @@ -1237,14 +1242,18 @@ proc_tree( CTX c, KBNODE node ) * then produce the "correct" hash. This is very, very ugly * hack but it may help in some cases (and break others) */ - if( c->sigs_only ) + /* c->mfx.md2? 0 :(sig->sig_class == 0x01) */ + #endif + if( c->sigs_only ) { rc = hash_datafiles( c->mfx.md, c->mfx.md2, c->signed_data, c->sigfilename, - c->mfx.md2? 0 :(sig->sig_class == 0x01) ); - else + (sig->sig_class == 0x01) ); + } + else { rc = ask_for_detached_datafile( c->mfx.md, c->mfx.md2, - iobuf_get_fname(c->iobuf), - c->mfx.md2? 0 :(sig->sig_class == 0x01) ); + iobuf_get_fname(c->iobuf), + (sig->sig_class == 0x01) ); + } if( rc ) { log_error("can't hash datafile: %s\n", g10_errstr(rc)); return; diff --git a/g10/options.h b/g10/options.h index 5d80e6771..312068e41 100644 --- a/g10/options.h +++ b/g10/options.h @@ -108,12 +108,14 @@ struct { #define DBG_CACHE_VALUE 64 /* debug the cacheing */ #define DBG_MEMSTAT_VALUE 128 /* show memory statistics */ #define DBG_TRUST_VALUE 256 /* debug the trustdb */ +#define DBG_HASHING_VALUE 512 /* debug hashing operations */ #define DBG_PACKET (opt.debug & DBG_PACKET_VALUE) #define DBG_FILTER (opt.debug & DBG_FILTER_VALUE) #define DBG_CACHE (opt.debug & DBG_CACHE_VALUE) #define DBG_TRUST (opt.debug & DBG_TRUST_VALUE) +#define DBG_HASHING (opt.debug & DBG_HASHING_VALUE) #endif /*G10_OPTIONS_H*/ diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c index 283e4e816..5cb10ee13 100644 --- a/g10/seckey-cert.c +++ b/g10/seckey-cert.c @@ -237,10 +237,11 @@ protect_secret_key( PKT_secret_key *sk, DEK *dek ) randomize_buffer(sk->protect.iv, sk->protect.ivlen, 1); cipher_setiv( cipher_hd, sk->protect.iv, sk->protect.ivlen ); if( sk->version >= 4 ) { - #define NMPIS (PUBKEY_MAX_NSKEY - PUBKEY_MAX_NPKEY) - byte *bufarr[NMPIS]; - unsigned narr[NMPIS]; - unsigned nbits[NMPIS]; + /* FIXME: There is a bug in this function for all algorithms + * where the secret MPIs are more than 1 */ + byte *bufarr[PUBKEY_MAX_NSKEY]; + unsigned narr[PUBKEY_MAX_NSKEY]; + unsigned nbits[PUBKEY_MAX_NSKEY]; int ndata=0; byte *p, *data; @@ -251,13 +252,13 @@ protect_secret_key( PKT_secret_key *sk, DEK *dek ) nbits[j] = mpi_get_nbits( sk->skey[i] ); ndata += narr[j] + 2; } - for( ; j < NMPIS; j++ ) + for( ; j < PUBKEY_MAX_NSKEY; j++ ) bufarr[j] = NULL; ndata += 2; /* for checksum */ data = m_alloc_secure( ndata ); p = data; - for(j=0; j < NMPIS && bufarr[j]; j++ ) { + for(j=0; j < PUBKEY_MAX_NSKEY && bufarr[j]; j++ ) { p[0] = nbits[j] >> 8 ; p[1] = nbits[j]; p += 2; @@ -265,7 +266,6 @@ protect_secret_key( PKT_secret_key *sk, DEK *dek ) p += narr[j]; m_free(bufarr[j]); } - #undef NMPIS csum = checksum( data, ndata-2); sk->csum = csum; *p++ = csum >> 8; diff --git a/g10/sign.c b/g10/sign.c index 6b6d5c5d0..e5df3e482 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -36,6 +36,7 @@ #include "filter.h" #include "ttyio.h" #include "trustdb.h" +#include "status.h" #include "i18n.h" @@ -190,6 +191,25 @@ only_old_style( SK_LIST sk_list ) } +static void +print_status_sig_created ( PKT_secret_key *sk, PKT_signature *sig, int what ) +{ + byte array[MAX_FINGERPRINT_LEN], *p; + char buf[100+MAX_FINGERPRINT_LEN*2]; + size_t i, n; + + sprintf(buf, "%c %d %d %02x %lu ", + what, sig->pubkey_algo, sig->digest_algo, sig->sig_class, + (ulong)sig->timestamp ); + + fingerprint_from_sk( sk, array, &n ); + p = buf + strlen(buf); + for(i=0; i < n ; i++ ) + sprintf(p+2*i, "%02X", array[i] ); + + write_status_text( STATUS_SIG_CREATED, buf ); +} + /**************** * Sign the files whose names are in FILENAME. @@ -522,12 +542,16 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr, pkt.pkttype = PKT_SIGNATURE; pkt.pkt.signature = sig; rc = build_packet( out, &pkt ); + if( !rc && is_status_enabled() ) { + print_status_sig_created ( sk, sig, detached ? 'D':'S'); + } free_packet( &pkt ); if( rc ) log_error("build signature packet failed: %s\n", g10_errstr(rc) ); } if( rc ) goto leave; + } @@ -639,7 +663,8 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile ) PKT_secret_key *sk = sk_rover->sk; md_enable(textmd, hash_for(sk->pubkey_algo)); } - /*md_start_debug( textmd, "sign" );*/ + if ( DBG_HASHING ) + md_start_debug( textmd, "clearsign" ); copy_clearsig_text( out, inp, textmd, !opt.not_dash_escaped, opt.escape_from, old_style ); /* fixme: check for read errors */ @@ -718,6 +743,9 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile ) pkt.pkttype = PKT_SIGNATURE; pkt.pkt.signature = sig; rc = build_packet( out, &pkt ); + if( !rc && is_status_enabled() ) { + print_status_sig_created ( sk, sig, 'C'); + } free_packet( &pkt ); if( rc ) log_error("build signature packet failed: %s\n", g10_errstr(rc) ); diff --git a/g10/status.c b/g10/status.c index b42265961..b3bc51e5b 100644 --- a/g10/status.c +++ b/g10/status.c @@ -150,6 +150,7 @@ write_status_text ( int no, const char *text) case STATUS_END_ENCRYPTION : s = "END_ENCRYPTION\n"; break; case STATUS_DELETE_PROBLEM : s = "DELETE_PROBLEM\n"; break; case STATUS_PROGRESS : s = "PROGRESS\n"; break; + case STATUS_SIG_CREATED : s = "SIG_CREATED\n"; break; default: s = "?\n"; break; } diff --git a/g10/status.h b/g10/status.h index 667565560..843f95cc7 100644 --- a/g10/status.h +++ b/g10/status.h @@ -80,6 +80,7 @@ #define STATUS_GET_HIDDEN 48 #define STATUS_GOT_IT 49 #define STATUS_PROGRESS 50 +#define STATUS_SIG_CREATED 51 /*-- status.c --*/ void set_status_fd ( int fd ); @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" -"POT-Creation-Date: 2000-06-12 01:30+0000\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 2000-06-12 12:50+0200\n" "Last-Translator: Walter Koch <[email protected]>\n" "Language-Team: German <[email protected]>\n" @@ -825,7 +825,7 @@ msgstr "--delete-secret-key User-ID" msgid "--delete-key user-id" msgstr "--delete-key User-ID" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "'%s' kann nicht ge�ffnet werden: %s\n" @@ -1595,7 +1595,7 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1603,7 +1603,7 @@ msgstr "" "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren " "stimmen nicht �berein)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1788,7 +1788,7 @@ msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n" msgid "no default public keyring\n" msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "Schreiben nach '%s'\n" @@ -2050,7 +2050,7 @@ msgstr "" msgid "Really sign? " msgstr "Wirklich unterschreiben? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "Beglaubigung fehlgeschlagen: %s\n" @@ -2518,7 +2518,7 @@ msgid "no secret key\n" msgstr "Kein geheimer Schl�ssel\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, c-format msgid " [expires: %s]" msgstr " [verf�llt: %s]" @@ -2576,60 +2576,61 @@ msgstr "" msgid "original file name='%.*s'\n" msgstr "Urspr�nglicher Dateiname='%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" -msgstr "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n" +msgstr "" +"Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "\"Notation\": " -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Richtlinie: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "Unterschriften-�berpr�fung unterdr�ckt\n" # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-( -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "FALSCHE Unterschrift von \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Korrekte Unterschrift von \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " alias \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Unterschrift kann nicht gepr�ft werden: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "Einzelne Unterschrift der Klasse 0x%02x\n" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "Unterschrift nach alter (PGP 2.x) Art\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n" @@ -2845,21 +2846,21 @@ msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "%s Unterschrift von: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "%s kann nicht erzeugt werden: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "unterschreibe:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "WARNUNG: '%s' ist eine leere Datei.\n" @@ -3410,7 +3411,7 @@ msgstr "%s verschl�sselte Daten\n" msgid "encrypted with unknown algorithm %d\n" msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 2000-02-16 14:41+00:00\n" "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n" "Language-Team: Esperanto <[email protected]>\n" @@ -812,7 +812,7 @@ msgstr "--delete-secret-key uzantidentigilo" msgid "--delete-key user-id" msgstr "--delete-key uzantidentigilo" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "ne povas malfermi %s: %s\n" @@ -1565,7 +1565,7 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "Kreado de �losiloj malsukcesis: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1573,7 +1573,7 @@ msgstr "" "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� " "horlo�eraro)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1758,7 +1758,7 @@ msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n" msgid "no default public keyring\n" msgstr "mankas implicita publika �losilaro\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "skribas al '%s'\n" @@ -2015,7 +2015,7 @@ msgstr "" msgid "Really sign? " msgstr "�u vere subskribi? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "subskribado malsukcesis: %s\n" @@ -2484,7 +2484,7 @@ msgid "no secret key\n" msgstr "mankas sekreta �losilo\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "�losilo eksvalidi�os je %s\n" @@ -2539,59 +2539,59 @@ msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n" msgid "original file name='%.*s'\n" msgstr "originala dosiernomo='%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "AVERTO: nevalida notacia dateno trovita\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "Notacio: " -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Gvidlinio: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "kontrolo de subskribo estas mal�altita\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "MALBONA subskribo de \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Bona subskribo de \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " alinome \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Ne povas kontroli subskribon: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "memstara subskribo de klaso 0x%02x\n" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "malnovstila subskribo (PGP 2.x)\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "nevalida radikpaketo trovita en proc_tree()\n" @@ -2799,21 +2799,21 @@ msgstr "NOTO: subskribo-�losilo eksvalidi�is je %s\n" msgid "assuming bad signature due to an unknown critical bit\n" msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "%s-subskribo de: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "ne povas krei %s: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "subskribas:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" @@ -3356,7 +3356,7 @@ msgstr "%s-�ifritaj datenoj\n" msgid "encrypted with unknown algorithm %d\n" msgstr "�ifrita per nekonata metodo %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 33e8ecf27..5a4eeb589 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ # GPG version: 1.0.0 msgid "" msgstr "" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 1999-10-27 06:35+0200\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-13 10:49:25+0100\n" @@ -831,7 +831,7 @@ msgstr "--delete-secret-key id-usuario" msgid "--delete-key user-id" msgstr "--delete-key id-usuario" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "no puede abrirse `%s': %s\n" @@ -1590,7 +1590,7 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "Creaci�n de la clave fallida: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1598,7 +1598,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:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1783,7 +1783,7 @@ msgstr "clave %08lX: clave p�blica no encontrada: %s\n" msgid "no default public keyring\n" msgstr "no hay anillo p�blico por defecto\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "escribiendo en `%s'\n" @@ -2042,7 +2042,7 @@ msgstr "" msgid "Really sign? " msgstr "�Firmar de verdad? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "firma fallida: %s\n" @@ -2511,7 +2511,7 @@ msgid "no secret key\n" msgstr "no hay clave secreta\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "La clave caduca el %s\n" @@ -2566,59 +2566,59 @@ msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n" msgid "original file name='%.*s'\n" msgstr "nombre fichero original='%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "ATENCI�N: encontrados datos de notaci�n no v�lidos\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "Notaci�n: " -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Pol�tica: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "suprimida la verificaci�n de la firma\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firma creada el %.*s usando clave %s ID %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "Firma INCORRECTA de \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Firma correcta de \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr "tambi�n conocido como \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Imposible comprobar la firma: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, fuzzy, c-format msgid "standalone signature of class 0x%02x\n" msgstr "Clase de firma desconocida" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "firma viejo estilo (PGP 2.x)\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquete ra�z no v�lido detectado en proc_tree()\n" @@ -2828,21 +2828,21 @@ msgstr "NOTA: clave de la firma caducada el %s\n" msgid "assuming bad signature due to an unknown critical bit\n" msgstr "asumiendo firma incorrecta debido a un bit cr�tico desconocido\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "firma %s de: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "no puede crearse %s: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "firmando:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATENCI�N `%s' es un fichero vac�o\n" @@ -3384,7 +3384,7 @@ msgstr "datos cifrados %s\n" msgid "encrypted with unknown algorithm %d\n" msgstr "cifrado con algoritmo desconocido %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.1e\n" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 2000-06-04 15:40+02:00\n" "Last-Translator: Ga�l Qu�ri <[email protected]>\n" "Language-Team: French <[email protected]>\n" @@ -828,7 +828,7 @@ msgstr "--delete-secret-key utilisateur" msgid "--delete-key user-id" msgstr "--delete-key utilisateur" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "impossible d'ouvrir %s: %s\n" @@ -1595,7 +1595,7 @@ 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:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1603,7 +1603,7 @@ msgstr "" "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n" "probl�me d'horloge)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1790,7 +1790,7 @@ msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n" msgid "no default public keyring\n" msgstr "pas de porte-cl�s public par d�faut\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "�criture de `%s'\n" @@ -2048,7 +2048,7 @@ msgstr "" msgid "Really sign? " msgstr "Signer r�ellement ? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "la signature a �chou�: %s\n" @@ -2516,7 +2516,7 @@ msgid "no secret key\n" msgstr "pas de cl� secr�te\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, c-format msgid " [expires: %s]" msgstr " [expire: %s]" @@ -2571,59 +2571,59 @@ msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n" msgid "original file name='%.*s'\n" msgstr "nom de fichier original: '%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "Notation: " -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Politique: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "v�rification de signature supprim�e\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "MAUVAISE signature de \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Bonne signature de \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " alias \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossible de v�rifier la signature: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "signature autonome de classe 0x%02x\n" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "signature d'un ancien style (PGP 2.x)\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquet racine invalide d�tect� dans proc_tree()\n" @@ -2837,21 +2837,21 @@ msgstr "" "la signature est suppos�e �tre fausse car un bit critique est\n" "inconnu\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "Signature %s de: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "impossible de cr�er %s: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "signature:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATTENTION: `%s' est un fichier vide\n" @@ -3413,7 +3413,7 @@ msgstr "donn�es chiffr�es avec %s\n" msgid "encrypted with unknown algorithm %d\n" msgstr "chiffr� avec l'algorithme inconnu %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU Privacy Guard 1.0.1\n" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 2000-02-06 18:04+07:00\n" "Last-Translator: Tedi Heriyanto <[email protected]>\n" "Language-Team: Indonesia <[email protected]>\n" @@ -814,7 +814,7 @@ msgstr "--delete-secret-key id-user" msgid "--delete-key user-id" msgstr "--delete-key id-user" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "tidak dapat membuka %s: %s\n" @@ -1561,14 +1561,14 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "Pembuatan kunci gagal: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1752,7 +1752,7 @@ msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n" msgid "no default public keyring\n" msgstr "tidak ada keyring publik baku\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "menulis ke `%s'\n" @@ -2010,7 +2010,7 @@ msgstr "" msgid "Really sign? " msgstr "Ditandai? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "gagal menandai: %s\n" @@ -2477,7 +2477,7 @@ msgid "no secret key\n" msgstr "tidak ada kunci rahasia\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "Kunci berakhir pada %s\n" @@ -2532,59 +2532,59 @@ msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n" msgid "original file name='%.*s'\n" msgstr "nama file asli='%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "PERINGATAN: ditemukan notasi data tidak valid\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "Notasi: " -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Kebijakan: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "verifikasi signature tidak optimal\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signature dibuat %.*s menggunakan kunci %s ID %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "signature BURUK dari \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Signature baik dari \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " alias \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Tidak dapat memeriksa signature: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, fuzzy, c-format msgid "standalone signature of class 0x%02x\n" msgstr "kelas signature tidak dikenal" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "signature model lama (PGP 2.X)\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n" @@ -2792,21 +2792,21 @@ msgstr "CATATAN: kunci signature berakhir %s\n" msgid "assuming bad signature due to an unknown critical bit\n" msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "%s signature dari: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "tidak dapat membuat %s: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "menandai:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "PERINGATAN: `%s' adalah file kosong\n" @@ -3345,7 +3345,7 @@ msgstr "%s data terenkripsi\n" msgid "encrypted with unknown algorithm %d\n" msgstr "dienkripsi dengan algoritma tidak dikenal %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.0.0h\n" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 1999-12-08 15:51+02:00\n" "Last-Translator: Marco d'Itri <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" @@ -817,7 +817,7 @@ msgstr "--delete-secret-key user-id" msgid "--delete-key user-id" msgstr "--delete-key user-id" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire `%s': %s\n" @@ -1573,7 +1573,7 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1581,7 +1581,7 @@ msgstr "" "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1766,7 +1766,7 @@ msgstr "chiave %08lX: chiave pubblica non trovata: %s\n" msgid "no default public keyring\n" msgstr "nessun portachiavi pubblico predefinito\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "scrittura in `%s'\n" @@ -2024,7 +2024,7 @@ msgstr "" msgid "Really sign? " msgstr "Firmo davvero? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "firma fallita: %s\n" @@ -2494,7 +2494,7 @@ msgid "no secret key\n" msgstr "manca la chiave segreta\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "La chiave scadr� il %s\n" @@ -2549,59 +2549,59 @@ msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n" msgid "original file name='%.*s'\n" msgstr "nome del file originale='%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "ATTENZIONE: trovati dati di una nota non validi\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "Nota: " -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Policy: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "verifica della firma soppressa\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "Firma NON corretta da \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Firma valida da \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " anche noto come \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossibile controllare la firma: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "firma solitaria di classe 0x%02x\n" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "firma vecchio stile (PGP 2.x)\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "individuato un pacchetto radice non valido in proc_tree()\n" @@ -2813,21 +2813,21 @@ msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" "si suppone una firma non valida a causa di un bit critico sconosciuto\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "Firma %s da: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "impossibile creare %s: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "firma:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATTENZIONE: `%s' � un file vuoto\n" @@ -3375,7 +3375,7 @@ msgstr "dati cifrati con %s\n" msgid "encrypted with unknown algorithm %d\n" msgstr "cifrato con l'algoritmo sconosciuto %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 2000-02-16 20:10+09:00\n" "Last-Translator: IIDA Yosiaki <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" @@ -814,7 +814,7 @@ msgstr "--delete-secret-key user-id" msgid "--delete-key user-id" msgstr "--delete-key user-id" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "%s �������ޤ���: %s\n" @@ -1560,13 +1560,13 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "���κ����˼���: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "���� %lu ��̤��˺�������ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1749,7 +1749,7 @@ msgstr "�� %08lX: �����������Ĥ���ޤ���: %s\n" msgid "no default public keyring\n" msgstr "�ǥե���Ȥθ������������ޤ���\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "`%s' �ؤνФ�\n" @@ -2003,7 +2003,7 @@ msgstr "" msgid "Really sign? " msgstr "�����˽�̾���ޤ���? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "��̾�˼��Ԥ��ޤ���: %s\n" @@ -2472,7 +2472,7 @@ msgid "no secret key\n" msgstr "��̩��������ޤ���\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "���� %s �ˤƴ����ڤ�ˤʤ�ޤ�\n" @@ -2527,59 +2527,59 @@ msgstr "����: �����Ԥϡ��ɤ߽�������������פ褦�˵��Ƥ��ޤ�\n" msgid "original file name='%.*s'\n" msgstr "���Υե�����̾='%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "����: " -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "�ݥꥷ��: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "��̾�θ��ڤ��Ǥ��ޤ���\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "%.*s �� %s �� ID %08lX �ˤ���̾\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "�����ʽ�̾: \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "��������̾: \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " ��̾ \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "��̾�θ��ڤ��Ǥ��ޤ���: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "���饹0x%02x����Ω��̾\n" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "�Ť����� (PGP 2.x) �ˤ���̾\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "proc_tree() �����̵���ʥѥ��åȤ����Ф���ޤ���\n" @@ -2789,21 +2789,21 @@ msgstr "����: ��̾�θ��ϴ����ڤ�Ǥ� %s\n" msgid "assuming bad signature due to an unknown critical bit\n" msgstr "�����ʥ���ƥ�����ӥåȤ����ä��Τǡ���̾���������ȸ��ʤ��ޤ�\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "%s ��̾����̾��: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "%s �������Ǥ��ޤ���: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "��̾:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "�ٹ�: `%s' �϶��Υե�����Ǥ�\n" @@ -3346,7 +3346,7 @@ msgstr "%s �Ź沽���줿�ǡ���\n" msgid "encrypted with unknown algorithm %d\n" msgstr "�����ʥ��르�ꥺ��ˤ��Ź� %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ˤ��Ź沽����Ƥ��ޤ���\n" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 2000-02-20 21:30+01:00\n" "Last-Translator: Ivo Timmermans <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" @@ -816,7 +816,7 @@ msgstr "--delete-secret-key gebruikersidentificatie" msgid "--delete-key user-id" msgstr "--delete-key gebruikersidentificatie" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "kan %s niet openen: %s\n" @@ -1585,7 +1585,7 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "Sleutelgeneratie is mislukt: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1593,7 +1593,7 @@ msgstr "" "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n" "klokprobleem)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1779,7 +1779,7 @@ msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n" msgid "no default public keyring\n" msgstr "geen standaard openbare sleutelbos\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "schrijven naar `%s'\n" @@ -2044,7 +2044,7 @@ msgstr "" msgid "Really sign? " msgstr "Echt tekenen? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "ondertekening mislukt: %s\n" @@ -2513,7 +2513,7 @@ msgid "no secret key\n" msgstr "geen geheime sleutel\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "Sleutel verloopt op %s\n" @@ -2569,59 +2569,59 @@ msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n" msgid "original file name='%.*s'\n" msgstr "originele bestandsnaam='%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "LET OP: ongeldige aantekeningen gevonden\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "Aantekening: " -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Beleid: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "controle van de ondertekening overgeslagen\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Ondertekening gemaakt op %.*s met %s sleutel nummer %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "FOUTE ondertekening van \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Correcte ondertekening van \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " alias \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Kan ondertekening niet controleren: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "losstaande ondertekening van type 0x%02x\n" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "oude stijl (PGP 2.x) ondertekening\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n" @@ -2831,21 +2831,21 @@ msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n" msgid "assuming bad signature due to an unknown critical bit\n" msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "%s ondertekening van: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "kan %s niet aanmaken: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "ondertekenen:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "LET OP: `%s' is een leeg bestand\n" @@ -3396,7 +3396,7 @@ msgstr "%s versleutelde gegevens\n" msgid "encrypted with unknown algorithm %d\n" msgstr "versleuteld met onbekend algoritme %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.0.0\n" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 1999-10-02 21:35+02:00\n" "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" @@ -828,7 +828,7 @@ msgstr "--delete-secret-key nazwa u�ytkownika" msgid "--delete-key user-id" msgstr "--delete-key nazwa u�ytkownika" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "nie mo�na otworzy� %s: %s\n" @@ -1592,7 +1592,7 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "Generacja klucza nie powiod�a si�: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1600,7 +1600,7 @@ msgstr "" "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n" "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1785,7 +1785,7 @@ msgstr "klucz %08lX: brak klucza publicznego: %s\n" msgid "no default public keyring\n" msgstr "brak domy�lnego zbioru kluczy publicznych\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "zapis do '%s'\n" @@ -2049,7 +2049,7 @@ msgstr "" msgid "Really sign? " msgstr "Na pewno podpisa�? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "z�o�enie podpisu nie powiod�o si�: %s\n" @@ -2519,7 +2519,7 @@ msgid "no secret key\n" msgstr "brak klucza prywatnego\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "Data wa�no�ci klucza: %s\n" @@ -2574,27 +2574,27 @@ msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n" msgid "original file name='%.*s'\n" msgstr "pierwotna nazwa pliku='%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "Adnotacja:" -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Regulamin:" -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "wymuszono pomini�cie sprawdzenia podpisu\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" @@ -2602,33 +2602,33 @@ msgstr "" "z u�yciem klucza o identyfikatorze %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "NIEPOPRAWNY podpis z�o�ony przez \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Poprawny podpis z�o�ony przez \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " alias \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Nie mo�na sprawdzi� podpisu: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, fuzzy, c-format msgid "standalone signature of class 0x%02x\n" msgstr "nieznana klasa podpisu" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "podpis starego typu (PGP 2.x)\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n" @@ -2846,21 +2846,21 @@ msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" "przyj�to niewa�no�� podpisu z powonu ustawienia nieznanego bitu krytycznego\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "%s podpis z�o�ony przez: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "nie mo�na stworzy� %s: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "podpis:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n" @@ -3403,7 +3403,7 @@ msgstr "%s zaszyfrowane dane\n" msgid "encrypted with unknown algorithm %d\n" msgstr "zaszyfrowane nieznanym algorytmem %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0d79ab9fc..0031e3e90 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+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" @@ -841,7 +841,7 @@ msgstr "--delete-secret-key id-usu�rio" msgid "--delete-key user-id" msgstr "--delete-key id-usu�rio" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "imposs�vel abrir %s: %s\n" @@ -1599,7 +1599,7 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "A gera��o de chaves falhou: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1607,7 +1607,7 @@ msgstr "" "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no rel�gio)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1792,7 +1792,7 @@ msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n" msgid "no default public keyring\n" msgstr "sem chaveiro p�blico padr�o\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "escrevendo para `%s'\n" @@ -2050,7 +2050,7 @@ msgstr "" msgid "Really sign? " msgstr "Realmente assinar? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "assinatura falhou: %s\n" @@ -2520,7 +2520,7 @@ msgid "no secret key\n" msgstr "nenhuma chave secreta\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "A chave expira em %s\n" @@ -2575,59 +2575,59 @@ msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n" msgid "original file name='%.*s'\n" msgstr "nome de arquivo original='%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "AVISO: dados de nota��o inv�lidos encontrados\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "Nota��o: " -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Pol�tica: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "verifica��o de assinatura suprimida\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "Assinatura INCORRETA de \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Assinatura correta de \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " ou \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Imposs�vel verificar assinatura: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "assinatura isolada da classe 0x%02x\n" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "formato de assinatura antigo (PGP2.x)\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz inv�lido detectado em proc_tree()\n" @@ -2836,21 +2836,21 @@ msgstr "NOTA: chave de assinatura expirou %s\n" msgid "assuming bad signature due to an unknown critical bit\n" msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "assinatura %s de: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "imposs�vel criar %s: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "assinando:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVISO: `%s' � um arquivo vazio\n" @@ -3399,7 +3399,7 @@ msgstr "dados criptografados com %s\n" msgid "encrypted with unknown algorithm %d\n" msgstr "criptografado com algoritmo desconhecido %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index 3224ed713..19b2c0ca6 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg\n" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 1999-09-09 20:28+0000\n" "Last-Translator: Pedro Morais <[email protected]>\n" "Language-Team: pt\n" @@ -833,7 +833,7 @@ msgstr "--delete-secret-key id-utilizador" msgid "--delete-key user-id" msgstr "--delete-key id-utilizador" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "imposs�vel abrir %s: %s\n" @@ -1593,7 +1593,7 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "A gera��o de chaves falhou: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1601,7 +1601,7 @@ msgstr "" "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no rel�gio)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1786,7 +1786,7 @@ msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n" msgid "no default public keyring\n" msgstr "sem porta-chaves p�blico padr�o\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "a escrever para `%s'\n" @@ -2044,7 +2044,7 @@ msgstr "" msgid "Really sign? " msgstr "Realmente assinar? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "assinatura falhou: %s\n" @@ -2514,7 +2514,7 @@ msgid "no secret key\n" msgstr "nenhuma chave secreta\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "A chave expira em %s\n" @@ -2569,59 +2569,59 @@ msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n" msgid "original file name='%.*s'\n" msgstr "nome do ficheiro original='%.*s'\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "AVISO: dados de nota��o inv�lidos encontrados\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "Nota��o: " -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Pol�tica: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "verifica��o de assinatura suprimida\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "Assinatura INCORRECTA de \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Assinatura correta de \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " ou \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Imposs�vel verificar assinatura: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "assinatura de classe 0x%02x\n" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "formato de assinatura antigo (PGP2.x)\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz inv�lido detectado em proc_tree()\n" @@ -2830,21 +2830,21 @@ msgstr "NOTA: chave de assinatura expirou %s\n" msgid "assuming bad signature due to an unknown critical bit\n" msgstr "assumindo assinatura incorrecta devido a um bit cr�tico desconhecido\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "assinatura %s de: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "imposs�vel criar %s: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "a assinar:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVISO: `%s' � um ficheiro vazio\n" @@ -3389,7 +3389,7 @@ msgstr "dados encriptados com %s\n" msgid "encrypted with unknown algorithm %d\n" msgstr "encriptado com algoritmo desconhecido %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" @@ -9,7 +9,7 @@ # QingLong <qinglong@Bolizm> (couldn't send an email to let you know) msgid "" msgstr "" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck <[email protected]>\n" @@ -897,7 +897,7 @@ msgstr "--delete-secret-key ���-������������" msgid "--delete-key user-id" msgstr "--delete-key ���-������������" -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "���������� ������� ���� `%s': %s\n" @@ -1659,7 +1659,7 @@ msgstr "" msgid "Key generation failed: %s\n" msgstr "��������� ����� �� �������: %s\n" -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, fuzzy, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1667,7 +1667,7 @@ msgstr "" "�������� ���� ������������ � ������� (����������� ������� ��� ����������� " "����������� ����)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, fuzzy, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1856,7 +1856,7 @@ msgstr "���� %08lX: �������� ���� �� ������: %s\n" msgid "no default public keyring\n" msgstr "��� ������ �������� ������ �� ���������\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "������������ � `%s'\n" @@ -2117,7 +2117,7 @@ msgstr "" msgid "Really sign? " msgstr "������������� ���������? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, fuzzy, c-format msgid "signing failed: %s\n" msgstr "������ ������������: %s\n" @@ -2630,7 +2630,7 @@ msgid "no secret key\n" msgstr "������ ��������� ����" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "���� ��������� �� %s\n" @@ -2689,60 +2689,60 @@ msgstr "���������: ����������� �������� \"������-���-�����-����\"\n" msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 #, fuzzy msgid "WARNING: invalid notation data found\n" msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "" -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "" -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "������ ������� �� \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "������� ������� �� \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr "" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "���������� ��������� �������: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, fuzzy, c-format msgid "standalone signature of class 0x%02x\n" msgstr "������� ������������ ����" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -2954,22 +2954,22 @@ msgstr "��������������: ���� ������� ������� %s\n" msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" -#: g10/sign.c:139 +#: g10/sign.c:140 #, fuzzy, c-format msgid "%s signature from: %s\n" msgstr "������ ������� �� \"" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "%s: ���������� �������: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 #, fuzzy msgid "signing:" msgstr "���������" -#: g10/sign.c:411 +#: g10/sign.c:431 #, fuzzy, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "%s: ��������������: ������ ����.\n" @@ -3517,7 +3517,7 @@ msgstr "����������� ������" msgid "encrypted with unknown algorithm %d\n" msgstr "" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 #, fuzzy msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" -"POT-Creation-Date: 2000-06-08 23:11+0200\n" +"POT-Creation-Date: 2000-06-27 12:16+0200\n" "PO-Revision-Date: 2000-02-16 08:19+01:00\n" "Last-Translator: Daniel Resare <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" @@ -837,7 +837,7 @@ msgstr "--delete-key anv�ndaridentitet" # Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon # fixa en patch? -#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:373 +#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "kan inte �ppna %s: %s\n" @@ -1601,7 +1601,7 @@ msgid "Key generation failed: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" # c-format beh�vs inte i singularis -#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:111 +#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1609,7 +1609,7 @@ msgstr "" "nyckeln �r skapad %lu sekund in i framtiden (problemet �r\n" "relaterat till tidsresande eller en felst�lld klocka)\n" -#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:113 +#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1794,7 +1794,7 @@ msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n" msgid "no default public keyring\n" msgstr "ingen f�rvald publik nyckel\n" -#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:275 g10/sign.c:587 +#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611 #, c-format msgid "writing to `%s'\n" msgstr "skriver till \"%s\"\n" @@ -2053,7 +2053,7 @@ msgstr "" msgid "Really sign? " msgstr "Vill du verkligen signera? " -#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:135 +#: g10/keyedit.c:373 g10/keyedit.c:1869 g10/keyedit.c:1931 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "signeringen misslyckades: %s\n" @@ -2525,7 +2525,7 @@ msgid "no secret key\n" msgstr "ingen hemlig nyckel\n" #. of subkey -#: g10/keylist.c:318 g10/mainproc.c:741 +#: g10/keylist.c:318 g10/mainproc.c:742 #, fuzzy, c-format msgid " [expires: %s]" msgstr "Nyckeln g�r ut vid f�ljande tidpunkt: %s\n" @@ -2587,62 +2587,62 @@ msgstr "NOTERA: avs�ndaren efterfr�gade \"endast-f�r-dina-�gon\"\n" msgid "original file name='%.*s'\n" msgstr "ursprungligt filnamn=\"%.*s\"\n" -#: g10/mainproc.c:525 +#: g10/mainproc.c:526 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" "frist�ende �terkallelsecertifikat - anv�nd \"gpg --import\" f�r\n" "att applicera\n" -#: g10/mainproc.c:612 g10/mainproc.c:621 +#: g10/mainproc.c:613 g10/mainproc.c:622 msgid "WARNING: invalid notation data found\n" msgstr "VARNING: ogiltig notationsdata hittades\n" -#: g10/mainproc.c:624 +#: g10/mainproc.c:625 msgid "Notation: " msgstr "Notation: " # finns det n�gon bra svensk �vers�ttning av policy? -#: g10/mainproc.c:631 +#: g10/mainproc.c:632 msgid "Policy: " msgstr "Policy: " -#: g10/mainproc.c:1061 +#: g10/mainproc.c:1062 msgid "signature verification suppressed\n" msgstr "signaturen verifierades inte\n" -#: g10/mainproc.c:1067 +#: g10/mainproc.c:1068 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signerades %.*s med hj�lp av %s-nyckeln med ID %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1093 g10/mainproc.c:1104 +#: g10/mainproc.c:1094 g10/mainproc.c:1105 msgid "BAD signature from \"" msgstr "FELAKTIG signatur fr�n \"" -#: g10/mainproc.c:1094 g10/mainproc.c:1105 +#: g10/mainproc.c:1095 g10/mainproc.c:1106 msgid "Good signature from \"" msgstr "Korrekt signatur fr�n \"" -#: g10/mainproc.c:1096 +#: g10/mainproc.c:1097 msgid " aka \"" msgstr " �ven k�nd som \"" -#: g10/mainproc.c:1152 +#: g10/mainproc.c:1153 #, c-format msgid "Can't check signature: %s\n" msgstr "Kan inte verifiera signaturen: %s\n" -#: g10/mainproc.c:1213 +#: g10/mainproc.c:1217 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "frist�ende signatur av klassen 0x%02x\n" -#: g10/mainproc.c:1254 +#: g10/mainproc.c:1263 msgid "old style (PGP 2.x) signature\n" msgstr "signatur av den gamla (PGP 2.x) typen\n" -#: g10/mainproc.c:1259 +#: g10/mainproc.c:1268 msgid "invalid root packet detected in proc_tree()\n" msgstr "felaktigt rotpaket hittades i proc_tree()\n" @@ -2854,21 +2854,21 @@ msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" "antar att signaturen �r felaktig eftersom en ok�nd kritisk bit �r satt\n" -#: g10/sign.c:139 +#: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" msgstr "%s-signatur fr�n: %s\n" -#: g10/sign.c:270 g10/sign.c:582 +#: g10/sign.c:290 g10/sign.c:606 #, c-format msgid "can't create %s: %s\n" msgstr "kan inte skapa %s: %s\n" -#: g10/sign.c:368 +#: g10/sign.c:388 msgid "signing:" msgstr "signerar:" -#: g10/sign.c:411 +#: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "VARNING: \"%s\" �r en tom fil\n" @@ -3421,7 +3421,7 @@ msgstr "%s krypterad data\n" msgid "encrypted with unknown algorithm %d\n" msgstr "krypterad med en ok�nd algoritm %d\n" -#: g10/encr-data.c:89 +#: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" |