security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch

This commit is contained in:
Werner Koch 1998-12-29 13:47:31 +00:00
parent 1df0e1540d
commit 6e08b235cb
54 changed files with 2441 additions and 534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AUTHORS
View File

@ -56,14 +56,18 @@ TRANSLATIONS Thiago Jung Bauermann ????????????????
pt_BR.po pt_BR.po
TRANSLATIONS Janusz A. Urbanowicz ???????????
pl.po
Other notes: Other notes:
============ ============
This program uses the zlib compression library written by This program uses the zlib compression library written by
Jean-loup Gailly and Mark Adler. Jean-loup Gailly and Mark Adler.
Most of the stuff in mpi has been taken from the GMP library. Most of the stuff in mpi has been taken from the GMP library by
[Who is the author??] Torbjorn Granlund <tege@noisy.tmg.se>.
The keybox implementation is based on GDBM 1.7.3 by Philip A. Nelson. The keybox implementation is based on GDBM 1.7.3 by Philip A. Nelson.

4
NEWS
View File

@ -1,3 +1,7 @@
* Polish language support.
Noteworthy changes in version 0.9.0 Noteworthy changes in version 0.9.0
----------------------------------- -----------------------------------

2
PROJECTS
View File

@ -45,3 +45,5 @@
* Work on the library * Work on the library
* Keep a list of duplicate, faked or unwanted keyids.

5
THANKS
View File

@ -13,6 +13,7 @@ Cees van de Griend cees-list@griend.xs4all.nl
Charles Levert charles@comm.polymtl.ca Charles Levert charles@comm.polymtl.ca
Christian von Roques roques@pond.sub.org Christian von Roques roques@pond.sub.org
Christopher Oliver oliver@fritz.traverse.net Christopher Oliver oliver@fritz.traverse.net
Christian Recktenwald chris@citecs.de
Daniel Eisenbud eisenbud@cs.swarthmore.edu Daniel Eisenbud eisenbud@cs.swarthmore.edu
David Ellement ellement@sdd.hp.com David Ellement ellement@sdd.hp.com
Detlef Lannert lannert@lannert.rz.uni-duesseldorf.de Detlef Lannert lannert@lannert.rz.uni-duesseldorf.de
@ -27,10 +28,12 @@ Greg Louis glouis@dynamicro.on.ca
Greg Troxel gdt@ir.bbn.com Greg Troxel gdt@ir.bbn.com
Gregory Steuck steuck@iname.com Gregory Steuck steuck@iname.com
Geoff Keating geoffk@ozemail.com.au Geoff Keating geoffk@ozemail.com.au
Harald Denker harry@hal.westfalen.de
Hendrik Buschkamp buschkamp@rheumanet.org Hendrik Buschkamp buschkamp@rheumanet.org
Holger Schurig holger@d.om.org Holger Schurig holger@d.om.org
Hugh Daniel hugh@toad.com Hugh Daniel hugh@toad.com
Ian McKellar imckellar@harvestroad.com.au Ian McKellar imckellar@harvestroad.com.au
Janusz A. Urbanowicz alex@bofh.torun.pl
James Troup james@nocrew.org James Troup james@nocrew.org
Jean-loup Gailly gzip@prep.ai.mit.edu Jean-loup Gailly gzip@prep.ai.mit.edu
Jens Bachem bachem@rrz.uni-koeln.de Jens Bachem bachem@rrz.uni-koeln.de
@ -77,7 +80,7 @@ Tomas Fasth tomas.fasth@twinspot.net
Thomas Mikkelsen tbm@image.dk Thomas Mikkelsen tbm@image.dk
Ulf Möller 3umoelle@informatik.uni-hamburg.de Ulf Möller 3umoelle@informatik.uni-hamburg.de
Urko Lusa ulusa@lacueva.ddns.org Urko Lusa ulusa@lacueva.ddns.org
Walter Koch walterk@ddorf.rhein-ruhr.de Walter Koch walterk@dip.de
Werner Koch werner.koch@guug.de Werner Koch werner.koch@guug.de
Wim Vandeputte bunbun@reptile.rug.ac.be Wim Vandeputte bunbun@reptile.rug.ac.be
nbecker@hns.com nbecker@hns.com

8
TODO
View File

@ -15,11 +15,10 @@ Important
* It has been reported that lockfiles are not removed in all cases. * It has been reported that lockfiles are not removed in all cases.
cleanup is done with atexit() and all signals trigger exit() - cleanup is done with atexit() and all signals trigger exit() -
anything wrong with this? anything wrong with this? - ah yes: a signal while still in
dotlock_make
* I noticed, that we sometimes have only 3 items in a trustrecord, but * See why we always get this "Hmmm public key lost"
a next pointer ro more records - check wehther the reuse code really
works. Maybe this is the reason for the "Hmmm public key lost"
Needed Needed
------ ------
@ -44,4 +43,5 @@ Nice to have
* Burn the buffers used by fopen(), or use read(2). Does this * Burn the buffers used by fopen(), or use read(2). Does this
really make sense? really make sense?
* change the fake_data stuff to mpi_set_opaque * change the fake_data stuff to mpi_set_opaque
* rewrite the ugly armor code.

2
VERSION
View File

@ -1 +1 @@
0.9.0 0.9.0a

2
checks/defs.inc
View File

@ -75,11 +75,11 @@ pgmname=`basename $0`
[ -z "$srcdir" ] && fatal "not called from make" [ -z "$srcdir" ] && fatal "not called from make"
# Note don't use lock-once here because we call gpg in a pipe
cat <<EOF >./options cat <<EOF >./options
no-greeting no-greeting
no-secmem-warning no-secmem-warning
load-extension ../cipher/tiger load-extension ../cipher/tiger
lock-once
batch batch
EOF EOF

2
checks/run-gpg.patterns
View File

@ -5,4 +5,4 @@ gpg: NOTE: cipher algorithm 4 not found in preferences
gpg: NOTE: secret key 2E5FA4F4 is NOT protected. gpg: NOTE: secret key 2E5FA4F4 is NOT protected.
gpg: NOTE: secret key 439F02CA is NOT protected. gpg: NOTE: secret key 439F02CA is NOT protected.
gpg: WARNING: using insecure random number generator gpg: WARNING: using insecure random number generator
gpg: NOTE: This is a development version! gpg: NOTE: this is a development version!

5
cipher/ChangeLog
View File

@ -1,3 +1,8 @@
Tue Dec 29 14:41:47 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
* random.c: add unistd.h for getpid().
(RAND_MAX): Fallback value for Sun.
Wed Dec 23 17:12:24 CET 1998 Werner Koch <wk@isil.d.shuttle.de> Wed Dec 23 17:12:24 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
* md.c (md_copy): Reset debug. * md.c (md_copy): Reset debug.

4
cipher/dynload.c
View File

@ -126,7 +126,7 @@ register_cipher_extension( const char *mainpgm, const char *fname )
intex = NULL; intex = NULL;
for(r = extensions; r; r = r->next ) { for(r = extensions; r; r = r->next ) {
if( !compare_filenames(r->name, el->name) ) { if( !compare_filenames(r->name, el->name) ) {
log_info("extension '%s' already registered\n", el->name ); log_info("extension `%s' already registered\n", el->name );
m_free(el); m_free(el);
return; return;
} }
@ -162,7 +162,7 @@ register_internal_cipher_extension(
/* check that it is not already registered */ /* check that it is not already registered */
for(r = extensions; r; r = r->next ) { for(r = extensions; r; r = r->next ) {
if( !compare_filenames(r->name, el->name) ) { if( !compare_filenames(r->name, el->name) ) {
log_info("extension '%s' already registered\n", el->name ); log_info("extension `%s' already registered\n", el->name );
m_free(el); m_free(el);
return; return;
} }

6
cipher/random.c
View File

@ -35,6 +35,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h>
#ifdef HAVE_GETHRTIME #ifdef HAVE_GETHRTIME
#include <sys/times.h> #include <sys/times.h>
#endif #endif
@ -53,6 +54,11 @@
#include "dynload.h" #include "dynload.h"
#ifndef RAND_MAX /* for SunOS */
#define RAND_MAX 32767
#endif
#if SIZEOF_UNSIGNED_LONG == 8 #if SIZEOF_UNSIGNED_LONG == 8
#define ADD_VALUE 0xa5a5a5a5a5a5a5a5 #define ADD_VALUE 0xa5a5a5a5a5a5a5a5
#elif SIZEOF_UNSIGNED_LONG == 4 #elif SIZEOF_UNSIGNED_LONG == 4

2
cipher/rndunix.c
View File

@ -560,7 +560,7 @@ start_gatherer( int pipefd )
if( s ) { if( s ) {
dbgfp = (*s=='-' && !s[1])? stdout : fopen(s, "a"); dbgfp = (*s=='-' && !s[1])? stdout : fopen(s, "a");
if( !dbgfp ) if( !dbgfp )
g10_log_info("can't open debug file '%s': %s\n", g10_log_info("can't open debug file `%s': %s\n",
s, strerror(errno) ); s, strerror(errno) );
else else
fprintf(dbgfp,"\nSTART RNDUNIX DEBUG pid=%d\n", (int)getpid()); fprintf(dbgfp,"\nSTART RNDUNIX DEBUG pid=%d\n", (int)getpid());

2
configure.in
View File

@ -14,7 +14,7 @@ AM_CONFIG_HEADER(config.h)
VERSION=`cat $srcdir/VERSION` VERSION=`cat $srcdir/VERSION`
PACKAGE=gnupg PACKAGE=gnupg
ALL_LINGUAS="de it fr ru es_ES pt_BR" ALL_LINGUAS="de es_ES fr it pl pt_BR ru"
AC_SUBST(VERSION) AC_SUBST(VERSION)
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_DEFINE_UNQUOTED(VERSION, "$VERSION")

11
g10/ChangeLog
View File

@ -1,3 +1,14 @@
Tue Dec 29 14:41:47 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
* misc.c (disable_core_dumps): Check for EINVAL (Atari)
* getkey (merge_one_pk_and_selfsig): Fixed search of expiredate.
(merge_keys_and_selfsig): Ditto.
* free-packet.c (cmp_public_keys): cmp expire only for v3 packets
(cmp_secret_keys): Ditto.
(cmp_public_secret_key): Ditto.
Wed Dec 23 17:12:24 CET 1998 Werner Koch <wk@isil.d.shuttle.de> Wed Dec 23 17:12:24 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
* armor.c (find_header): Reset not_dashed at every header * armor.c (find_header): Reset not_dashed at every header

6
g10/armor.c
View File

@ -279,7 +279,6 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen,
buflen = *r_buflen; buflen = *r_buflen;
assert(buflen >= 100 ); assert(buflen >= 100 );
buflen -= 4; /* reserved room for CR,LF, and two extra */ buflen -= 4; /* reserved room for CR,LF, and two extra */
do { do {
switch( state ) { switch( state ) {
case fhdrHASArmor: case fhdrHASArmor:
@ -630,8 +629,9 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen,
} }
} while( cont ); } while( cont );
if( clearsig && state == fhdrTEXT ) if( clearsig && state == fhdrTEXT ) {
state = fhdrCLEARSIG; state = fhdrCLEARSIG;
}
else if( clearsig && state == fhdrTEXTSimple ) { else if( clearsig && state == fhdrTEXTSimple ) {
state = fhdrCLEARSIGSimple; state = fhdrCLEARSIGSimple;
buf[n] = '\n'; buf[n] = '\n';
@ -1080,7 +1080,7 @@ armor_filter( void *opaque, int control,
} }
else else
iobuf_writestr(a, iobuf_writestr(a,
"Comment: For info see www.gnupg.org"); "Comment: For info see http://www.gnupg.org\n");
if( afx->hdrlines ) if( afx->hdrlines )
iobuf_writestr(a, afx->hdrlines); iobuf_writestr(a, afx->hdrlines);
iobuf_put(a, '\n'); iobuf_put(a, '\n');

2
g10/decrypt.c
View File

@ -56,7 +56,7 @@ decrypt_message( const char *filename )
/* open the message file */ /* open the message file */
fp = iobuf_open(filename); fp = iobuf_open(filename);
if( !fp ) { if( !fp ) {
log_error(_("can't open '%s'\n"), print_fname_stdin(filename)); log_error(_("can't open `%s'\n"), print_fname_stdin(filename));
return G10ERR_OPEN_FILE; return G10ERR_OPEN_FILE;
} }

2
g10/encode.c
View File

@ -219,7 +219,7 @@ encode_crypt( const char *filename, STRLIST remusr )
goto leave; goto leave;
} }
else if( opt.verbose ) else if( opt.verbose )
log_info(_("reading from '%s'\n"), filename? filename: "[stdin]"); log_info(_("reading from `%s'\n"), filename? filename: "[stdin]");
if( (rc = open_outfile( filename, opt.armor? 1:0, &out )) ) if( (rc = open_outfile( filename, opt.armor? 1:0, &out )) )
goto leave; goto leave;

2
g10/encr-data.c
View File

@ -71,7 +71,7 @@ decrypt_data( PKT_encrypted *ed, DEK *dek )
dfx.cipher_hd = cipher_open( dek->algo, CIPHER_MODE_AUTO_CFB, 1 ); dfx.cipher_hd = cipher_open( dek->algo, CIPHER_MODE_AUTO_CFB, 1 );
rc = cipher_setkey( dfx.cipher_hd, dek->key, dek->keylen ); rc = cipher_setkey( dfx.cipher_hd, dek->key, dek->keylen );
if( rc == G10ERR_WEAK_KEY ) if( rc == G10ERR_WEAK_KEY )
log_info(_("WARNING: Message was encrypted with " log_info(_("WARNING: message was encrypted with "
"a weak key in the symmetric cipher.\n")); "a weak key in the symmetric cipher.\n"));
else if( rc ) else if( rc )
log_error("key setup failed: %s\n", g10_errstr(rc) ); log_error("key setup failed: %s\n", g10_errstr(rc) );

6
g10/free-packet.c
View File

@ -354,7 +354,7 @@ cmp_public_keys( PKT_public_key *a, PKT_public_key *b )
if( a->timestamp != b->timestamp ) if( a->timestamp != b->timestamp )
return -1; return -1;
if( a->expiredate != b->expiredate ) if( a->version < 4 && a->expiredate != b->expiredate )
return -1; return -1;
if( a->pubkey_algo != b->pubkey_algo ) if( a->pubkey_algo != b->pubkey_algo )
return -1; return -1;
@ -381,7 +381,7 @@ cmp_secret_keys( PKT_secret_key *a, PKT_secret_key *b )
if( a->timestamp != b->timestamp ) if( a->timestamp != b->timestamp )
return -1; return -1;
if( a->expiredate != b->expiredate ) if( a->version < 4 && a->expiredate != b->expiredate )
return -1; return -1;
if( a->pubkey_algo != b->pubkey_algo ) if( a->pubkey_algo != b->pubkey_algo )
return -1; return -1;
@ -407,7 +407,7 @@ cmp_public_secret_key( PKT_public_key *pk, PKT_secret_key *sk )
if( pk->timestamp != sk->timestamp ) if( pk->timestamp != sk->timestamp )
return -1; return -1;
if( pk->expiredate != sk->expiredate ) if( pk->version < 4 && pk->expiredate != sk->expiredate )
return -1; return -1;
if( pk->pubkey_algo != sk->pubkey_algo ) if( pk->pubkey_algo != sk->pubkey_algo )
return -1; return -1;

14
g10/g10.c
View File

@ -615,18 +615,18 @@ main( int argc, char **argv )
if( !configfp ) { if( !configfp ) {
if( default_config ) { if( default_config ) {
if( parse_debug ) if( parse_debug )
log_info(_("NOTE: no default option file '%s'\n"), log_info(_("NOTE: no default option file `%s'\n"),
configname ); configname );
} }
else { else {
log_error(_("option file '%s': %s\n"), log_error(_("option file `%s': %s\n"),
configname, strerror(errno) ); configname, strerror(errno) );
g10_exit(2); g10_exit(2);
} }
m_free(configname); configname = NULL; m_free(configname); configname = NULL;
} }
if( parse_debug && configname ) if( parse_debug && configname )
log_info(_("reading options from '%s'\n"), configname ); log_info(_("reading options from `%s'\n"), configname );
default_config = 0; default_config = 0;
} }
@ -855,7 +855,7 @@ main( int argc, char **argv )
for( ; *p && (isdigit(*p) || *p=='.'); p++ ) for( ; *p && (isdigit(*p) || *p=='.'); p++ )
; ;
if( *p ) if( *p )
log_info("NOTE: This is a development version!\n"); log_info("NOTE: this is a development version!\n");
} }
if( log_get_errorcount(0) ) if( log_get_errorcount(0) )
@ -1088,7 +1088,7 @@ main( int argc, char **argv )
for( ; argc; argc--, argv++ ) { for( ; argc; argc--, argv++ ) {
rc = import_keys( *argv, (cmd == aFastImport) ); rc = import_keys( *argv, (cmd == aFastImport) );
if( rc ) if( rc )
log_error("import from '%s' failed: %s\n", log_error("import from `%s' failed: %s\n",
*argv, g10_errstr(rc) ); *argv, g10_errstr(rc) );
} }
break; break;
@ -1198,7 +1198,7 @@ main( int argc, char **argv )
int algo = string_to_digest_algo(*argv); int algo = string_to_digest_algo(*argv);
if( !algo ) if( !algo )
log_error(_("invalid hash algorithm '%s'\n"), *argv ); log_error(_("invalid hash algorithm `%s'\n"), *argv );
else { else {
argc--; argv++; argc--; argv++;
if( !argc ) if( !argc )
@ -1284,7 +1284,7 @@ main( int argc, char **argv )
log_info(_("Go ahead and type your message ...\n")); log_info(_("Go ahead and type your message ...\n"));
if( !(a = iobuf_open(fname)) ) if( !(a = iobuf_open(fname)) )
log_error(_("can't open '%s'\n"), print_fname_stdin(fname)); log_error(_("can't open `%s'\n"), print_fname_stdin(fname));
else { else {
if( !opt.no_armor ) { if( !opt.no_armor ) {

18
g10/getkey.c
View File

@ -723,7 +723,8 @@ compare_name( const char *uid, size_t uidlen, const char *name, int mode )
*/ */
static void static void
merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode ) merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode,
PKT_public_key *orig_pk )
{ {
PKT_public_key *pk = knode->pkt->pkt.public_key; PKT_public_key *pk = knode->pkt->pkt.public_key;
PKT_signature *sig; PKT_signature *sig;
@ -737,6 +738,7 @@ merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode )
if( pk->version < 4 ) if( pk->version < 4 )
return; /* this is only needed for version >=4 packets */ return; /* this is only needed for version >=4 packets */
/* find the selfsignature */ /* find the selfsignature */
if( knode->pkt->pkttype == PKT_PUBLIC_SUBKEY ) { if( knode->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
k = find_kbnode( keyblock, PKT_PUBLIC_KEY ); k = find_kbnode( keyblock, PKT_PUBLIC_KEY );
@ -747,7 +749,7 @@ merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode )
else else
keyid_from_pk( pk, kid ); keyid_from_pk( pk, kid );
for(k=keyblock; k; k = k->next ) { for(k=knode->next; k; k = k->next ) {
if( k->pkt->pkttype == PKT_SIGNATURE if( k->pkt->pkttype == PKT_SIGNATURE
&& (sig=k->pkt->pkt.signature)->sig_class >= 0x10 && (sig=k->pkt->pkt.signature)->sig_class >= 0x10
&& sig->sig_class <= 0x30 && sig->sig_class <= 0x30
@ -765,12 +767,16 @@ merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode )
p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL ); p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL );
ed = p? pk->timestamp + buffer_to_u32(p):0; ed = p? pk->timestamp + buffer_to_u32(p):0;
/* use the latest self signature */
if( sig->timestamp > sigdate ) { if( sig->timestamp > sigdate ) {
pk->expiredate = ed; pk->expiredate = ed;
orig_pk->expiredate = ed;
sigdate = sig->timestamp; sigdate = sig->timestamp;
} }
/* fixme: add usage etc. to pk */ /* fixme: add usage etc. to pk */
} }
else if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY )
break; /* stop here */
} }
} }
@ -796,6 +802,7 @@ merge_keys_and_selfsig( KBNODE keyblock )
pk = NULL; /* not needed for old keys */ pk = NULL; /* not needed for old keys */
else if( k->pkt->pkttype == PKT_PUBLIC_KEY ) else if( k->pkt->pkttype == PKT_PUBLIC_KEY )
keyid_from_pk( pk, kid ); keyid_from_pk( pk, kid );
sigdate = 0;
} }
else if( k->pkt->pkttype == PKT_SECRET_KEY else if( k->pkt->pkttype == PKT_SECRET_KEY
|| k->pkt->pkttype == PKT_SECRET_SUBKEY ) { || k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
@ -804,6 +811,7 @@ merge_keys_and_selfsig( KBNODE keyblock )
sk = NULL; sk = NULL;
else if( k->pkt->pkttype == PKT_SECRET_KEY ) else if( k->pkt->pkttype == PKT_SECRET_KEY )
keyid_from_sk( sk, kid ); keyid_from_sk( sk, kid );
sigdate = 0;
} }
else if( (pk || sk ) && k->pkt->pkttype == PKT_SIGNATURE else if( (pk || sk ) && k->pkt->pkttype == PKT_SIGNATURE
&& (sig=k->pkt->pkt.signature)->sig_class >= 0x10 && (sig=k->pkt->pkt.signature)->sig_class >= 0x10
@ -982,7 +990,7 @@ finish_lookup( KBNODE keyblock, PKT_public_key *pk, KBNODE k, byte *namehash,
if( primary && !pk->pubkey_usage ) { if( primary && !pk->pubkey_usage ) {
copy_public_key_new_namehash( pk, keyblock->pkt->pkt.public_key, copy_public_key_new_namehash( pk, keyblock->pkt->pkt.public_key,
use_namehash? namehash:NULL); use_namehash? namehash:NULL);
merge_one_pk_and_selfsig( keyblock, keyblock ); merge_one_pk_and_selfsig( keyblock, keyblock, pk );
} }
else { else {
if( primary && pk->pubkey_usage if( primary && pk->pubkey_usage
@ -1027,7 +1035,7 @@ finish_lookup( KBNODE keyblock, PKT_public_key *pk, KBNODE k, byte *namehash,
copy_public_key_new_namehash( pk, k->pkt->pkt.public_key, copy_public_key_new_namehash( pk, k->pkt->pkt.public_key,
use_namehash? namehash:NULL); use_namehash? namehash:NULL);
merge_one_pk_and_selfsig( keyblock, k ); merge_one_pk_and_selfsig( keyblock, k, pk );
} }
} }
@ -1395,7 +1403,7 @@ enum_secret_keys( void **context, PKT_secret_key *sk, int with_subkeys )
for( ; c->name; c->name = enum_keyblock_resources( &c->sequence, 1 ) ) { for( ; c->name; c->name = enum_keyblock_resources( &c->sequence, 1 ) ) {
if( !c->iobuf ) { if( !c->iobuf ) {
if( !(c->iobuf = iobuf_open( c->name ) ) ) { if( !(c->iobuf = iobuf_open( c->name ) ) ) {
log_error("enum_secret_keys: can't open '%s'\n", c->name ); log_error("enum_secret_keys: can't open `%s'\n", c->name );
continue; /* try next file */ continue; /* try next file */
} }
} }

6
g10/gpgd.c
View File

@ -195,18 +195,18 @@ main( int argc, char **argv )
if( !configfp ) { if( !configfp ) {
if( default_config ) { if( default_config ) {
if( parse_debug ) if( parse_debug )
log_info("note: no default option file '%s'\n", log_info("note: no default option file `%s'\n",
configname ); configname );
} }
else { else {
log_error("option file '%s': %s\n", log_error("option file `%s': %s\n",
configname, strerror(errno) ); configname, strerror(errno) );
g10_exit(1); g10_exit(1);
} }
m_free(configname); configname = NULL; m_free(configname); configname = NULL;
} }
if( parse_debug && configname ) if( parse_debug && configname )
log_info("reading options from '%s'\n", configname ); log_info("reading options from `%s'\n", configname );
default_config = 0; default_config = 0;
} }

2
g10/helptext.c
View File

@ -213,7 +213,7 @@ display_online_help( const char *keyword )
for(i=0; (p=helptexts[i].key) && strcmp( p, keyword ); i++ ) for(i=0; (p=helptexts[i].key) && strcmp( p, keyword ); i++ )
; ;
if( !p || !*helptexts[i].help ) if( !p || !*helptexts[i].help )
tty_printf(_("No help available for '%s'"), keyword ); tty_printf(_("No help available for `%s'"), keyword );
else else
tty_printf("%s", helptexts[i].help ); tty_printf("%s", helptexts[i].help );
} }

2
g10/import.c
View File

@ -359,7 +359,7 @@ import_one( const char *fname, KBNODE keyblock, int fast )
return G10ERR_GENERAL; return G10ERR_GENERAL;
} }
if( opt.verbose > 1 ) if( opt.verbose > 1 )
log_info_f( fname, _("writing to '%s'\n"), log_info_f( fname, _("writing to `%s'\n"),
keyblock_resource_name(&kbpos) ); keyblock_resource_name(&kbpos) );
if( (rc=lock_keyblock( &kbpos )) ) if( (rc=lock_keyblock( &kbpos )) )
log_error_f( keyblock_resource_name(&kbpos), log_error_f( keyblock_resource_name(&kbpos),

4
g10/keyedit.c
View File

@ -666,7 +666,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands )
tty_printf(_("Key not changed so no update needed.\n")); tty_printf(_("Key not changed so no update needed.\n"));
rc = update_trust_record( keyblock, 0, NULL ); rc = update_trust_record( keyblock, 0, NULL );
if( rc ) if( rc )
log_error(_("update of trust db failed: %s\n"), log_error(_("update of trustdb failed: %s\n"),
g10_errstr(rc) ); g10_errstr(rc) );
goto leave; goto leave;
@ -724,7 +724,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands )
* get listed correctly */ * get listed correctly */
rc = update_trust_record( keyblock, 0, NULL ); rc = update_trust_record( keyblock, 0, NULL );
if( rc ) { if( rc ) {
log_error(_("update of trust db failed: %s\n"), log_error(_("update of trustdb failed: %s\n"),
g10_errstr(rc) ); g10_errstr(rc) );
rc = 0; rc = 0;
} }

12
g10/keygen.c
View File

@ -848,8 +848,8 @@ generate_keypair()
pub_fname = make_filename(opt.homedir, "pubring.gpg", NULL ); pub_fname = make_filename(opt.homedir, "pubring.gpg", NULL );
sec_fname = make_filename(opt.homedir, "secring.gpg", NULL ); sec_fname = make_filename(opt.homedir, "secring.gpg", NULL );
if( opt.verbose ) { if( opt.verbose ) {
tty_printf(_("writing public certificate to '%s'\n"), pub_fname ); tty_printf(_("writing public certificate to `%s'\n"), pub_fname );
tty_printf(_("writing secret certificate to '%s'\n"), sec_fname ); tty_printf(_("writing secret certificate to `%s'\n"), sec_fname );
} }
/* we create the packets as a tree of kbnodes. Because the structure /* we create the packets as a tree of kbnodes. Because the structure
@ -894,11 +894,11 @@ generate_keypair()
/* we can now write the certificates */ /* we can now write the certificates */
if( get_keyblock_handle( pub_fname, 0, &pub_kbpos ) ) { if( get_keyblock_handle( pub_fname, 0, &pub_kbpos ) ) {
if( add_keyblock_resource( pub_fname, 1, 0 ) ) { if( add_keyblock_resource( pub_fname, 1, 0 ) ) {
log_error("can add keyblock file '%s'\n", pub_fname ); log_error("can add keyblock file `%s'\n", pub_fname );
rc = G10ERR_CREATE_FILE; rc = G10ERR_CREATE_FILE;
} }
else if( get_keyblock_handle( pub_fname, 0, &pub_kbpos ) ) { else if( get_keyblock_handle( pub_fname, 0, &pub_kbpos ) ) {
log_error("can get keyblock handle for '%s'\n", pub_fname ); log_error("can get keyblock handle for `%s'\n", pub_fname );
rc = G10ERR_CREATE_FILE; rc = G10ERR_CREATE_FILE;
} }
} }
@ -906,11 +906,11 @@ generate_keypair()
; ;
else if( get_keyblock_handle( sec_fname, 1, &sec_kbpos ) ) { else if( get_keyblock_handle( sec_fname, 1, &sec_kbpos ) ) {
if( add_keyblock_resource( sec_fname, 1, 1 ) ) { if( add_keyblock_resource( sec_fname, 1, 1 ) ) {
log_error("can add keyblock file '%s'\n", sec_fname ); log_error("can add keyblock file `%s'\n", sec_fname );
rc = G10ERR_CREATE_FILE; rc = G10ERR_CREATE_FILE;
} }
else if( get_keyblock_handle( sec_fname, 1, &sec_kbpos ) ) { else if( get_keyblock_handle( sec_fname, 1, &sec_kbpos ) ) {
log_error("can get keyblock handle for '%s'\n", sec_fname ); log_error("can get keyblock handle for `%s'\n", sec_fname );
rc = G10ERR_CREATE_FILE; rc = G10ERR_CREATE_FILE;
} }
} }

4
g10/mainproc.c
View File

@ -195,7 +195,7 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
; ;
else if( !result ) { else if( !result ) {
if( opt.verbose > 1 ) if( opt.verbose > 1 )
log_info( _("public key encrypted data: Good DEK\n") ); log_info( _("public key encrypted data: good DEK\n") );
} }
else { else {
log_error(_("public key decryption failed: %s\n"), g10_errstr(result)); log_error(_("public key decryption failed: %s\n"), g10_errstr(result));
@ -278,7 +278,7 @@ proc_plaintext( CTX c, PACKET *pkt )
md_enable( c->mfx.md, DIGEST_ALGO_SHA1 ); md_enable( c->mfx.md, DIGEST_ALGO_SHA1 );
md_enable( c->mfx.md, DIGEST_ALGO_MD5 ); md_enable( c->mfx.md, DIGEST_ALGO_MD5 );
} }
/*md_start_debug( c->mfx.md, "verify" );*/ md_start_debug( c->mfx.md, "verify" );
rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig ); rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig );
if( rc == G10ERR_CREATE_FILE && !c->sigs_only) { if( rc == G10ERR_CREATE_FILE && !c->sigs_only) {
/* can't write output but we hash it anyway to /* can't write output but we hash it anyway to

10
g10/misc.c
View File

@ -84,11 +84,13 @@ disable_core_dumps()
limit.rlim_cur = 0; limit.rlim_cur = 0;
limit.rlim_max = 0; limit.rlim_max = 0;
if( setrlimit( RLIMIT_CORE, &limit ) ) if( !setrlimit( RLIMIT_CORE, &limit ) )
return;
if( errno != EINVAL )
log_fatal(_("can't disable core dumps: %s\n"), strerror(errno) ); log_fatal(_("can't disable core dumps: %s\n"), strerror(errno) );
#else
log_info(_("WARNING: Program may create a core file!\n"));
#endif #endif
if( !opt.quiet )
log_info(_("WARNING: program may create a core file!\n"));
} }
@ -230,7 +232,7 @@ print_cipher_algo_note( int algo )
if( !did_note ) { if( !did_note ) {
did_note = 1; did_note = 1;
log_info(_("This cipher algorithm is depreciated; " log_info(_("this cipher algorithm is depreciated; "
"please use a more standard one!\n")); "please use a more standard one!\n"));
} }
} }

6
g10/openfile.c
View File

@ -55,7 +55,7 @@ overwrite_filep( const char *fname )
if( opt.answer_no || opt.batch ) if( opt.answer_no || opt.batch )
return 0; /* do not overwrite */ return 0; /* do not overwrite */
tty_printf(_("File '%s' exists. "), fname); tty_printf(_("File `%s' exists. "), fname);
if( cpr_get_answer_is_yes("openfile.overwrite.okay", if( cpr_get_answer_is_yes("openfile.overwrite.okay",
_("Overwrite (y/N)? ")) ) _("Overwrite (y/N)? ")) )
return 1; return 1;
@ -102,7 +102,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
rc = G10ERR_CREATE_FILE; rc = G10ERR_CREATE_FILE;
} }
else if( opt.verbose ) else if( opt.verbose )
log_info(_("writing to '%s'\n"), name ); log_info(_("writing to `%s'\n"), name );
} }
else else
rc = G10ERR_FILE_EXISTS; rc = G10ERR_FILE_EXISTS;
@ -131,7 +131,7 @@ open_sigfile( const char *iname )
buf[len-4] = 0 ; buf[len-4] = 0 ;
a = iobuf_open( buf ); a = iobuf_open( buf );
if( opt.verbose ) if( opt.verbose )
log_info(_("assuming signed data in '%s'\n"), buf ); log_info(_("assuming signed data in `%s'\n"), buf );
m_free(buf); m_free(buf);
} }
} }

2
g10/pkclist.c
View File

@ -541,7 +541,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned usage )
rc = check_trust( pk, &trustlevel ); rc = check_trust( pk, &trustlevel );
if( rc ) { if( rc ) {
log_error("error checking pk of '%s': %s\n", log_error("error checking pk of `%s': %s\n",
answer, g10_errstr(rc) ); answer, g10_errstr(rc) );
} }
else if( do_we_trust_pre( pk, trustlevel ) ) { else if( do_we_trust_pre( pk, trustlevel ) ) {

12
g10/plaintext.c
View File

@ -123,7 +123,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
if( fp || nooutput ) if( fp || nooutput )
; ;
else if( !(fp = fopen(fname,"wb")) ) { else if( !(fp = fopen(fname,"wb")) ) {
log_error("Error creating '%s': %s\n", fname, strerror(errno) ); log_error("Error creating `%s': %s\n", fname, strerror(errno) );
rc = G10ERR_CREATE_FILE; rc = G10ERR_CREATE_FILE;
goto leave; goto leave;
} }
@ -146,7 +146,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
continue; /* fixme: this hack might be too simple */ continue; /* fixme: this hack might be too simple */
if( fp ) { if( fp ) {
if( putc( c, fp ) == EOF ) { if( putc( c, fp ) == EOF ) {
log_error("Error writing to '%s': %s\n", log_error("Error writing to `%s': %s\n",
fname, strerror(errno) ); fname, strerror(errno) );
rc = G10ERR_WRITE_FILE; rc = G10ERR_WRITE_FILE;
goto leave; goto leave;
@ -166,7 +166,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
continue; /* fixme: this hack might be too simple */ continue; /* fixme: this hack might be too simple */
if( fp ) { if( fp ) {
if( putc( c, fp ) == EOF ) { if( putc( c, fp ) == EOF ) {
log_error("Error writing to '%s': %s\n", log_error("Error writing to `%s': %s\n",
fname, strerror(errno) ); fname, strerror(errno) );
rc = G10ERR_WRITE_FILE; rc = G10ERR_WRITE_FILE;
goto leave; goto leave;
@ -179,7 +179,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
special_md_putc(mfx->md, -1, &special_state ); /* flush */ special_md_putc(mfx->md, -1, &special_state ); /* flush */
if( fp && fp != stdout && fclose(fp) ) { if( fp && fp != stdout && fclose(fp) ) {
log_error("Error closing '%s': %s\n", fname, strerror(errno) ); log_error("Error closing `%s': %s\n", fname, strerror(errno) );
fp = NULL; fp = NULL;
rc = G10ERR_WRITE_FILE; rc = G10ERR_WRITE_FILE;
goto leave; goto leave;
@ -225,7 +225,7 @@ ask_for_detached_datafile( md_filter_context_t *mfx, const char *inname )
any++; any++;
} }
else if( !fp ) { else if( !fp ) {
log_error("can't open '%s': %s\n", answer, strerror(errno) ); log_error("can't open `%s': %s\n", answer, strerror(errno) );
rc = G10ERR_READ_FILE; rc = G10ERR_READ_FILE;
goto leave; goto leave;
} }
@ -297,7 +297,7 @@ hash_datafiles( MD_HANDLE md, STRLIST files,
for( ; sl; sl = sl->next ) { for( ; sl; sl = sl->next ) {
fp = iobuf_open( sl->d ); fp = iobuf_open( sl->d );
if( !fp ) { if( !fp ) {
log_error(_("can't open signed data '%s'\n"), log_error(_("can't open signed data `%s'\n"),
print_fname_stdin(sl->d)); print_fname_stdin(sl->d));
if( !files ) if( !files )
free_strlist(sl); free_strlist(sl);

2
g10/pubkey-enc.c
View File

@ -81,7 +81,7 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
if( !rc ) if( !rc )
rc = get_it( k, dek, sk, keyid ); rc = get_it( k, dek, sk, keyid );
if( !rc ) { if( !rc ) {
log_info(_("okay, we are the anonymous receiver.\n") ); log_info(_("okay, we are the anonymous recipient.\n") );
break; break;
} }
} }

2
g10/revoke.c
View File

@ -70,7 +70,7 @@ gen_revoke( const char *uname )
/* search the userid */ /* search the userid */
rc = find_secret_keyblock_byname( &kbpos, uname ); rc = find_secret_keyblock_byname( &kbpos, uname );
if( rc ) { if( rc ) {
log_error(_("secret key for user '%s' not found\n"), uname ); log_error(_("secret key for user `%s' not found\n"), uname );
goto leave; goto leave;
} }

8
g10/ringedit.c
View File

@ -334,7 +334,7 @@ add_keyblock_resource( const char *url, int force, int secret )
resource_table[i].rt = rt; resource_table[i].rt = rt;
leave: leave:
if( rc ) if( rc )
log_error("keyblock resource '%s': %s\n", filename, g10_errstr(rc) ); log_error("keyblock resource `%s': %s\n", filename, g10_errstr(rc) );
else if( secret ) else if( secret )
any_secret = 1; any_secret = 1;
else else
@ -692,7 +692,7 @@ enum_keyblocks( int mode, KBPOS *kbpos, KBNODE *ret_root )
case rt_RING: case rt_RING:
kbpos->fp = iobuf_open( rentry->fname ); kbpos->fp = iobuf_open( rentry->fname );
if( !kbpos->fp ) { if( !kbpos->fp ) {
log_error("can't open '%s'\n", rentry->fname ); log_error("can't open `%s'\n", rentry->fname );
return G10ERR_OPEN_FILE; return G10ERR_OPEN_FILE;
} }
break; break;
@ -1089,7 +1089,7 @@ keyring_read( KBPOS *kbpos, KBNODE *ret_root )
a = iobuf_open( rentry->fname ); a = iobuf_open( rentry->fname );
if( !a ) { if( !a ) {
log_error("can't open '%s'\n", rentry->fname ); log_error("can't open `%s'\n", rentry->fname );
return G10ERR_OPEN_FILE; return G10ERR_OPEN_FILE;
} }
@ -1262,7 +1262,7 @@ keyring_copy( KBPOS *kbpos, int mode, KBNODE root )
if( !keyring_lock ); if( !keyring_lock );
keyring_lock = make_dotlock( rentry->fname, -1 ); keyring_lock = make_dotlock( rentry->fname, -1 );
if( !keyring_lock ) if( !keyring_lock )
log_fatal("can't lock '%s'\n", rentry->fname ); log_fatal("can't lock `%s'\n", rentry->fname );
/* open the source file */ /* open the source file */
fp = iobuf_open( rentry->fname ); fp = iobuf_open( rentry->fname );

10
g10/sign.c
View File

@ -202,7 +202,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
goto leave; goto leave;
} }
else if( opt.verbose ) else if( opt.verbose )
log_info(_("writing to '%s'\n"), outfile ); log_info(_("writing to `%s'\n"), outfile );
} }
else if( (rc = open_outfile( fname, opt.armor? 1: detached? 2:0, &out ))) else if( (rc = open_outfile( fname, opt.armor? 1: detached? 2:0, &out )))
goto leave; goto leave;
@ -304,7 +304,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
goto leave; goto leave;
} }
if( opt.verbose ) if( opt.verbose )
fprintf(stderr, " '%s'", sl->d ); fprintf(stderr, " `%s'", sl->d );
iobuf_push_filter( inp, md_filter, &mfx ); iobuf_push_filter( inp, md_filter, &mfx );
while( iobuf_get(inp) != -1 ) while( iobuf_get(inp) != -1 )
; ;
@ -333,7 +333,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
} }
if( fname ) { if( fname ) {
if( !(filesize = iobuf_get_filelength(inp)) ) if( !(filesize = iobuf_get_filelength(inp)) )
log_info(_("WARNING: '%s' is an empty file\n"), fname ); log_info(_("WARNING: `%s' is an empty file\n"), fname );
/* because the text_filter modifies the length of the /* because the text_filter modifies the length of the
* data, it is not possible to know the used length * data, it is not possible to know the used length
@ -589,7 +589,7 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
goto leave; goto leave;
} }
else if( opt.verbose ) else if( opt.verbose )
log_info(_("writing to '%s'\n"), outfile ); log_info(_("writing to `%s'\n"), outfile );
} }
else if( (rc = open_outfile( fname, 1, &out )) ) else if( (rc = open_outfile( fname, 1, &out )) )
goto leave; goto leave;
@ -637,7 +637,7 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
PKT_secret_key *sk = sk_rover->sk; PKT_secret_key *sk = sk_rover->sk;
md_enable(textmd, hash_for(sk->pubkey_algo)); md_enable(textmd, hash_for(sk->pubkey_algo));
} }
/*md_start_debug( textmd, "create" );*/ md_start_debug( textmd, "create" );
if( !opt.not_dash_escaped ) if( !opt.not_dash_escaped )
iobuf_push_filter( inp, text_filter, &tfx ); iobuf_push_filter( inp, text_filter, &tfx );
rc = write_dash_escaped( inp, out, textmd ); rc = write_dash_escaped( inp, out, textmd );

6
g10/skclist.c
View File

@ -91,13 +91,13 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
sk->pubkey_usage = usage; sk->pubkey_usage = usage;
if( (rc = get_seckey_byname( sk, locusr->d, unlock )) ) { if( (rc = get_seckey_byname( sk, locusr->d, unlock )) ) {
free_secret_key( sk ); sk = NULL; free_secret_key( sk ); sk = NULL;
log_error(_("skipped '%s': %s\n"), locusr->d, g10_errstr(rc) ); log_error(_("skipped `%s': %s\n"), locusr->d, g10_errstr(rc) );
} }
else if( !(rc=check_pubkey_algo2(sk->pubkey_algo, usage)) ) { else if( !(rc=check_pubkey_algo2(sk->pubkey_algo, usage)) ) {
SK_LIST r; SK_LIST r;
if( sk->version == 4 && (usage & PUBKEY_USAGE_SIG) if( sk->version == 4 && (usage & PUBKEY_USAGE_SIG)
&& sk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) { && sk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) {
log_info(_("skipped '%s': this is a PGP generated " log_info(_("skipped `%s': this is a PGP generated "
"ElGamal key which is not secure for signatures!\n"), "ElGamal key which is not secure for signatures!\n"),
locusr->d ); locusr->d );
free_secret_key( sk ); sk = NULL; free_secret_key( sk ); sk = NULL;
@ -112,7 +112,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
} }
else { else {
free_secret_key( sk ); sk = NULL; free_secret_key( sk ); sk = NULL;
log_error("skipped '%s': %s\n", locusr->d, g10_errstr(rc) ); log_error("skipped `%s': %s\n", locusr->d, g10_errstr(rc) );
} }
} }
} }

8
g10/tdbio.c
View File

@ -229,7 +229,7 @@ put_record_into_cache( ulong recno, const char *data )
cache_entries++; cache_entries++;
return 0; return 0;
} }
log_info(_("trustdb transaction to large\n")); log_info(_("trustdb transaction too large\n"));
return G10ERR_RESOURCE_LIMIT; return G10ERR_RESOURCE_LIMIT;
} }
if( dirty_count ) { if( dirty_count ) {
@ -460,9 +460,9 @@ tdbio_set_dbname( const char *new_dbname, int create )
fname, g10_errstr(rc)); fname, g10_errstr(rc));
/* and read again to check that we are okay */ /* and read again to check that we are okay */
if( tdbio_read_record( 0, &rec, RECTYPE_VER ) ) if( tdbio_read_record( 0, &rec, RECTYPE_VER ) )
log_fatal( _("%s: invalid trust-db created\n"), db_name ); log_fatal( _("%s: invalid trustdb created\n"), db_name );
log_info(_("%s: trust-db created\n"), db_name); log_info(_("%s: trustdb created\n"), db_name);
return 0; return 0;
} }
@ -503,7 +503,7 @@ open_db()
if( db_fd == -1 ) if( db_fd == -1 )
log_fatal( _("%s: can't open: %s\n"), db_name, strerror(errno) ); log_fatal( _("%s: can't open: %s\n"), db_name, strerror(errno) );
if( tdbio_read_record( 0, &rec, RECTYPE_VER ) ) if( tdbio_read_record( 0, &rec, RECTYPE_VER ) )
log_fatal( _("%s: invalid trust-db\n"), db_name ); log_fatal( _("%s: invalid trustdb\n"), db_name );
atexit( cleanup ); atexit( cleanup );
} }

8
g10/trustdb.c
View File

@ -139,7 +139,7 @@ static void
die_invalid_db() die_invalid_db()
{ {
log_error(_( log_error(_(
"The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n") ); "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n") );
g10_exit(2); g10_exit(2);
} }
@ -195,7 +195,7 @@ do_sync( )
int rc = tdbio_sync(); int rc = tdbio_sync();
if( !rc ) if( !rc )
return; return;
log_error(_("trust db: sync failed: %s\n"), g10_errstr(rc) ); log_error(_("trustdb: sync failed: %s\n"), g10_errstr(rc) );
g10_exit(2); g10_exit(2);
} }
@ -1220,10 +1220,10 @@ import_ownertrust( const char *fname )
rc = tdbio_search_dir_byfpr( line, fprlen, 0, &rec ); rc = tdbio_search_dir_byfpr( line, fprlen, 0, &rec );
if( !rc ) { /* found: update */ if( !rc ) { /* found: update */
if( rec.r.dir.ownertrust ) if( rec.r.dir.ownertrust )
log_info(_("LID %lu: changing trust from %u to %u\n"), log_info("LID %lu: changing trust from %u to %u\n",
rec.r.dir.lid, rec.r.dir.ownertrust, otrust ); rec.r.dir.lid, rec.r.dir.ownertrust, otrust );
else else
log_info(_("LID %lu: setting trust to %u\n"), log_info("LID %lu: setting trust to %u\n",
rec.r.dir.lid, otrust ); rec.r.dir.lid, otrust );
rec.r.dir.ownertrust = otrust; rec.r.dir.ownertrust = otrust;
write_record( &rec ); write_record( &rec );

2
g10/verify.c
View File

@ -63,7 +63,7 @@ verify_signatures( int nfiles, char **files )
/* open the signature file */ /* open the signature file */
fp = iobuf_open(sigfile); fp = iobuf_open(sigfile);
if( !fp ) { if( !fp ) {
log_error(_("can't open '%s'\n"), print_fname_stdin(sigfile)); log_error(_("can't open `%s'\n"), print_fname_stdin(sigfile));
return G10ERR_OPEN_FILE; return G10ERR_OPEN_FILE;
} }

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
Tue Dec 29 14:41:47 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
* pl.po: Janusz A. Urbanowicz contributed this one
Thu Dec 17 18:31:15 CET 1998 Werner Koch <wk@isil.d.shuttle.de> Thu Dec 17 18:31:15 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
* fr.po: Imported new version * fr.po: Imported new version

2
po/Makefile.in.in
View File

@ -52,6 +52,8 @@ stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \ POTFILES = \
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@ CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@ INSTOBJEXT = @INSTOBJEXT@

208
po/de.po
View File

@ -4,7 +4,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"POT-Creation-Date: 1998-12-23 15:55+0100\n" "POT-Creation-Date: 1998-12-23 16:53+0100\n"
"PO-Revision-Date: 1998-12-13 22:34+0100\n" "PO-Revision-Date: 1998-12-13 22:34+0100\n"
"Last-Translator: Walter Koch <walterk@mail.dip.de>\n" "Last-Translator: Walter Koch <walterk@mail.dip.de>\n"
"Language-Team: German <de@li.org>\n" "Language-Team: German <de@li.org>\n"
@ -36,175 +36,175 @@ msgid "yY"
msgstr "jJ" msgstr "jJ"
#: util/errors.c:54 #: util/errors.c:54
msgid "General error" msgid "general error"
msgstr "Allgemeiner Fehler" msgstr "Allgemeiner Fehler"
#: util/errors.c:55 #: util/errors.c:55
msgid "Unknown packet type" msgid "unknown packet type"
msgstr "Unbekannter Pakettyp" msgstr "Unbekannter Pakettyp"
#: util/errors.c:56 #: util/errors.c:56
msgid "Unknown version" msgid "unknown version"
msgstr "Unbekannte Version" msgstr "Unbekannte Version"
#: util/errors.c:57 #: util/errors.c:57
msgid "Unknown pubkey algorithm" msgid "unknown pubkey algorithm"
msgstr "Unbekanntes Public-Key Verfahren" msgstr "Unbekanntes Public-Key Verfahren"
#: util/errors.c:58 #: util/errors.c:58
msgid "Unknown digest algorithm" msgid "unknown digest algorithm"
msgstr "Unbekanntes Hashverfahren" msgstr "Unbekanntes Hashverfahren"
#: util/errors.c:59 #: util/errors.c:59
msgid "Bad public key" msgid "bad public key"
msgstr "Falscher öffentlicher Schüssel" msgstr "Falscher öffentlicher Schüssel"
#: util/errors.c:60 #: util/errors.c:60
msgid "Bad secret key" msgid "bad secret key"
msgstr "Falscher geheimer Schlüssel" msgstr "Falscher geheimer Schlüssel"
#: util/errors.c:61 #: util/errors.c:61
msgid "Bad signature" msgid "bad signature"
msgstr "Falsche Unterschrift" msgstr "Falsche Unterschrift"
#: util/errors.c:62 #: util/errors.c:62
msgid "Checksum error" msgid "checksum error"
msgstr "Prüfsummen-Fehler" msgstr "Prüfsummen-Fehler"
#: util/errors.c:63 #: util/errors.c:63
msgid "Bad passphrase" msgid "bad passphrase"
msgstr "Falsches Mantra" msgstr "Falsches Mantra"
#: util/errors.c:64 #: util/errors.c:64
msgid "Public key not found" msgid "public key not found"
msgstr "Öffentlicher Schlüssel nicht gefunden" msgstr "Öffentlicher Schlüssel nicht gefunden"
#: util/errors.c:65 #: util/errors.c:65
msgid "Unknown cipher algorithm" msgid "unknown cipher algorithm"
msgstr "Unbekanntes Verschlüsselungsverfahren" msgstr "Unbekanntes Verschlüsselungsverfahren"
#: util/errors.c:66 #: util/errors.c:66
msgid "Can't open the keyring" msgid "can't open the keyring"
msgstr "Der Schlüsselbund kann nicht geöffnet werden" msgstr "Der Schlüsselbund kann nicht geöffnet werden"
#: util/errors.c:67 #: util/errors.c:67
msgid "Invalid packet" msgid "invalid packet"
msgstr "Ungültiges Paket" msgstr "Ungültiges Paket"
#: util/errors.c:68 #: util/errors.c:68
msgid "Invalid armor" msgid "invalid armor"
msgstr "Ungültige ASCII-Hülle" msgstr "Ungültige ASCII-Hülle"
#: util/errors.c:69 #: util/errors.c:69
msgid "No such user id" msgid "no such user id"
msgstr "Keine User-ID" msgstr "Keine User-ID"
#: util/errors.c:70 #: util/errors.c:70
msgid "Secret key not available" msgid "secret key not available"
msgstr "Geheimer Schlüssel ist nicht vorhanden" msgstr "Geheimer Schlüssel ist nicht vorhanden"
#: util/errors.c:71 #: util/errors.c:71
msgid "Wrong secret key used" msgid "wrong secret key used"
msgstr "Falscher geheimer Schlüssel benutzt" msgstr "Falscher geheimer Schlüssel benutzt"
#: util/errors.c:72 #: util/errors.c:72
msgid "Not supported" msgid "not supported"
msgstr "Wird nicht unterstützt" msgstr "Wird nicht unterstützt"
#: util/errors.c:73 #: util/errors.c:73
msgid "Bad key" msgid "bad key"
msgstr "Falscher Schlüssel" msgstr "Falscher Schlüssel"
#: util/errors.c:74 #: util/errors.c:74
msgid "File read error" msgid "file read error"
msgstr "Dateilesefehler" msgstr "Dateilesefehler"
#: util/errors.c:75 #: util/errors.c:75
msgid "File write error" msgid "file write error"
msgstr "Dateischreibfehler" msgstr "Dateischreibfehler"
#: util/errors.c:76 #: util/errors.c:76
msgid "Unknown compress algorithm" msgid "unknown compress algorithm"
msgstr "Unbekanntes Komprimierverfahren" msgstr "Unbekanntes Komprimierverfahren"
#: util/errors.c:77 #: util/errors.c:77
msgid "File open error" msgid "file open error"
msgstr "Fehler beim Öffnen der Datei" msgstr "Fehler beim Öffnen der Datei"
#: util/errors.c:78 #: util/errors.c:78
msgid "File create error" msgid "file create error"
msgstr "Fehler beim Erzeugen der Datei" msgstr "Fehler beim Erzeugen der Datei"
#: util/errors.c:79 #: util/errors.c:79
msgid "Invalid passphrase" msgid "invalid passphrase"
msgstr "Ungültiges Mantra" msgstr "Ungültiges Mantra"
#: util/errors.c:80 #: util/errors.c:80
msgid "Unimplemented pubkey algorithm" msgid "unimplemented pubkey algorithm"
msgstr "Öffentliches Schlüsselverfahren ist nicht implementiert." msgstr "Öffentliches Schlüsselverfahren ist nicht implementiert."
#: util/errors.c:81 #: util/errors.c:81
msgid "Unimplemented cipher algorithm" msgid "unimplemented cipher algorithm"
msgstr "Verschlüsselungsverfahren ist nicht implementiert" msgstr "Verschlüsselungsverfahren ist nicht implementiert"
#: util/errors.c:82 #: util/errors.c:82
msgid "Unknown signature class" msgid "unknown signature class"
msgstr "Unbekannte Unterschriftenklasse" msgstr "Unbekannte Unterschriftenklasse"
#: util/errors.c:83 #: util/errors.c:83
msgid "Trust database error" msgid "trust database error"
msgstr "Fehler in der Trust-DB" msgstr "Fehler in der Trust-DB"
#: util/errors.c:84 #: util/errors.c:84
msgid "Bad MPI" msgid "bad MPI"
msgstr "Falsche MPI" msgstr "Falsche MPI"
#: util/errors.c:85 #: util/errors.c:85
msgid "Resource limit" msgid "resource limit"
msgstr "Zu wenig Resourcen" msgstr "Zu wenig Resourcen"
#: util/errors.c:86 #: util/errors.c:86
msgid "Invalid keyring" msgid "invalid keyring"
msgstr "Ungültiger Schlüsselbund" msgstr "Ungültiger Schlüsselbund"
#: util/errors.c:87 #: util/errors.c:87
msgid "Bad certificate" msgid "bad certificate"
msgstr "Falsches Zertifikat" msgstr "Falsches Zertifikat"
#: util/errors.c:88 #: util/errors.c:88
msgid "Malformed user id" msgid "malformed user id"
msgstr "Ungünstig aufgebaute User-ID" msgstr "Ungünstig aufgebaute User-ID"
#: util/errors.c:89 #: util/errors.c:89
msgid "File close error" msgid "file close error"
msgstr "Fehler beim Schließen der Datei" msgstr "Fehler beim Schließen der Datei"
#: util/errors.c:90 #: util/errors.c:90
msgid "File rename error" msgid "file rename error"
msgstr "Fehler beim Umbenennen einer Datei" msgstr "Fehler beim Umbenennen einer Datei"
#: util/errors.c:91 #: util/errors.c:91
msgid "File delete error" msgid "file delete error"
msgstr "Fehler beim Löschen einer Datei" msgstr "Fehler beim Löschen einer Datei"
#: util/errors.c:92 #: util/errors.c:92
msgid "Unexpected data" msgid "unexpected data"
msgstr "Unerwartete Daten" msgstr "Unerwartete Daten"
#: util/errors.c:93 #: util/errors.c:93
msgid "Timestamp conflict" msgid "timestamp conflict"
msgstr "Zeitangaben differieren" msgstr "Zeitangaben differieren"
#: util/errors.c:94 #: util/errors.c:94
msgid "Unusable pubkey algorithm" msgid "unusable pubkey algorithm"
msgstr "Unbenutzbares öffentliches Schlüsselverfahren" msgstr "Unbenutzbares öffentliches Schlüsselverfahren"
#: util/errors.c:95 #: util/errors.c:95
msgid "File exists" msgid "file exists"
msgstr "Datei existiert bereits" msgstr "Datei existiert bereits"
#: util/errors.c:96 #: util/errors.c:96
msgid "Weak key" msgid "weak key"
msgstr "Unsicherer Schlüssel" msgstr "Unsicherer Schlüssel"
#: util/logger.c:178 #: util/logger.c:178
@ -587,18 +587,18 @@ msgstr "Widerspr
#: g10/g10.c:618 #: g10/g10.c:618
#, c-format #, c-format
msgid "NOTE: no default option file '%s'\n" msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" msgstr "Hinweis: Keine voreingestellte Optionendatei `%s' vorhanden\n"
#: g10/g10.c:622 #: g10/g10.c:622
#, c-format #, c-format
msgid "option file '%s': %s\n" msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n" msgstr "Optionendatei `%s': %s\n"
#: g10/g10.c:629 #: g10/g10.c:629
#, c-format #, c-format
msgid "reading options from '%s'\n" msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n" msgstr "Optionen werden aus `%s' gelesen\n"
#: g10/g10.c:782 #: g10/g10.c:782
#, c-format #, c-format
@ -686,7 +686,7 @@ msgstr "--delete-key Benutzername"
#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 #: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301
#, c-format #, c-format
msgid "can't open %s: %s\n" msgid "can't open %s: %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n" msgstr "`%s' kann nicht geöffnet werden: %s\n"
#: g10/g10.c:1070 #: g10/g10.c:1070
msgid "-k[v][v][v][c] [userid] [keyring]" msgid "-k[v][v][v][c] [userid] [keyring]"
@ -704,8 +704,8 @@ msgstr "Anbringen der ASCII-H
#: g10/g10.c:1201 #: g10/g10.c:1201
#, c-format #, c-format
msgid "invalid hash algorithm '%s'\n" msgid "invalid hash algorithm `%s'\n"
msgstr "Ungültiges Hashverfahren '%s'\n" msgstr "Ungültiges Hashverfahren `%s'\n"
#: g10/g10.c:1280 #: g10/g10.c:1280
msgid "[filename]" msgid "[filename]"
@ -717,8 +717,8 @@ msgstr "Auf geht's - Botschaft eintippen ...\n"
#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66
#, c-format #, c-format
msgid "can't open '%s'\n" msgid "can't open `%s'\n"
msgstr "'%s' kann nicht geöffnet werden\n" msgstr "`%s' kann nicht geöffnet werden\n"
#: g10/armor.c:344 g10/armor.c:391 #: g10/armor.c:344 g10/armor.c:391
msgid "armor header: " msgid "armor header: "
@ -732,50 +732,50 @@ msgstr "Ung
msgid "invalid armor header: " msgid "invalid armor header: "
msgstr "Ungültige ASCII-Hülle" msgstr "Ungültige ASCII-Hülle"
#: g10/armor.c:460 #: g10/armor.c:461
#, c-format #, c-format
msgid "armor: %s\n" msgid "armor: %s\n"
msgstr "ASCII-Hülle: %s\n" msgstr "ASCII-Hülle: %s\n"
#: g10/armor.c:533 #: g10/armor.c:534
msgid "invalid dash escaped line: " msgid "invalid dash escaped line: "
msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: " msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
#: g10/armor.c:602 #: g10/armor.c:603
msgid "invalid clear text header: " msgid "invalid clear text header: "
msgstr "ungültige Klartexteinleitung" msgstr "ungültige Klartexteinleitung"
#: g10/armor.c:845 #: g10/armor.c:846
#, c-format #, c-format
msgid "invalid radix64 character %02x skipped\n" msgid "invalid radix64 character %02x skipped\n"
msgstr "Ungültiges \"radix64\" Zeichen %02x ignoriert\n" msgstr "Ungültiges \"radix64\" Zeichen %02x ignoriert\n"
#: g10/armor.c:878 #: g10/armor.c:879
msgid "premature eof (no CRC)\n" msgid "premature eof (no CRC)\n"
msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n" msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n"
#: g10/armor.c:897 #: g10/armor.c:898
msgid "premature eof (in CRC)\n" msgid "premature eof (in CRC)\n"
msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n" msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n"
#: g10/armor.c:901 #: g10/armor.c:902
msgid "malformed CRC\n" msgid "malformed CRC\n"
msgstr "Falsch aufgebaute Prüfsumme\n" msgstr "Falsch aufgebaute Prüfsumme\n"
#: g10/armor.c:905 #: g10/armor.c:906
#, c-format #, c-format
msgid "CRC error; %06lx - %06lx\n" msgid "CRC error; %06lx - %06lx\n"
msgstr "Prüfsummenfehler; %06lx - %06lx\n" msgstr "Prüfsummenfehler; %06lx - %06lx\n"
#: g10/armor.c:924 #: g10/armor.c:925
msgid "premature eof (in Trailer)\n" msgid "premature eof (in Trailer)\n"
msgstr "vorzeitiges Dateiende (im Nachsatz)\n" msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
#: g10/armor.c:928 #: g10/armor.c:929
msgid "error in trailer line\n" msgid "error in trailer line\n"
msgstr "Fehler in der Nachsatzzeile\n" msgstr "Fehler in der Nachsatzzeile\n"
#: g10/armor.c:1182 #: g10/armor.c:1183
#, fuzzy #, fuzzy
msgid "no valid OpenPGP data found.\n" msgid "no valid OpenPGP data found.\n"
msgstr "Keine gültigen RFC1991- oder OpenPGP-Daten gefunden.\n" msgstr "Keine gültigen RFC1991- oder OpenPGP-Daten gefunden.\n"
@ -1271,13 +1271,13 @@ msgstr "Schl
#: g10/keygen.c:851 #: g10/keygen.c:851
#, c-format #, c-format
msgid "writing public certificate to '%s'\n" msgid "writing public certificate to `%s'\n"
msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n" msgstr "schreiben des öffentlichen Schlüssels nach `%s'\n"
#: g10/keygen.c:852 #: g10/keygen.c:852
#, c-format #, c-format
msgid "writing secret certificate to '%s'\n" msgid "writing secret certificate to `%s'\n"
msgstr "schreiben des geheimen Schlüssels nach '%s'\n" msgstr "schreiben des geheimen Schlüssels nach `%s'\n"
#: g10/keygen.c:929 #: g10/keygen.c:929
msgid "public and secret key created and signed.\n" msgid "public and secret key created and signed.\n"
@ -1319,8 +1319,8 @@ msgstr "%s: WARNUNG: Leere Datei\n"
#: g10/encode.c:222 #: g10/encode.c:222
#, c-format #, c-format
msgid "reading from '%s'\n" msgid "reading from `%s'\n"
msgstr "Lesen von '%s'\n" msgstr "Lesen von `%s'\n"
#: g10/encode.c:397 #: g10/encode.c:397
#, fuzzy, c-format #, fuzzy, c-format
@ -1335,7 +1335,7 @@ msgstr "%s: Benutzer nicht gefunden\n"
#: g10/export.c:123 #: g10/export.c:123
#, fuzzy, c-format #, fuzzy, c-format
msgid "certificate read problem: %s\n" msgid "certificate read problem: %s\n"
msgstr "User '%s' Leseproblem: %s\n" msgstr "User `%s' Leseproblem: %s\n"
#: g10/export.c:132 #: g10/export.c:132
#, fuzzy, c-format #, fuzzy, c-format
@ -1462,8 +1462,8 @@ msgstr "Kein voreingestellter
#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592
#, c-format #, c-format
msgid "writing to '%s'\n" msgid "writing to `%s'\n"
msgstr "Schreiben nach '%s'\n" msgstr "Schreiben nach `%s'\n"
#: g10/import.c:366 g10/import.c:426 g10/import.c:642 #: g10/import.c:366 g10/import.c:426 g10/import.c:642
#, c-format #, c-format
@ -2153,8 +2153,8 @@ msgstr "lese stdin ...\n"
#: g10/plaintext.c:300 #: g10/plaintext.c:300
#, c-format #, c-format
msgid "can't open signed data '%s'\n" msgid "can't open signed data `%s'\n"
msgstr "kann signierte Datei '%s' nicht öffnen.\n" msgstr "kann signierte Datei `%s' nicht öffnen.\n"
#: g10/pubkey-enc.c:78 #: g10/pubkey-enc.c:78
#, c-format #, c-format
@ -2227,8 +2227,8 @@ msgstr "unterschreibe:"
#: g10/sign.c:336 #: g10/sign.c:336
#, c-format #, c-format
msgid "WARNING: '%s' is an empty file\n" msgid "WARNING: `%s' is an empty file\n"
msgstr "WARNUNG: '%s' ist eine leere Datei.\n" msgstr "WARNUNG: `%s' ist eine leere Datei.\n"
#: g10/tdbio.c:116 g10/tdbio.c:1413 #: g10/tdbio.c:116 g10/tdbio.c:1413
#, c-format #, c-format
@ -2408,8 +2408,8 @@ msgstr "Verketteter Signatursatz %lu hat einen falschen Besitzer\n"
#: g10/trustdb.c:463 #: g10/trustdb.c:463
#, c-format #, c-format
msgid "'%s' is not a valid long keyID\n" msgid "`%s' is not a valid long keyID\n"
msgstr "'%s' ist keine gültige lange Schlüssel-ID\n" msgstr "`%s' ist keine gültige lange Schlüssel-ID\n"
#: g10/trustdb.c:498 #: g10/trustdb.c:498
#, c-format #, c-format
@ -2496,28 +2496,28 @@ msgstr "Huch, keine User-IDs\n"
#: g10/trustdb.c:1088 g10/trustdb.c:1106 #: g10/trustdb.c:1088 g10/trustdb.c:1106
#, c-format #, c-format
msgid "user '%s' read problem: %s\n" msgid "user `%s' read problem: %s\n"
msgstr "User '%s' Leseproblem: %s\n" msgstr "User `%s' Leseproblem: %s\n"
#: g10/trustdb.c:1091 g10/trustdb.c:1109 #: g10/trustdb.c:1091 g10/trustdb.c:1109
#, c-format #, c-format
msgid "user '%s' list problem: %s\n" msgid "user `%s' list problem: %s\n"
msgstr "User '%s' Listenproblem: %s\n" msgstr "User `%s' Listenproblem: %s\n"
#: g10/trustdb.c:1099 g10/trustdb.c:1346 #: g10/trustdb.c:1099 g10/trustdb.c:1346
#, c-format #, c-format
msgid "user '%s' not found: %s\n" msgid "user `%s' not found: %s\n"
msgstr "Benutzer '%s' nicht gefunden: %s\n" msgstr "Benutzer `%s' nicht gefunden: %s\n"
#: g10/trustdb.c:1101 g10/trustdb.c:1348 #: g10/trustdb.c:1101 g10/trustdb.c:1348
#, c-format #, c-format
msgid "problem finding '%s' in trustdb: %s\n" msgid "problem finding `%s' in trustdb: %s\n"
msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n" msgstr "Problem, `%s' in der Trust-DB zu finden: %s\n"
#: g10/trustdb.c:1104 #: g10/trustdb.c:1104
#, c-format #, c-format
msgid "user '%s' not in trustdb\n" msgid "user `%s' not in trustdb\n"
msgstr "User '%s' ist nicht in der trustdb\n" msgstr "User `%s' ist nicht in der trustdb\n"
#: g10/trustdb.c:1139 #: g10/trustdb.c:1139
#, c-format #, c-format
@ -2590,13 +2590,13 @@ msgstr "Fehler beim Auffinden des Verz.Satzes: %s\n"
#: g10/trustdb.c:1351 #: g10/trustdb.c:1351
#, c-format #, c-format
msgid "user '%s' not in trustdb - inserting\n" msgid "user `%s' not in trustdb - inserting\n"
msgstr "User '%s' ist nich in der 'Trust'-Datenbank - wird eingefügt\n" msgstr "User `%s' ist nich in der 'Trust'-Datenbank - wird eingefügt\n"
#: g10/trustdb.c:1354 #: g10/trustdb.c:1354
#, c-format #, c-format
msgid "failed to put '%s' into trustdb: %s\n" msgid "failed to put `%s' into trustdb: %s\n"
msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n" msgstr "konnte `%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
#: g10/trustdb.c:1404 #: g10/trustdb.c:1404
#, c-format #, c-format
@ -2920,13 +2920,13 @@ msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
#: g10/skclist.c:94 #: g10/skclist.c:94
#, c-format #, c-format
msgid "skipped '%s': %s\n" msgid "skipped `%s': %s\n"
msgstr "übersprungen '%s': %s\n" msgstr "übersprungen `%s': %s\n"
#: g10/skclist.c:100 #: g10/skclist.c:100
#, c-format #, c-format
msgid "" msgid ""
"skipped '%s': this is a PGP generated ElGamal key which is not secure for " "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
"signatures!\n" "signatures!\n"
msgstr "" msgstr ""
"'%s übersprungen: Dies ist ein durch PGP erzeugter ElGamal-Schlüssel. Das " "'%s übersprungen: Dies ist ein durch PGP erzeugter ElGamal-Schlüssel. Das "
@ -2935,8 +2935,8 @@ msgstr ""
#. do not overwrite #. do not overwrite
#: g10/openfile.c:58 #: g10/openfile.c:58
#, c-format #, c-format
msgid "File '%s' exists. " msgid "File `%s' exists. "
msgstr "Datei '%s' existiert bereits. " msgstr "Datei `%s' existiert bereits. "
#: g10/openfile.c:60 #: g10/openfile.c:60
msgid "Overwrite (y/N)? " msgid "Overwrite (y/N)? "
@ -2948,8 +2948,8 @@ msgstr "Schreiben auf die Standardausgabe\n"
#: g10/openfile.c:134 #: g10/openfile.c:134
#, c-format #, c-format
msgid "assuming signed data in '%s'\n" msgid "assuming signed data in `%s'\n"
msgstr "die unterzeichneten Daten sind wohl in '%s'\n" msgstr "die unterzeichneten Daten sind wohl in `%s'\n"
#: g10/openfile.c:181 #: g10/openfile.c:181
#, c-format #, c-format
@ -3231,8 +3231,8 @@ msgstr "Keine Hilfe vorhanden."
#: g10/helptext.c:216 #: g10/helptext.c:216
#, c-format #, c-format
msgid "No help available for '%s'" msgid "No help available for `%s'"
msgstr "Keine Hilfe für '%s' vorhanden." msgstr "Keine Hilfe für `%s' vorhanden."
#~ msgid "You will see a list of signators etc. here\n" #~ msgid "You will see a list of signators etc. here\n"
#~ msgstr "Sie sollten hier eigentlich eine Liste der Signierer sehen.\n" #~ msgstr "Sie sollten hier eigentlich eine Liste der Signierer sehen.\n"

110
po/es_ES.po
View File

@ -5,7 +5,7 @@
# I also got inspiration from it.po by Marco d'Itri <md@linux.it> # I also got inspiration from it.po by Marco d'Itri <md@linux.it>
msgid "" msgid ""
msgstr "" msgstr ""
"POT-Creation-Date: 1998-12-23 15:55+0100\n" "POT-Creation-Date: 1998-12-23 16:53+0100\n"
"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-13 10:49:25+0100\n" "Date: 1998-11-13 10:49:25+0100\n"
"From: Urko Lusa <ulusa@lacueva.ddns.org>\n" "From: Urko Lusa <ulusa@lacueva.ddns.org>\n"
@ -586,18 +586,18 @@ msgstr "comandos incompatibles\n"
#: g10/g10.c:618 #: g10/g10.c:618
#, fuzzy, c-format #, fuzzy, c-format
msgid "NOTE: no default option file '%s'\n" msgid "NOTE: no default option file `%s'\n"
msgstr "nota: no existe fichero de opciones predefinido '%s'\n" msgstr "nota: no existe fichero de opciones predefinido `%s'\n"
#: g10/g10.c:622 #: g10/g10.c:622
#, c-format #, c-format
msgid "option file '%s': %s\n" msgid "option file `%s': %s\n"
msgstr "fichero de opciones '%s': %s\n" msgstr "fichero de opciones `%s': %s\n"
#: g10/g10.c:629 #: g10/g10.c:629
#, c-format #, c-format
msgid "reading options from '%s'\n" msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde '%s'\n" msgstr "leyendo opciones desde `%s'\n"
#: g10/g10.c:782 #: g10/g10.c:782
#, fuzzy, c-format #, fuzzy, c-format
@ -641,7 +641,7 @@ msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
#: g10/g10.c:934 #: g10/g10.c:934
#, c-format #, c-format
msgid "failed to initialize the TrustDB: %s\n" msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicialización de la base de datos de confianza '%s' fallida\n" msgstr "inicialización de la base de datos de confianza `%s' fallida\n"
#: g10/g10.c:940 #: g10/g10.c:940
msgid "--store [filename]" msgid "--store [filename]"
@ -687,7 +687,7 @@ msgstr "--delete-key nombre_usuario"
#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 #: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301
#, c-format #, c-format
msgid "can't open %s: %s\n" msgid "can't open %s: %s\n"
msgstr "no puede abrirse '%s': %s\n" msgstr "no puede abrirse `%s': %s\n"
#: g10/g10.c:1070 #: g10/g10.c:1070
msgid "-k[v][v][v][c] [userid] [keyring]" msgid "-k[v][v][v][c] [userid] [keyring]"
@ -705,8 +705,8 @@ msgstr "creaci
#: g10/g10.c:1201 #: g10/g10.c:1201
#, c-format #, c-format
msgid "invalid hash algorithm '%s'\n" msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de distribución no válido '%s'\n" msgstr "algoritmo de distribución no válido `%s'\n"
#: g10/g10.c:1280 #: g10/g10.c:1280
msgid "[filename]" msgid "[filename]"
@ -718,8 +718,8 @@ msgstr ""
#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66
#, c-format #, c-format
msgid "can't open '%s'\n" msgid "can't open `%s'\n"
msgstr "no puede abrirse '%s'\n" msgstr "no puede abrirse `%s'\n"
#: g10/armor.c:344 g10/armor.c:391 #: g10/armor.c:344 g10/armor.c:391
msgid "armor header: " msgid "armor header: "
@ -733,50 +733,50 @@ msgstr "cabecera de firma clara no v
msgid "invalid armor header: " msgid "invalid armor header: "
msgstr "cabecera de armadura no válida: " msgstr "cabecera de armadura no válida: "
#: g10/armor.c:460 #: g10/armor.c:461
#, c-format #, c-format
msgid "armor: %s\n" msgid "armor: %s\n"
msgstr "armadura: %s\n" msgstr "armadura: %s\n"
#: g10/armor.c:533 #: g10/armor.c:534
msgid "invalid dash escaped line: " msgid "invalid dash escaped line: "
msgstr "Línea con guiones no válida: " msgstr "Línea con guiones no válida: "
#: g10/armor.c:602 #: g10/armor.c:603
msgid "invalid clear text header: " msgid "invalid clear text header: "
msgstr "cabecera de texto claro no válida: " msgstr "cabecera de texto claro no válida: "
#: g10/armor.c:845 #: g10/armor.c:846
#, c-format #, c-format
msgid "invalid radix64 character %02x skipped\n" msgid "invalid radix64 character %02x skipped\n"
msgstr "caracteres no válidos radix64 %02x ignorados\n" msgstr "caracteres no válidos radix64 %02x ignorados\n"
#: g10/armor.c:878 #: g10/armor.c:879
msgid "premature eof (no CRC)\n" msgid "premature eof (no CRC)\n"
msgstr "Fin de fichero prematuro\n" msgstr "Fin de fichero prematuro\n"
#: g10/armor.c:897 #: g10/armor.c:898
msgid "premature eof (in CRC)\n" msgid "premature eof (in CRC)\n"
msgstr "Fin de suma de comprobación prematuro\n" msgstr "Fin de suma de comprobación prematuro\n"
#: g10/armor.c:901 #: g10/armor.c:902
msgid "malformed CRC\n" msgid "malformed CRC\n"
msgstr "Suma de comprobación mal creada\n" msgstr "Suma de comprobación mal creada\n"
#: g10/armor.c:905 #: g10/armor.c:906
#, c-format #, c-format
msgid "CRC error; %06lx - %06lx\n" msgid "CRC error; %06lx - %06lx\n"
msgstr "Error en suma de comprobación: %06lx - %06lx\n" msgstr "Error en suma de comprobación: %06lx - %06lx\n"
#: g10/armor.c:924 #: g10/armor.c:925
msgid "premature eof (in Trailer)\n" msgid "premature eof (in Trailer)\n"
msgstr "" msgstr ""
#: g10/armor.c:928 #: g10/armor.c:929
msgid "error in trailer line\n" msgid "error in trailer line\n"
msgstr "" msgstr ""
#: g10/armor.c:1182 #: g10/armor.c:1183
#, fuzzy #, fuzzy
msgid "no valid OpenPGP data found.\n" msgid "no valid OpenPGP data found.\n"
msgstr "RFC1991 no válida o datos OpenPGP no encontrados\n" msgstr "RFC1991 no válida o datos OpenPGP no encontrados\n"
@ -1258,13 +1258,13 @@ msgstr "Creaci
#: g10/keygen.c:851 #: g10/keygen.c:851
#, c-format #, c-format
msgid "writing public certificate to '%s'\n" msgid "writing public certificate to `%s'\n"
msgstr "escribiendo certificado público en '%s'\n" msgstr "escribiendo certificado público en `%s'\n"
#: g10/keygen.c:852 #: g10/keygen.c:852
#, c-format #, c-format
msgid "writing secret certificate to '%s'\n" msgid "writing secret certificate to `%s'\n"
msgstr "escribiendo certificado privado en '%s'\n" msgstr "escribiendo certificado privado en `%s'\n"
#: g10/keygen.c:929 #: g10/keygen.c:929
msgid "public and secret key created and signed.\n" msgid "public and secret key created and signed.\n"
@ -1306,8 +1306,8 @@ msgstr "%s: atenci
#: g10/encode.c:222 #: g10/encode.c:222
#, c-format #, c-format
msgid "reading from '%s'\n" msgid "reading from `%s'\n"
msgstr "leyendo desde '%s'\n" msgstr "leyendo desde `%s'\n"
#: g10/encode.c:397 #: g10/encode.c:397
#, fuzzy, c-format #, fuzzy, c-format
@ -1447,8 +1447,8 @@ msgstr "no hay anillo p
#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592
#, c-format #, c-format
msgid "writing to '%s'\n" msgid "writing to `%s'\n"
msgstr "escribiendo en '%s'\n" msgstr "escribiendo en `%s'\n"
#: g10/import.c:366 g10/import.c:426 g10/import.c:642 #: g10/import.c:366 g10/import.c:426 g10/import.c:642
#, c-format #, c-format
@ -2068,7 +2068,7 @@ msgstr ""
#: g10/misc.c:88 #: g10/misc.c:88
#, fuzzy, c-format #, fuzzy, c-format
msgid "can't disable core dumps: %s\n" msgid "can't disable core dumps: %s\n"
msgstr "no puede abrirse '%s': %s\n" msgstr "no puede abrirse `%s': %s\n"
#: g10/misc.c:90 #: g10/misc.c:90
msgid "WARNING: Program may create a core file!\n" msgid "WARNING: Program may create a core file!\n"
@ -2139,8 +2139,8 @@ msgstr ""
#: g10/plaintext.c:300 #: g10/plaintext.c:300
#, c-format #, c-format
msgid "can't open signed data '%s'\n" msgid "can't open signed data `%s'\n"
msgstr "imposible abrir datos firmados '%s'\n" msgstr "imposible abrir datos firmados `%s'\n"
#: g10/pubkey-enc.c:78 #: g10/pubkey-enc.c:78
#, c-format #, c-format
@ -2205,7 +2205,7 @@ msgstr "Firma INCORRECTA de \""
#: g10/sign.c:200 g10/sign.c:587 #: g10/sign.c:200 g10/sign.c:587
#, fuzzy, c-format #, fuzzy, c-format
msgid "can't create %s: %s\n" msgid "can't create %s: %s\n"
msgstr "no puede abrirse '%s': %s\n" msgstr "no puede abrirse `%s': %s\n"
#: g10/sign.c:296 #: g10/sign.c:296
msgid "signing:" msgid "signing:"
@ -2213,7 +2213,7 @@ msgstr ""
#: g10/sign.c:336 #: g10/sign.c:336
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: '%s' is an empty file\n" msgid "WARNING: `%s' is an empty file\n"
msgstr "%s: atención: fichero vacío\n" msgstr "%s: atención: fichero vacío\n"
#: g10/tdbio.c:116 g10/tdbio.c:1413 #: g10/tdbio.c:116 g10/tdbio.c:1413
@ -2394,7 +2394,7 @@ msgstr ""
#: g10/trustdb.c:463 #: g10/trustdb.c:463
#, fuzzy, c-format #, fuzzy, c-format
msgid "'%s' is not a valid long keyID\n" msgid "`%s' is not a valid long keyID\n"
msgstr "Caracter no válido en el comentario\n" msgstr "Caracter no válido en el comentario\n"
#: g10/trustdb.c:498 #: g10/trustdb.c:498
@ -2478,27 +2478,27 @@ msgstr "lista clave e identificativos de usuario"
#: g10/trustdb.c:1088 g10/trustdb.c:1106 #: g10/trustdb.c:1088 g10/trustdb.c:1106
#, c-format #, c-format
msgid "user '%s' read problem: %s\n" msgid "user `%s' read problem: %s\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1091 g10/trustdb.c:1109 #: g10/trustdb.c:1091 g10/trustdb.c:1109
#, c-format #, c-format
msgid "user '%s' list problem: %s\n" msgid "user `%s' list problem: %s\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1099 g10/trustdb.c:1346 #: g10/trustdb.c:1099 g10/trustdb.c:1346
#, fuzzy, c-format #, fuzzy, c-format
msgid "user '%s' not found: %s\n" msgid "user `%s' not found: %s\n"
msgstr "%s: usuario no encontrado\n" msgstr "%s: usuario no encontrado\n"
#: g10/trustdb.c:1101 g10/trustdb.c:1348 #: g10/trustdb.c:1101 g10/trustdb.c:1348
#, c-format #, c-format
msgid "problem finding '%s' in trustdb: %s\n" msgid "problem finding `%s' in trustdb: %s\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1104 #: g10/trustdb.c:1104
#, c-format #, c-format
msgid "user '%s' not in trustdb\n" msgid "user `%s' not in trustdb\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1139 #: g10/trustdb.c:1139
@ -2572,13 +2572,13 @@ msgstr "eliminaci
#: g10/trustdb.c:1351 #: g10/trustdb.c:1351
#, c-format #, c-format
msgid "user '%s' not in trustdb - inserting\n" msgid "user `%s' not in trustdb - inserting\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1354 #: g10/trustdb.c:1354
#, fuzzy, c-format #, fuzzy, c-format
msgid "failed to put '%s' into trustdb: %s\n" msgid "failed to put `%s' into trustdb: %s\n"
msgstr "inicialización de la base de datos de confianza '%s' fallida\n" msgstr "inicialización de la base de datos de confianza `%s' fallida\n"
#: g10/trustdb.c:1404 #: g10/trustdb.c:1404
#, c-format #, c-format
@ -2908,13 +2908,13 @@ msgstr ""
#: g10/skclist.c:94 #: g10/skclist.c:94
#, fuzzy, c-format #, fuzzy, c-format
msgid "skipped '%s': %s\n" msgid "skipped `%s': %s\n"
msgstr "%s: ignorado: %s\n" msgstr "%s: ignorado: %s\n"
#: g10/skclist.c:100 #: g10/skclist.c:100
#, fuzzy, c-format #, fuzzy, c-format
msgid "" msgid ""
"skipped '%s': this is a PGP generated ElGamal key which is not secure for " "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
"signatures!\n" "signatures!\n"
msgstr "" msgstr ""
"¡esto es una clave ElGamal generada por PGP que NO es segura para las " "¡esto es una clave ElGamal generada por PGP que NO es segura para las "
@ -2923,8 +2923,8 @@ msgstr ""
#. do not overwrite #. do not overwrite
#: g10/openfile.c:58 #: g10/openfile.c:58
#, c-format #, c-format
msgid "File '%s' exists. " msgid "File `%s' exists. "
msgstr "El fichero '%s' ya existe. " msgstr "El fichero `%s' ya existe. "
#: g10/openfile.c:60 #: g10/openfile.c:60
msgid "Overwrite (y/N)? " msgid "Overwrite (y/N)? "
@ -2933,12 +2933,12 @@ msgstr "
#: g10/openfile.c:85 #: g10/openfile.c:85
#, fuzzy #, fuzzy
msgid "writing to stdout\n" msgid "writing to stdout\n"
msgstr "escribiendo en '%s'\n" msgstr "escribiendo en `%s'\n"
#: g10/openfile.c:134 #: g10/openfile.c:134
#, fuzzy, c-format #, fuzzy, c-format
msgid "assuming signed data in '%s'\n" msgid "assuming signed data in `%s'\n"
msgstr "imposible abrir datos firmados '%s'\n" msgstr "imposible abrir datos firmados `%s'\n"
#: g10/openfile.c:181 #: g10/openfile.c:181
#, c-format #, c-format
@ -3092,8 +3092,8 @@ msgstr "Ayuda no disponible"
#: g10/helptext.c:216 #: g10/helptext.c:216
#, c-format #, c-format
msgid "No help available for '%s'" msgid "No help available for `%s'"
msgstr "Ayuda no disponible para '%s'" msgstr "Ayuda no disponible para `%s'"
#~ msgid "You will see a list of signators etc. here\n" #~ msgid "You will see a list of signators etc. here\n"
#~ msgstr "Aquí se verá una lista de firmantes, etc.\n" #~ msgstr "Aquí se verá una lista de firmantes, etc.\n"

120
po/fr.po
View File

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 0.4.5a\n" "Project-Id-Version: gnupg 0.4.5a\n"
"POT-Creation-Date: 1998-12-23 15:55+0100\n" "POT-Creation-Date: 1998-12-23 16:53+0100\n"
"PO-Revision-Date: 1998-12-15 00:35+01:00\n" "PO-Revision-Date: 1998-12-15 00:35+01:00\n"
"Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n" "Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
"Language-Team: French <fr@li.org>\n" "Language-Team: French <fr@li.org>\n"
@ -580,18 +580,18 @@ msgstr "commandes en conflit\n"
#: g10/g10.c:618 #: g10/g10.c:618
#, c-format #, c-format
msgid "NOTE: no default option file '%s'\n" msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE : pas de fichier d'options par défaut '%s'\n" msgstr "NOTE : pas de fichier d'options par défaut `%s'\n"
#: g10/g10.c:622 #: g10/g10.c:622
#, c-format #, c-format
msgid "option file '%s': %s\n" msgid "option file `%s': %s\n"
msgstr "fichier d'options '%s' : %s\n" msgstr "fichier d'options `%s' : %s\n"
#: g10/g10.c:629 #: g10/g10.c:629
#, c-format #, c-format
msgid "reading options from '%s'\n" msgid "reading options from `%s'\n"
msgstr "lire les options de '%s'\n" msgstr "lire les options de `%s'\n"
#: g10/g10.c:782 #: g10/g10.c:782
#, c-format #, c-format
@ -697,8 +697,8 @@ msgstr "construction d'armure non r
#: g10/g10.c:1201 #: g10/g10.c:1201
#, c-format #, c-format
msgid "invalid hash algorithm '%s'\n" msgid "invalid hash algorithm `%s'\n"
msgstr "algorithme de hachage '%s' invalide\n" msgstr "algorithme de hachage `%s' invalide\n"
#: g10/g10.c:1280 #: g10/g10.c:1280
msgid "[filename]" msgid "[filename]"
@ -710,8 +710,8 @@ msgstr "Continuez et tapez votre message...\n"
#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66
#, c-format #, c-format
msgid "can't open '%s'\n" msgid "can't open `%s'\n"
msgstr "ne peut ouvrir '%s'\n" msgstr "ne peut ouvrir `%s'\n"
#: g10/armor.c:344 g10/armor.c:391 #: g10/armor.c:344 g10/armor.c:391
msgid "armor header: " msgid "armor header: "
@ -725,50 +725,50 @@ msgstr "en-t
msgid "invalid armor header: " msgid "invalid armor header: "
msgstr "en-tête d'armure invalide : " msgstr "en-tête d'armure invalide : "
#: g10/armor.c:460 #: g10/armor.c:461
#, c-format #, c-format
msgid "armor: %s\n" msgid "armor: %s\n"
msgstr "armure : %s\n" msgstr "armure : %s\n"
#: g10/armor.c:533 #: g10/armor.c:534
msgid "invalid dash escaped line: " msgid "invalid dash escaped line: "
msgstr "ligne de traits d'échappement invalide : " msgstr "ligne de traits d'échappement invalide : "
#: g10/armor.c:602 #: g10/armor.c:603
msgid "invalid clear text header: " msgid "invalid clear text header: "
msgstr "en-tête de texte clair invalide : " msgstr "en-tête de texte clair invalide : "
#: g10/armor.c:845 #: g10/armor.c:846
#, c-format #, c-format
msgid "invalid radix64 character %02x skipped\n" msgid "invalid radix64 character %02x skipped\n"
msgstr "caractère %02x invalide en base 64 ignoré\n" msgstr "caractère %02x invalide en base 64 ignoré\n"
#: g10/armor.c:878 #: g10/armor.c:879
msgid "premature eof (no CRC)\n" msgid "premature eof (no CRC)\n"
msgstr "fin de fichier prématurée (pas de CRC)\n" msgstr "fin de fichier prématurée (pas de CRC)\n"
#: g10/armor.c:897 #: g10/armor.c:898
msgid "premature eof (in CRC)\n" msgid "premature eof (in CRC)\n"
msgstr "fin de fichier prématurée (dans le CRC)\n" msgstr "fin de fichier prématurée (dans le CRC)\n"
#: g10/armor.c:901 #: g10/armor.c:902
msgid "malformed CRC\n" msgid "malformed CRC\n"
msgstr "CRC malformé\n" msgstr "CRC malformé\n"
#: g10/armor.c:905 #: g10/armor.c:906
#, c-format #, c-format
msgid "CRC error; %06lx - %06lx\n" msgid "CRC error; %06lx - %06lx\n"
msgstr "Erreur de CRC ; %06lx - %06lx\n" msgstr "Erreur de CRC ; %06lx - %06lx\n"
#: g10/armor.c:924 #: g10/armor.c:925
msgid "premature eof (in Trailer)\n" msgid "premature eof (in Trailer)\n"
msgstr "fin de fichier prématurée (dans la remorque)\n" msgstr "fin de fichier prématurée (dans la remorque)\n"
#: g10/armor.c:928 #: g10/armor.c:929
msgid "error in trailer line\n" msgid "error in trailer line\n"
msgstr "erreur dans la ligne de remorque\n" msgstr "erreur dans la ligne de remorque\n"
#: g10/armor.c:1182 #: g10/armor.c:1183
#, fuzzy #, fuzzy
msgid "no valid OpenPGP data found.\n" msgid "no valid OpenPGP data found.\n"
msgstr "pas de donnée RFC1991 ou OpenPGP valide trouvée.\n" msgstr "pas de donnée RFC1991 ou OpenPGP valide trouvée.\n"
@ -1257,13 +1257,13 @@ msgstr "La g
#: g10/keygen.c:851 #: g10/keygen.c:851
#, c-format #, c-format
msgid "writing public certificate to '%s'\n" msgid "writing public certificate to `%s'\n"
msgstr "écriture d'un certificat public à '%s'\n" msgstr "écriture d'un certificat public à `%s'\n"
#: g10/keygen.c:852 #: g10/keygen.c:852
#, c-format #, c-format
msgid "writing secret certificate to '%s'\n" msgid "writing secret certificate to `%s'\n"
msgstr "écriture d'un certificat secret à '%s'\n" msgstr "écriture d'un certificat secret à `%s'\n"
#: g10/keygen.c:929 #: g10/keygen.c:929
msgid "public and secret key created and signed.\n" msgid "public and secret key created and signed.\n"
@ -1305,8 +1305,8 @@ msgstr "%s : ATTENTION : fichier vide\n"
#: g10/encode.c:222 #: g10/encode.c:222
#, c-format #, c-format
msgid "reading from '%s'\n" msgid "reading from `%s'\n"
msgstr "lecture de '%s'\n" msgstr "lecture de `%s'\n"
#: g10/encode.c:397 #: g10/encode.c:397
#, c-format #, c-format
@ -1447,8 +1447,8 @@ msgstr "pas de porte-cl
#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592
#, c-format #, c-format
msgid "writing to '%s'\n" msgid "writing to `%s'\n"
msgstr "écriture de '%s'\n" msgstr "écriture de `%s'\n"
#: g10/import.c:366 g10/import.c:426 g10/import.c:642 #: g10/import.c:366 g10/import.c:426 g10/import.c:642
#, c-format #, c-format
@ -2138,8 +2138,8 @@ msgstr "lecture de l'entr
#: g10/plaintext.c:300 #: g10/plaintext.c:300
#, c-format #, c-format
msgid "can't open signed data '%s'\n" msgid "can't open signed data `%s'\n"
msgstr "ne peut ouvir les données signées '%s'\n" msgstr "ne peut ouvir les données signées `%s'\n"
#: g10/pubkey-enc.c:78 #: g10/pubkey-enc.c:78
#, c-format #, c-format
@ -2214,8 +2214,8 @@ msgstr "signature :"
#: g10/sign.c:336 #: g10/sign.c:336
#, c-format #, c-format
msgid "WARNING: '%s' is an empty file\n" msgid "WARNING: `%s' is an empty file\n"
msgstr "ATTENTION : '%s' est un fichier vide\n" msgstr "ATTENTION : `%s' est un fichier vide\n"
#: g10/tdbio.c:116 g10/tdbio.c:1413 #: g10/tdbio.c:116 g10/tdbio.c:1413
#, c-format #, c-format
@ -2403,8 +2403,8 @@ msgstr "l'enregistrement de signature %lu a un mauvais propri
#: g10/trustdb.c:463 #: g10/trustdb.c:463
#, c-format #, c-format
msgid "'%s' is not a valid long keyID\n" msgid "`%s' is not a valid long keyID\n"
msgstr "'%s' n'est pas une identification longue de clé valide\n" msgstr "`%s' n'est pas une identification longue de clé valide\n"
#: g10/trustdb.c:498 #: g10/trustdb.c:498
#, c-format #, c-format
@ -2486,28 +2486,28 @@ msgstr "Ooops, pas de nom d'utilisateur\n"
#: g10/trustdb.c:1088 g10/trustdb.c:1106 #: g10/trustdb.c:1088 g10/trustdb.c:1106
#, c-format #, c-format
msgid "user '%s' read problem: %s\n" msgid "user `%s' read problem: %s\n"
msgstr "problème de lecture de l'utilisateur '%s' : %s\n" msgstr "problème de lecture de l'utilisateur `%s' : %s\n"
#: g10/trustdb.c:1091 g10/trustdb.c:1109 #: g10/trustdb.c:1091 g10/trustdb.c:1109
#, c-format #, c-format
msgid "user '%s' list problem: %s\n" msgid "user `%s' list problem: %s\n"
msgstr "problème de liste à l'utilisateur '%s' : %s\n" msgstr "problème de liste à l'utilisateur `%s' : %s\n"
#: g10/trustdb.c:1099 g10/trustdb.c:1346 #: g10/trustdb.c:1099 g10/trustdb.c:1346
#, c-format #, c-format
msgid "user '%s' not found: %s\n" msgid "user `%s' not found: %s\n"
msgstr "l'utilisateur '%s' n'a pas été trouvé : %s\n" msgstr "l'utilisateur `%s' n'a pas été trouvé : %s\n"
#: g10/trustdb.c:1101 g10/trustdb.c:1348 #: g10/trustdb.c:1101 g10/trustdb.c:1348
#, c-format #, c-format
msgid "problem finding '%s' in trustdb: %s\n" msgid "problem finding `%s' in trustdb: %s\n"
msgstr "problème de recherche de '%s' dans la base de confiance : %s\n" msgstr "problème de recherche de `%s' dans la base de confiance : %s\n"
#: g10/trustdb.c:1104 #: g10/trustdb.c:1104
#, c-format #, c-format
msgid "user '%s' not in trustdb\n" msgid "user `%s' not in trustdb\n"
msgstr "l'utilisateur '%s' n'est pas dans la base de confiance\n" msgstr "l'utilisateur `%s' n'est pas dans la base de confiance\n"
#: g10/trustdb.c:1139 #: g10/trustdb.c:1139
#, c-format #, c-format
@ -2580,13 +2580,13 @@ msgstr "erreur pendant la recherche de l'enregistrement de r
#: g10/trustdb.c:1351 #: g10/trustdb.c:1351
#, c-format #, c-format
msgid "user '%s' not in trustdb - inserting\n" msgid "user `%s' not in trustdb - inserting\n"
msgstr "l'utilisateur '%s' n'est pas dans la base de confiance - insertion\n" msgstr "l'utilisateur `%s' n'est pas dans la base de confiance - insertion\n"
#: g10/trustdb.c:1354 #: g10/trustdb.c:1354
#, c-format #, c-format
msgid "failed to put '%s' into trustdb: %s\n" msgid "failed to put `%s' into trustdb: %s\n"
msgstr "n'a pas pu insérer '%s' dans la base de confiance : %s\n" msgstr "n'a pas pu insérer `%s' dans la base de confiance : %s\n"
#: g10/trustdb.c:1404 #: g10/trustdb.c:1404
#, c-format #, c-format
@ -2924,23 +2924,23 @@ msgstr "R
#: g10/skclist.c:94 #: g10/skclist.c:94
#, c-format #, c-format
msgid "skipped '%s': %s\n" msgid "skipped `%s': %s\n"
msgstr "'%s' a été ignoré : %s\n" msgstr "`%s' a été ignoré : %s\n"
#: g10/skclist.c:100 #: g10/skclist.c:100
#, c-format #, c-format
msgid "" msgid ""
"skipped '%s': this is a PGP generated ElGamal key which is not secure for " "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
"signatures!\n" "signatures!\n"
msgstr "" msgstr ""
"'%s' a été ignorée : c'est une clé ElGamal générée par PGP qui n'est pas\n" "`%s' a été ignorée : c'est une clé ElGamal générée par PGP qui n'est pas\n"
"sûre pour les signatures !\n" "sûre pour les signatures !\n"
#. do not overwrite #. do not overwrite
#: g10/openfile.c:58 #: g10/openfile.c:58
#, c-format #, c-format
msgid "File '%s' exists. " msgid "File `%s' exists. "
msgstr "Le fichier '%s' existe. " msgstr "Le fichier `%s' existe. "
#: g10/openfile.c:60 #: g10/openfile.c:60
msgid "Overwrite (y/N)? " msgid "Overwrite (y/N)? "
@ -2952,8 +2952,8 @@ msgstr "
#: g10/openfile.c:134 #: g10/openfile.c:134
#, c-format #, c-format
msgid "assuming signed data in '%s'\n" msgid "assuming signed data in `%s'\n"
msgstr "les données signées sont supposées être dans '%s'\n" msgstr "les données signées sont supposées être dans `%s'\n"
#: g10/openfile.c:181 #: g10/openfile.c:181
#, c-format #, c-format
@ -3124,5 +3124,5 @@ msgstr "Pas d'aide disponible"
#: g10/helptext.c:216 #: g10/helptext.c:216
#, c-format #, c-format
msgid "No help available for '%s'" msgid "No help available for `%s'"
msgstr "Pas d'aide disponible pour '%s'" msgstr "Pas d'aide disponible pour `%s'"

102
po/it.po
View File

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg-0.4.3\n" "Project-Id-Version: gnupg-0.4.3\n"
"POT-Creation-Date: 1998-12-23 15:55+0100\n" "POT-Creation-Date: 1998-12-23 16:53+0100\n"
"PO-Revision-Date: 1998-11-09 16:19+01:00\n" "PO-Revision-Date: 1998-11-09 16:19+01:00\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n" "Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <it@li.org>\n" "Language-Team: Italian <it@li.org>\n"
@ -576,18 +576,18 @@ msgstr "comandi in conflitto\n"
#: g10/g10.c:618 #: g10/g10.c:618
#, fuzzy, c-format #, fuzzy, c-format
msgid "NOTE: no default option file '%s'\n" msgid "NOTE: no default option file `%s'\n"
msgstr "nota: nessun file con opzioni predefinite '%s'\n" msgstr "nota: nessun file con opzioni predefinite `%s'\n"
#: g10/g10.c:622 #: g10/g10.c:622
#, c-format #, c-format
msgid "option file '%s': %s\n" msgid "option file `%s': %s\n"
msgstr "file con opzioni predefinite '%s': %s\n" msgstr "file con opzioni predefinite `%s': %s\n"
#: g10/g10.c:629 #: g10/g10.c:629
#, c-format #, c-format
msgid "reading options from '%s'\n" msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da '%s'\n" msgstr "lettura delle opzioni da `%s'\n"
#: g10/g10.c:782 #: g10/g10.c:782
#, fuzzy, c-format #, fuzzy, c-format
@ -677,7 +677,7 @@ msgstr "--delete-key nomeutente"
#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 #: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301
#, c-format #, c-format
msgid "can't open %s: %s\n" msgid "can't open %s: %s\n"
msgstr "impossibile aprire '%s': %s\n" msgstr "impossibile aprire `%s': %s\n"
#: g10/g10.c:1070 #: g10/g10.c:1070
msgid "-k[v][v][v][c] [userid] [keyring]" msgid "-k[v][v][v][c] [userid] [keyring]"
@ -695,8 +695,8 @@ msgstr "creazione dell'armatura fallita: %s\n"
#: g10/g10.c:1201 #: g10/g10.c:1201
#, c-format #, c-format
msgid "invalid hash algorithm '%s'\n" msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo di hash non valido '%s'\n" msgstr "algoritmo di hash non valido `%s'\n"
#: g10/g10.c:1280 #: g10/g10.c:1280
msgid "[filename]" msgid "[filename]"
@ -708,8 +708,8 @@ msgstr ""
#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66
#, c-format #, c-format
msgid "can't open '%s'\n" msgid "can't open `%s'\n"
msgstr "impossibile aprire '%s'\n" msgstr "impossibile aprire `%s'\n"
#: g10/armor.c:344 g10/armor.c:391 #: g10/armor.c:344 g10/armor.c:391
msgid "armor header: " msgid "armor header: "
@ -723,50 +723,50 @@ msgstr "header della firma in chiaro non valido\n"
msgid "invalid armor header: " msgid "invalid armor header: "
msgstr "header dell'armatura non valido: " msgstr "header dell'armatura non valido: "
#: g10/armor.c:460 #: g10/armor.c:461
#, c-format #, c-format
msgid "armor: %s\n" msgid "armor: %s\n"
msgstr "armatura: %s\n" msgstr "armatura: %s\n"
#: g10/armor.c:533 #: g10/armor.c:534
msgid "invalid dash escaped line: " msgid "invalid dash escaped line: "
msgstr "riga protetta con il trattino non valida: " msgstr "riga protetta con il trattino non valida: "
#: g10/armor.c:602 #: g10/armor.c:603
msgid "invalid clear text header: " msgid "invalid clear text header: "
msgstr "header del testo in chiaro non valido: " msgstr "header del testo in chiaro non valido: "
#: g10/armor.c:845 #: g10/armor.c:846
#, c-format #, c-format
msgid "invalid radix64 character %02x skipped\n" msgid "invalid radix64 character %02x skipped\n"
msgstr "Carattere radix64 non valido %02x saltato\n" msgstr "Carattere radix64 non valido %02x saltato\n"
#: g10/armor.c:878 #: g10/armor.c:879
msgid "premature eof (no CRC)\n" msgid "premature eof (no CRC)\n"
msgstr "eof prematura (nessun CRC)\n" msgstr "eof prematura (nessun CRC)\n"
#: g10/armor.c:897 #: g10/armor.c:898
msgid "premature eof (in CRC)\n" msgid "premature eof (in CRC)\n"
msgstr "eof prematura (nel CRC)\n" msgstr "eof prematura (nel CRC)\n"
#: g10/armor.c:901 #: g10/armor.c:902
msgid "malformed CRC\n" msgid "malformed CRC\n"
msgstr "CRC malformato\n" msgstr "CRC malformato\n"
#: g10/armor.c:905 #: g10/armor.c:906
#, c-format #, c-format
msgid "CRC error; %06lx - %06lx\n" msgid "CRC error; %06lx - %06lx\n"
msgstr "errore nel CRC; %06lx - %06lx\n" msgstr "errore nel CRC; %06lx - %06lx\n"
#: g10/armor.c:924 #: g10/armor.c:925
msgid "premature eof (in Trailer)\n" msgid "premature eof (in Trailer)\n"
msgstr "eof prematura (nella coda)\n" msgstr "eof prematura (nella coda)\n"
#: g10/armor.c:928 #: g10/armor.c:929
msgid "error in trailer line\n" msgid "error in trailer line\n"
msgstr "errore nella riga della coda\n" msgstr "errore nella riga della coda\n"
#: g10/armor.c:1182 #: g10/armor.c:1183
#, fuzzy #, fuzzy
msgid "no valid OpenPGP data found.\n" msgid "no valid OpenPGP data found.\n"
msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n" msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n"
@ -1247,13 +1247,13 @@ msgstr "Generazione della chiave annullata.\n"
#: g10/keygen.c:851 #: g10/keygen.c:851
#, c-format #, c-format
msgid "writing public certificate to '%s'\n" msgid "writing public certificate to `%s'\n"
msgstr "scrittura del certificato pubblico in '%s'\n" msgstr "scrittura del certificato pubblico in `%s'\n"
#: g10/keygen.c:852 #: g10/keygen.c:852
#, c-format #, c-format
msgid "writing secret certificate to '%s'\n" msgid "writing secret certificate to `%s'\n"
msgstr "scrittura del certificato privato in '%s'\n" msgstr "scrittura del certificato privato in `%s'\n"
#: g10/keygen.c:929 #: g10/keygen.c:929
msgid "public and secret key created and signed.\n" msgid "public and secret key created and signed.\n"
@ -1295,8 +1295,8 @@ msgstr "%s: attenzione: file vuoto\n"
#: g10/encode.c:222 #: g10/encode.c:222
#, c-format #, c-format
msgid "reading from '%s'\n" msgid "reading from `%s'\n"
msgstr "lettura da '%s'\n" msgstr "lettura da `%s'\n"
#: g10/encode.c:397 #: g10/encode.c:397
#, fuzzy, c-format #, fuzzy, c-format
@ -1436,8 +1436,8 @@ msgstr "nessun portachiavi pubblico predefinito\n"
#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592
#, c-format #, c-format
msgid "writing to '%s'\n" msgid "writing to `%s'\n"
msgstr "scrittura in '%s'\n" msgstr "scrittura in `%s'\n"
#: g10/import.c:366 g10/import.c:426 g10/import.c:642 #: g10/import.c:366 g10/import.c:426 g10/import.c:642
#, c-format #, c-format
@ -2056,7 +2056,7 @@ msgstr ""
#: g10/misc.c:88 #: g10/misc.c:88
#, fuzzy, c-format #, fuzzy, c-format
msgid "can't disable core dumps: %s\n" msgid "can't disable core dumps: %s\n"
msgstr "impossibile aprire '%s': %s\n" msgstr "impossibile aprire `%s': %s\n"
#: g10/misc.c:90 #: g10/misc.c:90
msgid "WARNING: Program may create a core file!\n" msgid "WARNING: Program may create a core file!\n"
@ -2128,8 +2128,8 @@ msgstr ""
#: g10/plaintext.c:300 #: g10/plaintext.c:300
#, c-format #, c-format
msgid "can't open signed data '%s'\n" msgid "can't open signed data `%s'\n"
msgstr "impossibile aprire i dati firmati '%s'\n" msgstr "impossibile aprire i dati firmati `%s'\n"
#: g10/pubkey-enc.c:78 #: g10/pubkey-enc.c:78
#, c-format #, c-format
@ -2204,7 +2204,7 @@ msgstr "sign"
#: g10/sign.c:336 #: g10/sign.c:336
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: '%s' is an empty file\n" msgid "WARNING: `%s' is an empty file\n"
msgstr "%s: attenzione: file vuoto\n" msgstr "%s: attenzione: file vuoto\n"
#: g10/tdbio.c:116 g10/tdbio.c:1413 #: g10/tdbio.c:116 g10/tdbio.c:1413
@ -2383,7 +2383,7 @@ msgstr "la chained sigrec %lu ha il proprietario sbagliato\n"
#: g10/trustdb.c:463 #: g10/trustdb.c:463
#, fuzzy, c-format #, fuzzy, c-format
msgid "'%s' is not a valid long keyID\n" msgid "`%s' is not a valid long keyID\n"
msgstr "Carattere non valido nel commento\n" msgstr "Carattere non valido nel commento\n"
#: g10/trustdb.c:498 #: g10/trustdb.c:498
@ -2467,27 +2467,27 @@ msgstr "elenca le chiavi e gli user id"
#: g10/trustdb.c:1088 g10/trustdb.c:1106 #: g10/trustdb.c:1088 g10/trustdb.c:1106
#, c-format #, c-format
msgid "user '%s' read problem: %s\n" msgid "user `%s' read problem: %s\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1091 g10/trustdb.c:1109 #: g10/trustdb.c:1091 g10/trustdb.c:1109
#, c-format #, c-format
msgid "user '%s' list problem: %s\n" msgid "user `%s' list problem: %s\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1099 g10/trustdb.c:1346 #: g10/trustdb.c:1099 g10/trustdb.c:1346
#, fuzzy, c-format #, fuzzy, c-format
msgid "user '%s' not found: %s\n" msgid "user `%s' not found: %s\n"
msgstr "%s: utente non trovato\n" msgstr "%s: utente non trovato\n"
#: g10/trustdb.c:1101 g10/trustdb.c:1348 #: g10/trustdb.c:1101 g10/trustdb.c:1348
#, c-format #, c-format
msgid "problem finding '%s' in trustdb: %s\n" msgid "problem finding `%s' in trustdb: %s\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1104 #: g10/trustdb.c:1104
#, c-format #, c-format
msgid "user '%s' not in trustdb\n" msgid "user `%s' not in trustdb\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1139 #: g10/trustdb.c:1139
@ -2561,12 +2561,12 @@ msgstr "rimozione dell'armatura fallita: %s\n"
#: g10/trustdb.c:1351 #: g10/trustdb.c:1351
#, c-format #, c-format
msgid "user '%s' not in trustdb - inserting\n" msgid "user `%s' not in trustdb - inserting\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1354 #: g10/trustdb.c:1354
#, fuzzy, c-format #, fuzzy, c-format
msgid "failed to put '%s' into trustdb: %s\n" msgid "failed to put `%s' into trustdb: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n"
#: g10/trustdb.c:1404 #: g10/trustdb.c:1404
@ -2890,13 +2890,13 @@ msgstr ""
#: g10/skclist.c:94 #: g10/skclist.c:94
#, fuzzy, c-format #, fuzzy, c-format
msgid "skipped '%s': %s\n" msgid "skipped `%s': %s\n"
msgstr "%s: saltata: %s\n" msgstr "%s: saltata: %s\n"
#: g10/skclist.c:100 #: g10/skclist.c:100
#, fuzzy, c-format #, fuzzy, c-format
msgid "" msgid ""
"skipped '%s': this is a PGP generated ElGamal key which is not secure for " "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
"signatures!\n" "signatures!\n"
msgstr "" msgstr ""
"questa è una chiave ElGamal generata da PGP che NON è sicura per le firme!\n" "questa è una chiave ElGamal generata da PGP che NON è sicura per le firme!\n"
@ -2904,8 +2904,8 @@ msgstr ""
#. do not overwrite #. do not overwrite
#: g10/openfile.c:58 #: g10/openfile.c:58
#, c-format #, c-format
msgid "File '%s' exists. " msgid "File `%s' exists. "
msgstr "Il file '%s' esiste. " msgstr "Il file `%s' esiste. "
#: g10/openfile.c:60 #: g10/openfile.c:60
msgid "Overwrite (y/N)? " msgid "Overwrite (y/N)? "
@ -2917,8 +2917,8 @@ msgstr "scrivo su stdout\n"
#: g10/openfile.c:134 #: g10/openfile.c:134
#, c-format #, c-format
msgid "assuming signed data in '%s'\n" msgid "assuming signed data in `%s'\n"
msgstr "presumo che i dati firmati siano in '%s'\n" msgstr "presumo che i dati firmati siano in `%s'\n"
#: g10/openfile.c:181 #: g10/openfile.c:181
#, c-format #, c-format
@ -3074,8 +3074,8 @@ msgstr "Nessun aiuto disponibile"
#: g10/helptext.c:216 #: g10/helptext.c:216
#, c-format #, c-format
msgid "No help available for '%s'" msgid "No help available for `%s'"
msgstr "Nessun aiuto disponibile per '%s'" msgstr "Nessun aiuto disponibile per `%s'"
#~ msgid "You will see a list of signators etc. here\n" #~ msgid "You will see a list of signators etc. here\n"
#~ msgstr "Qui vedrai una lista di firmatari, ecc.\n" #~ msgstr "Qui vedrai una lista di firmatari, ecc.\n"

1844
po/pl.po Normal file
View File

File diff suppressed because it is too large Load Diff

120
po/pt_BR.po
View File

@ -4,7 +4,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"POT-Creation-Date: 1998-12-23 15:55+0100\n" "POT-Creation-Date: 1998-12-23 16:53+0100\n"
"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-20 23:46:36-0200\n" "Date: 1998-11-20 23:46:36-0200\n"
"From: Thiago Jung Bauermann <jungmann@usa.net>\n" "From: Thiago Jung Bauermann <jungmann@usa.net>\n"
@ -584,18 +584,18 @@ msgstr "comandos conflitantes\n"
#: g10/g10.c:618 #: g10/g10.c:618
#, c-format #, c-format
msgid "NOTE: no default option file '%s'\n" msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de opções padrão '%s' inexistente\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n"
#: g10/g10.c:622 #: g10/g10.c:622
#, c-format #, c-format
msgid "option file '%s': %s\n" msgid "option file `%s': %s\n"
msgstr "arquivo de opções '%s': %s\n" msgstr "arquivo de opções `%s': %s\n"
#: g10/g10.c:629 #: g10/g10.c:629
#, c-format #, c-format
msgid "reading options from '%s'\n" msgid "reading options from `%s'\n"
msgstr "lendo opções de '%s'\n" msgstr "lendo opções de `%s'\n"
#: g10/g10.c:782 #: g10/g10.c:782
#, c-format #, c-format
@ -701,8 +701,8 @@ msgstr "cria
#: g10/g10.c:1201 #: g10/g10.c:1201
#, c-format #, c-format
msgid "invalid hash algorithm '%s'\n" msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de distribuição inválido '%s'\n" msgstr "algoritmo de distribuição inválido `%s'\n"
#: g10/g10.c:1280 #: g10/g10.c:1280
msgid "[filename]" msgid "[filename]"
@ -714,8 +714,8 @@ msgstr "V
#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66
#, c-format #, c-format
msgid "can't open '%s'\n" msgid "can't open `%s'\n"
msgstr "impossível abrir '%s'\n" msgstr "impossível abrir `%s'\n"
#: g10/armor.c:344 g10/armor.c:391 #: g10/armor.c:344 g10/armor.c:391
msgid "armor header: " msgid "armor header: "
@ -729,50 +729,50 @@ msgstr "cabe
msgid "invalid armor header: " msgid "invalid armor header: "
msgstr "cabeçalho de armadura inválido: " msgstr "cabeçalho de armadura inválido: "
#: g10/armor.c:460 #: g10/armor.c:461
#, c-format #, c-format
msgid "armor: %s\n" msgid "armor: %s\n"
msgstr "armadura: %s\n" msgstr "armadura: %s\n"
#: g10/armor.c:533 #: g10/armor.c:534
msgid "invalid dash escaped line: " msgid "invalid dash escaped line: "
msgstr "linha com hífen inválida: " msgstr "linha com hífen inválida: "
#: g10/armor.c:602 #: g10/armor.c:603
msgid "invalid clear text header: " msgid "invalid clear text header: "
msgstr "cabeçalho de texto puro inválido: " msgstr "cabeçalho de texto puro inválido: "
#: g10/armor.c:845 #: g10/armor.c:846
#, c-format #, c-format
msgid "invalid radix64 character %02x skipped\n" msgid "invalid radix64 character %02x skipped\n"
msgstr "caractere radix64 inválido %02x ignorado\n" msgstr "caractere radix64 inválido %02x ignorado\n"
#: g10/armor.c:878 #: g10/armor.c:879
msgid "premature eof (no CRC)\n" msgid "premature eof (no CRC)\n"
msgstr "fim de arquivo prematuro (sem CRC)\n" msgstr "fim de arquivo prematuro (sem CRC)\n"
#: g10/armor.c:897 #: g10/armor.c:898
msgid "premature eof (in CRC)\n" msgid "premature eof (in CRC)\n"
msgstr "fim de arquivo prematuro (no CRC)\n" msgstr "fim de arquivo prematuro (no CRC)\n"
#: g10/armor.c:901 #: g10/armor.c:902
msgid "malformed CRC\n" msgid "malformed CRC\n"
msgstr "CRC malformado\n" msgstr "CRC malformado\n"
#: g10/armor.c:905 #: g10/armor.c:906
#, c-format #, c-format
msgid "CRC error; %06lx - %06lx\n" msgid "CRC error; %06lx - %06lx\n"
msgstr "erro de CRC; %06lx - %06lx\n" msgstr "erro de CRC; %06lx - %06lx\n"
#: g10/armor.c:924 #: g10/armor.c:925
msgid "premature eof (in Trailer)\n" msgid "premature eof (in Trailer)\n"
msgstr "fim de arquivo prematuro (no \"Trailer\")\n" msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
#: g10/armor.c:928 #: g10/armor.c:929
msgid "error in trailer line\n" msgid "error in trailer line\n"
msgstr "erro na linha \"trailer\"\n" msgstr "erro na linha \"trailer\"\n"
#: g10/armor.c:1182 #: g10/armor.c:1183
#, fuzzy #, fuzzy
msgid "no valid OpenPGP data found.\n" msgid "no valid OpenPGP data found.\n"
msgstr "nenum dado RFC1991 ou OpenPGP válido encontrado.\n" msgstr "nenum dado RFC1991 ou OpenPGP válido encontrado.\n"
@ -1254,13 +1254,13 @@ msgstr "Gera
#: g10/keygen.c:851 #: g10/keygen.c:851
#, c-format #, c-format
msgid "writing public certificate to '%s'\n" msgid "writing public certificate to `%s'\n"
msgstr "escrevendo certificado público para '%s'\n" msgstr "escrevendo certificado público para `%s'\n"
#: g10/keygen.c:852 #: g10/keygen.c:852
#, c-format #, c-format
msgid "writing secret certificate to '%s'\n" msgid "writing secret certificate to `%s'\n"
msgstr "escrevendo certificado privado para '%s'\n" msgstr "escrevendo certificado privado para `%s'\n"
#: g10/keygen.c:929 #: g10/keygen.c:929
msgid "public and secret key created and signed.\n" msgid "public and secret key created and signed.\n"
@ -1302,8 +1302,8 @@ msgstr "%s: AVISO: arquivo vazio\n"
#: g10/encode.c:222 #: g10/encode.c:222
#, c-format #, c-format
msgid "reading from '%s'\n" msgid "reading from `%s'\n"
msgstr "lendo de '%s'\n" msgstr "lendo de `%s'\n"
#: g10/encode.c:397 #: g10/encode.c:397
#, fuzzy, c-format #, fuzzy, c-format
@ -1318,7 +1318,7 @@ msgstr "%s: usu
#: g10/export.c:123 #: g10/export.c:123
#, fuzzy, c-format #, fuzzy, c-format
msgid "certificate read problem: %s\n" msgid "certificate read problem: %s\n"
msgstr "erro de leitura do usuário '%s': %s\n" msgstr "erro de leitura do usuário `%s': %s\n"
#: g10/export.c:132 #: g10/export.c:132
#, fuzzy, c-format #, fuzzy, c-format
@ -1442,8 +1442,8 @@ msgstr "sem anel de chaves p
#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592
#, c-format #, c-format
msgid "writing to '%s'\n" msgid "writing to `%s'\n"
msgstr "escrevendo para '%s'\n" msgstr "escrevendo para `%s'\n"
#: g10/import.c:366 g10/import.c:426 g10/import.c:642 #: g10/import.c:366 g10/import.c:426 g10/import.c:642
#, c-format #, c-format
@ -2130,8 +2130,8 @@ msgstr "lendo \"stdin\" ...\n"
#: g10/plaintext.c:300 #: g10/plaintext.c:300
#, c-format #, c-format
msgid "can't open signed data '%s'\n" msgid "can't open signed data `%s'\n"
msgstr "impossível abrir dados assinados '%s'\n" msgstr "impossível abrir dados assinados `%s'\n"
#: g10/pubkey-enc.c:78 #: g10/pubkey-enc.c:78
#, c-format #, c-format
@ -2201,8 +2201,8 @@ msgstr "assinando:"
#: g10/sign.c:336 #: g10/sign.c:336
#, c-format #, c-format
msgid "WARNING: '%s' is an empty file\n" msgid "WARNING: `%s' is an empty file\n"
msgstr "AVISO: '%s' é um arquivo vazio\n" msgstr "AVISO: `%s' é um arquivo vazio\n"
#: g10/tdbio.c:116 g10/tdbio.c:1413 #: g10/tdbio.c:116 g10/tdbio.c:1413
#, fuzzy, c-format #, fuzzy, c-format
@ -2382,7 +2382,7 @@ msgstr "sigrec em cadeia %lu possui dono errado\n"
#: g10/trustdb.c:463 #: g10/trustdb.c:463
#, fuzzy, c-format #, fuzzy, c-format
msgid "'%s' is not a valid long keyID\n" msgid "`%s' is not a valid long keyID\n"
msgstr "%s não é um mapa de caracteres válido\n" msgstr "%s não é um mapa de caracteres válido\n"
#: g10/trustdb.c:498 #: g10/trustdb.c:498
@ -2465,28 +2465,28 @@ msgstr "Ooops, nenhum id de usu
#: g10/trustdb.c:1088 g10/trustdb.c:1106 #: g10/trustdb.c:1088 g10/trustdb.c:1106
#, c-format #, c-format
msgid "user '%s' read problem: %s\n" msgid "user `%s' read problem: %s\n"
msgstr "erro de leitura do usuário '%s': %s\n" msgstr "erro de leitura do usuário `%s': %s\n"
#: g10/trustdb.c:1091 g10/trustdb.c:1109 #: g10/trustdb.c:1091 g10/trustdb.c:1109
#, c-format #, c-format
msgid "user '%s' list problem: %s\n" msgid "user `%s' list problem: %s\n"
msgstr "erro de listagem do usuário '%s': %s\n" msgstr "erro de listagem do usuário `%s': %s\n"
#: g10/trustdb.c:1099 g10/trustdb.c:1346 #: g10/trustdb.c:1099 g10/trustdb.c:1346
#, c-format #, c-format
msgid "user '%s' not found: %s\n" msgid "user `%s' not found: %s\n"
msgstr "usuário '%s' não encontrado: %s\n" msgstr "usuário `%s' não encontrado: %s\n"
#: g10/trustdb.c:1101 g10/trustdb.c:1348 #: g10/trustdb.c:1101 g10/trustdb.c:1348
#, c-format #, c-format
msgid "problem finding '%s' in trustdb: %s\n" msgid "problem finding `%s' in trustdb: %s\n"
msgstr "problemas encontrando '%s' no banco de dados de confiança: %s\n" msgstr "problemas encontrando `%s' no banco de dados de confiança: %s\n"
#: g10/trustdb.c:1104 #: g10/trustdb.c:1104
#, c-format #, c-format
msgid "user '%s' not in trustdb\n" msgid "user `%s' not in trustdb\n"
msgstr "usuário '%s' não está no banco de dados de confiança\n" msgstr "usuário `%s' não está no banco de dados de confiança\n"
#: g10/trustdb.c:1139 #: g10/trustdb.c:1139
#, c-format #, c-format
@ -2560,14 +2560,14 @@ msgstr "erro encontrando registro de diret
#: g10/trustdb.c:1351 #: g10/trustdb.c:1351
#, c-format #, c-format
msgid "user '%s' not in trustdb - inserting\n" msgid "user `%s' not in trustdb - inserting\n"
msgstr "" msgstr ""
"usuário '%s' não encontrado no banco de dados de confiança - inserindo\n" "usuário `%s' não encontrado no banco de dados de confiança - inserindo\n"
#: g10/trustdb.c:1354 #: g10/trustdb.c:1354
#, c-format #, c-format
msgid "failed to put '%s' into trustdb: %s\n" msgid "failed to put `%s' into trustdb: %s\n"
msgstr "falha ao colocar '%s' no banco de dados de confiança: %s\n" msgstr "falha ao colocar `%s' no banco de dados de confiança: %s\n"
#: g10/trustdb.c:1404 #: g10/trustdb.c:1404
#, c-format #, c-format
@ -2895,23 +2895,23 @@ msgstr "Por favor conserte este poss
#: g10/skclist.c:94 #: g10/skclist.c:94
#, c-format #, c-format
msgid "skipped '%s': %s\n" msgid "skipped `%s': %s\n"
msgstr "ignorado '%s': %s\n" msgstr "ignorado `%s': %s\n"
#: g10/skclist.c:100 #: g10/skclist.c:100
#, c-format #, c-format
msgid "" msgid ""
"skipped '%s': this is a PGP generated ElGamal key which is not secure for " "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
"signatures!\n" "signatures!\n"
msgstr "" msgstr ""
"ignorado '%s': esta é uma chave ElGamal gerada pelo PGP que não é segura " "ignorado `%s': esta é uma chave ElGamal gerada pelo PGP que não é segura "
"para assinaturas!\n" "para assinaturas!\n"
#. do not overwrite #. do not overwrite
#: g10/openfile.c:58 #: g10/openfile.c:58
#, c-format #, c-format
msgid "File '%s' exists. " msgid "File `%s' exists. "
msgstr "Arquivo '%s' existe. " msgstr "Arquivo `%s' existe. "
#: g10/openfile.c:60 #: g10/openfile.c:60
msgid "Overwrite (y/N)? " msgid "Overwrite (y/N)? "
@ -2923,8 +2923,8 @@ msgstr "escrevendo para \"stdout\"\n"
#: g10/openfile.c:134 #: g10/openfile.c:134
#, c-format #, c-format
msgid "assuming signed data in '%s'\n" msgid "assuming signed data in `%s'\n"
msgstr "assumindo dados assinados em '%s'\n" msgstr "assumindo dados assinados em `%s'\n"
#: g10/openfile.c:181 #: g10/openfile.c:181
#, c-format #, c-format
@ -3078,5 +3078,5 @@ msgstr "Nenhuma ajuda dispon
#: g10/helptext.c:216 #: g10/helptext.c:216
#, c-format #, c-format
msgid "No help available for '%s'" msgid "No help available for `%s'"
msgstr "Nenhuma ajuda disponível para '%s'" msgstr "Nenhuma ajuda disponível para `%s'"

104
po/ru.po
View File

@ -9,7 +9,7 @@
# QingLong <qinglong@Bolizm> (couldn't send an email to let you know) # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
msgid "" msgid ""
msgstr "" msgstr ""
"POT-Creation-Date: 1998-12-23 15:55+0100\n" "POT-Creation-Date: 1998-12-23 16:53+0100\n"
"Content-Type: text/plain; charset=\n" "Content-Type: text/plain; charset=\n"
"Date: 1998-01-26 22:08:36+0100\n" "Date: 1998-01-26 22:08:36+0100\n"
"From: Gregory Steuck <steuck@iname.com>\n" "From: Gregory Steuck <steuck@iname.com>\n"
@ -603,18 +603,18 @@ msgstr "Widerspr
#: g10/g10.c:618 #: g10/g10.c:618
#, fuzzy, c-format #, fuzzy, c-format
msgid "NOTE: no default option file '%s'\n" msgid "NOTE: no default option file `%s'\n"
msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ '%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n" msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n"
#: g10/g10.c:622 #: g10/g10.c:622
#, c-format #, c-format
msgid "option file '%s': %s\n" msgid "option file `%s': %s\n"
msgstr "ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× '%s': %s\n" msgstr "ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× `%s': %s\n"
#: g10/g10.c:629 #: g10/g10.c:629
#, c-format #, c-format
msgid "reading options from '%s'\n" msgid "reading options from `%s'\n"
msgstr "ÞÉÔÁÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÉÚ '%s'\n" msgstr "ÞÉÔÁÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÉÚ `%s'\n"
#: g10/g10.c:782 #: g10/g10.c:782
#, fuzzy, c-format #, fuzzy, c-format
@ -704,7 +704,7 @@ msgstr "--delete-key
#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 #: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301
#, c-format #, c-format
msgid "can't open %s: %s\n" msgid "can't open %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ '%s': %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
#: g10/g10.c:1070 #: g10/g10.c:1070
msgid "-k[v][v][v][c] [userid] [keyring]" msgid "-k[v][v][v][c] [userid] [keyring]"
@ -722,8 +722,8 @@ msgstr "
#: g10/g10.c:1201 #: g10/g10.c:1201
#, c-format #, c-format
msgid "invalid hash algorithm '%s'\n" msgid "invalid hash algorithm `%s'\n"
msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÈÜÛ-ÁÌÇÏÒÉÔÍ '%s'\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÈÜÛ-ÁÌÇÏÒÉÔÍ `%s'\n"
#: g10/g10.c:1280 #: g10/g10.c:1280
msgid "[filename]" msgid "[filename]"
@ -735,8 +735,8 @@ msgstr ""
#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 #: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66
#, c-format #, c-format
msgid "can't open '%s'\n" msgid "can't open `%s'\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ '%s'\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s'\n"
#: g10/armor.c:344 g10/armor.c:391 #: g10/armor.c:344 g10/armor.c:391
msgid "armor header: " msgid "armor header: "
@ -751,50 +751,50 @@ msgstr "
msgid "invalid armor header: " msgid "invalid armor header: "
msgstr "" msgstr ""
#: g10/armor.c:460 #: g10/armor.c:461
#, fuzzy, c-format #, fuzzy, c-format
msgid "armor: %s\n" msgid "armor: %s\n"
msgstr "ëÏÄÉÒÏ×ËÁ: %s\n" msgstr "ëÏÄÉÒÏ×ËÁ: %s\n"
#: g10/armor.c:533 #: g10/armor.c:534
msgid "invalid dash escaped line: " msgid "invalid dash escaped line: "
msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÔÒÏËÁ ÎÁÞÉÎÁÀÝÁÑÓÑ Ó ÍÉÎÕÓÏ×: " msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÔÒÏËÁ ÎÁÞÉÎÁÀÝÁÑÓÑ Ó ÍÉÎÕÓÏ×: "
#: g10/armor.c:602 #: g10/armor.c:603
msgid "invalid clear text header: " msgid "invalid clear text header: "
msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÔÅËÓÔÏ×ÙÊ ÚÁÇÏÌÏ×ÏË: " msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÔÅËÓÔÏ×ÙÊ ÚÁÇÏÌÏ×ÏË: "
#: g10/armor.c:845 #: g10/armor.c:846
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n" msgid "invalid radix64 character %02x skipped\n"
msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÌÑ ËÏÄÉÒÏ×ËÉ radix64 ÓÉÍ×ÏÌ %02x ÐÒÏÐÕÝÅÎ\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÌÑ ËÏÄÉÒÏ×ËÉ radix64 ÓÉÍ×ÏÌ %02x ÐÒÏÐÕÝÅÎ\n"
#: g10/armor.c:878 #: g10/armor.c:879
msgid "premature eof (no CRC)\n" msgid "premature eof (no CRC)\n"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ (ÎÅÔ CRC)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ (ÎÅÔ CRC)\n"
#: g10/armor.c:897 #: g10/armor.c:898
msgid "premature eof (in CRC)\n" msgid "premature eof (in CRC)\n"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ (× CRC)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ (× CRC)\n"
#: g10/armor.c:901 #: g10/armor.c:902
msgid "malformed CRC\n" msgid "malformed CRC\n"
msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÆÏÒÍÁ CRC\n" msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÆÏÒÍÁ CRC\n"
#: g10/armor.c:905 #: g10/armor.c:906
#, c-format #, c-format
msgid "CRC error; %06lx - %06lx\n" msgid "CRC error; %06lx - %06lx\n"
msgstr "ÏÛÉÂËÁ CRC; %06lx - %06lx\n" msgstr "ÏÛÉÂËÁ CRC; %06lx - %06lx\n"
#: g10/armor.c:924 #: g10/armor.c:925
msgid "premature eof (in Trailer)\n" msgid "premature eof (in Trailer)\n"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× È×ÏÓÔÅ)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× È×ÏÓÔÅ)\n"
#: g10/armor.c:928 #: g10/armor.c:929
msgid "error in trailer line\n" msgid "error in trailer line\n"
msgstr "ÏÛÉÂËÁ × ÚÁ×ÅÒÛÁÀÝÅÊ ÓÔÒÏËÅ\n" msgstr "ÏÛÉÂËÁ × ÚÁ×ÅÒÛÁÀÝÅÊ ÓÔÒÏËÅ\n"
#: g10/armor.c:1182 #: g10/armor.c:1183
#, fuzzy #, fuzzy
msgid "no valid OpenPGP data found.\n" msgid "no valid OpenPGP data found.\n"
msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n" msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n"
@ -1277,13 +1277,13 @@ msgstr "
#: g10/keygen.c:851 #: g10/keygen.c:851
#, c-format #, c-format
msgid "writing public certificate to '%s'\n" msgid "writing public certificate to `%s'\n"
msgstr "ÏÔËÒÙÔÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × '%s'\n" msgstr "ÏÔËÒÙÔÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
#: g10/keygen.c:852 #: g10/keygen.c:852
#, c-format #, c-format
msgid "writing secret certificate to '%s'\n" msgid "writing secret certificate to `%s'\n"
msgstr "ÓÅËÒÅÔÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × '%s'\n" msgstr "ÓÅËÒÅÔÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
#: g10/keygen.c:929 #: g10/keygen.c:929
msgid "public and secret key created and signed.\n" msgid "public and secret key created and signed.\n"
@ -1327,8 +1327,8 @@ msgstr "%s:
#: g10/encode.c:222 #: g10/encode.c:222
#, c-format #, c-format
msgid "reading from '%s'\n" msgid "reading from `%s'\n"
msgstr "þÉÔÁÅÔÓÑ ÉÚ '%s'\n" msgstr "þÉÔÁÅÔÓÑ ÉÚ `%s'\n"
#: g10/encode.c:397 #: g10/encode.c:397
#, fuzzy, c-format #, fuzzy, c-format
@ -1468,8 +1468,8 @@ msgstr "
#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 #: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592
#, c-format #, c-format
msgid "writing to '%s'\n" msgid "writing to `%s'\n"
msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × '%s'\n" msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
#: g10/import.c:366 g10/import.c:426 g10/import.c:642 #: g10/import.c:366 g10/import.c:426 g10/import.c:642
#, c-format #, c-format
@ -2111,7 +2111,7 @@ msgstr ""
#: g10/misc.c:88 #: g10/misc.c:88
#, fuzzy, c-format #, fuzzy, c-format
msgid "can't disable core dumps: %s\n" msgid "can't disable core dumps: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ '%s': %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
#: g10/misc.c:90 #: g10/misc.c:90
msgid "WARNING: Program may create a core file!\n" msgid "WARNING: Program may create a core file!\n"
@ -2182,8 +2182,8 @@ msgstr ""
#: g10/plaintext.c:300 #: g10/plaintext.c:300
#, c-format #, c-format
msgid "can't open signed data '%s'\n" msgid "can't open signed data `%s'\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ '%s' .\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n"
#: g10/pubkey-enc.c:78 #: g10/pubkey-enc.c:78
#, c-format #, c-format
@ -2255,7 +2255,7 @@ msgstr "
#: g10/sign.c:336 #: g10/sign.c:336
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: '%s' is an empty file\n" msgid "WARNING: `%s' is an empty file\n"
msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n" msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n"
#: g10/tdbio.c:116 g10/tdbio.c:1413 #: g10/tdbio.c:116 g10/tdbio.c:1413
@ -2434,7 +2434,7 @@ msgstr ""
#: g10/trustdb.c:463 #: g10/trustdb.c:463
#, fuzzy, c-format #, fuzzy, c-format
msgid "'%s' is not a valid long keyID\n" msgid "`%s' is not a valid long keyID\n"
msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n"
#: g10/trustdb.c:498 #: g10/trustdb.c:498
@ -2518,27 +2518,27 @@ msgstr "
#: g10/trustdb.c:1088 g10/trustdb.c:1106 #: g10/trustdb.c:1088 g10/trustdb.c:1106
#, c-format #, c-format
msgid "user '%s' read problem: %s\n" msgid "user `%s' read problem: %s\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1091 g10/trustdb.c:1109 #: g10/trustdb.c:1091 g10/trustdb.c:1109
#, c-format #, c-format
msgid "user '%s' list problem: %s\n" msgid "user `%s' list problem: %s\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1099 g10/trustdb.c:1346 #: g10/trustdb.c:1099 g10/trustdb.c:1346
#, fuzzy, c-format #, fuzzy, c-format
msgid "user '%s' not found: %s\n" msgid "user `%s' not found: %s\n"
msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n"
#: g10/trustdb.c:1101 g10/trustdb.c:1348 #: g10/trustdb.c:1101 g10/trustdb.c:1348
#, c-format #, c-format
msgid "problem finding '%s' in trustdb: %s\n" msgid "problem finding `%s' in trustdb: %s\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1104 #: g10/trustdb.c:1104
#, c-format #, c-format
msgid "user '%s' not in trustdb\n" msgid "user `%s' not in trustdb\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1139 #: g10/trustdb.c:1139
@ -2612,12 +2612,12 @@ msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
#: g10/trustdb.c:1351 #: g10/trustdb.c:1351
#, c-format #, c-format
msgid "user '%s' not in trustdb - inserting\n" msgid "user `%s' not in trustdb - inserting\n"
msgstr "" msgstr ""
#: g10/trustdb.c:1354 #: g10/trustdb.c:1354
#, fuzzy, c-format #, fuzzy, c-format
msgid "failed to put '%s' into trustdb: %s\n" msgid "failed to put `%s' into trustdb: %s\n"
msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n" msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n"
#: g10/trustdb.c:1404 #: g10/trustdb.c:1404
@ -2946,21 +2946,21 @@ msgstr ""
#: g10/skclist.c:94 #: g10/skclist.c:94
#, fuzzy, c-format #, fuzzy, c-format
msgid "skipped '%s': %s\n" msgid "skipped `%s': %s\n"
msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n" msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n"
#: g10/skclist.c:100 #: g10/skclist.c:100
#, fuzzy, c-format #, fuzzy, c-format
msgid "" msgid ""
"skipped '%s': this is a PGP generated ElGamal key which is not secure for " "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
"signatures!\n" "signatures!\n"
msgstr "ÜÔÏÔ ElGamal ËÌÀÞ, ÓÏÚÄÁÎÎÙÊ PGP, ÎÅ ÎÁÄÅÖÅÎ ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÅÊ!\n" msgstr "ÜÔÏÔ ElGamal ËÌÀÞ, ÓÏÚÄÁÎÎÙÊ PGP, ÎÅ ÎÁÄÅÖÅÎ ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÅÊ!\n"
#. do not overwrite #. do not overwrite
#: g10/openfile.c:58 #: g10/openfile.c:58
#, c-format #, c-format
msgid "File '%s' exists. " msgid "File `%s' exists. "
msgstr "æÁÊÌ '%s' ÓÕÝÅÓÔ×ÕÅÔ. " msgstr "æÁÊÌ `%s' ÓÕÝÅÓÔ×ÕÅÔ. "
#: g10/openfile.c:60 #: g10/openfile.c:60
msgid "Overwrite (y/N)? " msgid "Overwrite (y/N)? "
@ -2969,12 +2969,12 @@ msgstr "
#: g10/openfile.c:85 #: g10/openfile.c:85
#, fuzzy #, fuzzy
msgid "writing to stdout\n" msgid "writing to stdout\n"
msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × '%s'\n" msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
#: g10/openfile.c:134 #: g10/openfile.c:134
#, fuzzy, c-format #, fuzzy, c-format
msgid "assuming signed data in '%s'\n" msgid "assuming signed data in `%s'\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ '%s' .\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n"
#: g10/openfile.c:181 #: g10/openfile.c:181
#, c-format #, c-format
@ -3147,8 +3147,8 @@ msgstr "
#: g10/helptext.c:216 #: g10/helptext.c:216
#, c-format #, c-format
msgid "No help available for '%s'" msgid "No help available for `%s'"
msgstr "ðÏÍÏÝØ ÄÌÑ '%s' ÏÔÓÕÔÓÔ×ÕÅÔ." msgstr "ðÏÍÏÝØ ÄÌÑ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ."
#~ msgid "You will see a list of signators etc. here\n" #~ msgid "You will see a list of signators etc. here\n"
#~ msgstr "úÄÅÓØ ×Ù Õ×ÉÄÉÔÅ ÓÐÉÓÏË ÐÏÄÐÉÓÁ×ÛÉÈ É Ô.Ä.\n" #~ msgstr "úÄÅÓØ ×Ù Õ×ÉÄÉÔÅ ÓÐÉÓÏË ÐÏÄÐÉÓÁ×ÛÉÈ É Ô.Ä.\n"

8
util/ChangeLog
View File

@ -1,3 +1,11 @@
Tue Dec 29 14:41:47 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
* secmem.c: Moved unistd.h out of the #ifdef
* dotlock.c (make_dotlock): Sun has no SYS_NMLN
* iobuf.c (iobuf_unget_and_close_temp): Reset .start
Sat Dec 12 18:40:32 CET 1998 Werner Koch <wk@isil.d.shuttle.de> Sat Dec 12 18:40:32 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
* argparse.c (arg_pars): fixed opts[i] with negative index. * argparse.c (arg_pars): fixed opts[i] with negative index.

6
util/argparse.c
View File

@ -928,7 +928,7 @@ main(int argc, char **argv)
while( ArgParse( &pargs, opts) ) { while( ArgParse( &pargs, opts) ) {
switch( pargs.r_opt ) { switch( pargs.r_opt ) {
case -1 : printf( "arg='%s'\n", pargs.r.ret_str); break; case -1 : printf( "arg=`%s'\n", pargs.r.ret_str); break;
case 'v': opt.verbose++; break; case 'v': opt.verbose++; break;
case 'e': opt.echo++; break; case 'e': opt.echo++; break;
case 'd': opt.debug++; break; case 'd': opt.debug++; break;
@ -947,9 +947,9 @@ main(int argc, char **argv)
if( opt.debug ) if( opt.debug )
printf(" debug=%d\n", opt.debug ); printf(" debug=%d\n", opt.debug );
if( opt.outfile ) if( opt.outfile )
printf(" outfile='%s'\n", opt.outfile ); printf(" outfile=`%s'\n", opt.outfile );
if( opt.crf ) if( opt.crf )
printf(" crffile='%s'\n", opt.crf ); printf(" crffile=`%s'\n", opt.crf );
if( opt.myopt ) if( opt.myopt )
printf(" myopt=%d\n", opt.myopt ); printf(" myopt=%d\n", opt.myopt );
if( opt.a_long_one ) if( opt.a_long_one )

19
util/dotlock.c
View File

@ -66,7 +66,10 @@ make_dotlock( const char *file_to_lock, long timeout )
/* fixme: add the hostname to the second line (FQDN or IP addr?) */ /* fixme: add the hostname to the second line (FQDN or IP addr?) */
/* create a temporary file */ /* create a temporary file */
#if SYS_NMLN < 8 #if defined(SYS_NMLN) && SYS_NMLN < 8
#error Aiiih
#elif !defined(SYS_NMLN) && MAXHOSTNAMELEN < 8
/* (SunOS uses a structure of size MAXHOSTNAMELEN) */
#error Aiiih #error Aiiih
#endif #endif
if( uname( &uts ) ) if( uname( &uts ) )
@ -96,17 +99,17 @@ make_dotlock( const char *file_to_lock, long timeout )
S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR ); S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR );
} while( fd == -1 && errno == EINTR ); } while( fd == -1 && errno == EINTR );
if( fd == -1 ) { if( fd == -1 ) {
log_error( "failed to create temporary file '%s': %s\n", log_error( "failed to create temporary file `%s': %s\n",
tname, strerror(errno)); tname, strerror(errno));
goto leave; goto leave;
} }
have_tfile = 1; have_tfile = 1;
if( write(fd, pidstr, 11 ) != 11 ) { if( write(fd, pidstr, 11 ) != 11 ) {
log_fatal( "error writing to '%s': %s\n", tname, strerror(errno) ); log_fatal( "error writing to `%s': %s\n", tname, strerror(errno) );
goto leave; goto leave;
} }
if( close(fd) ) { if( close(fd) ) {
log_error( "error closing '%s': %s\n", tname, strerror(errno)); log_error( "error closing `%s': %s\n", tname, strerror(errno));
goto leave; goto leave;
} }
fd = -1; fd = -1;
@ -197,7 +200,7 @@ release_dotlock( const char *lockfile )
return -1; return -1;
} }
if( remove( lockfile ) ) { if( remove( lockfile ) ) {
log_error( "release_dotlock: error removing lockfile '%s'", log_error( "release_dotlock: error removing lockfile `%s'",
lockfile); lockfile);
return -1; return -1;
} }
@ -217,12 +220,12 @@ read_lockfile( const char *name )
if( (fd = open(name, O_RDONLY)) == -1 ) { if( (fd = open(name, O_RDONLY)) == -1 ) {
int e = errno; int e = errno;
log_debug("error opening lockfile '%s': %s\n", name, strerror(errno) ); log_debug("error opening lockfile `%s': %s\n", name, strerror(errno) );
errno = e; errno = e;
return -1; return -1;
} }
if( read(fd, pidstr, 10 ) != 10 ) { if( read(fd, pidstr, 10 ) != 10 ) {
log_debug("error reading lockfile '%s'", name ); log_debug("error reading lockfile `%s'", name );
close(fd); close(fd);
errno = 0; errno = 0;
return -1; return -1;
@ -230,7 +233,7 @@ read_lockfile( const char *name )
close(fd); close(fd);
pid = atoi(pidstr); pid = atoi(pidstr);
if( !pid || pid == -1 ) { if( !pid || pid == -1 ) {
log_error("invalid pid %d in lockfile '%s'", pid, name ); log_error("invalid pid %d in lockfile `%s'", pid, name );
errno = 0; errno = 0;
return -1; return -1;
} }

86
util/errors.c
View File

@ -51,49 +51,49 @@ g10_errstr( int err )
switch( err ) { switch( err ) {
case -1: p = "eof"; break; case -1: p = "eof"; break;
case 0: p = "okay"; break; case 0: p = "okay"; break;
X(GENERAL, N_("General error")) X(GENERAL, N_("general error"))
X(UNKNOWN_PACKET, N_("Unknown packet type")) X(UNKNOWN_PACKET, N_("unknown packet type"))
X(UNKNOWN_VERSION,N_("Unknown version")) X(UNKNOWN_VERSION,N_("unknown version"))
X(PUBKEY_ALGO ,N_("Unknown pubkey algorithm")) X(PUBKEY_ALGO ,N_("unknown pubkey algorithm"))
X(DIGEST_ALGO ,N_("Unknown digest algorithm")) X(DIGEST_ALGO ,N_("unknown digest algorithm"))
X(BAD_PUBKEY ,N_("Bad public key")) X(BAD_PUBKEY ,N_("bad public key"))
X(BAD_SECKEY ,N_("Bad secret key")) X(BAD_SECKEY ,N_("bad secret key"))
X(BAD_SIGN ,N_("Bad signature")) X(BAD_SIGN ,N_("bad signature"))
X(CHECKSUM , N_("Checksum error")) X(CHECKSUM , N_("checksum error"))
X(BAD_PASS , N_("Bad passphrase")) X(BAD_PASS , N_("bad passphrase"))
X(NO_PUBKEY ,N_("Public key not found")) X(NO_PUBKEY ,N_("public key not found"))
X(CIPHER_ALGO ,N_("Unknown cipher algorithm")) X(CIPHER_ALGO ,N_("unknown cipher algorithm"))
X(KEYRING_OPEN ,N_("Can't open the keyring")) X(KEYRING_OPEN ,N_("can't open the keyring"))
X(INVALID_PACKET ,N_("Invalid packet")) X(INVALID_PACKET ,N_("invalid packet"))
X(INVALID_ARMOR ,N_("Invalid armor")) X(INVALID_ARMOR ,N_("invalid armor"))
X(NO_USER_ID ,N_("No such user id")) X(NO_USER_ID ,N_("no such user id"))
X(NO_SECKEY ,N_("Secret key not available")) X(NO_SECKEY ,N_("secret key not available"))
X(WRONG_SECKEY ,N_("Wrong secret key used")) X(WRONG_SECKEY ,N_("wrong secret key used"))
X(UNSUPPORTED ,N_("Not supported")) X(UNSUPPORTED ,N_("not supported"))
X(BAD_KEY ,N_("Bad key")) X(BAD_KEY ,N_("bad key"))
X(READ_FILE ,N_("File read error")) X(READ_FILE ,N_("file read error"))
X(WRITE_FILE ,N_("File write error")) X(WRITE_FILE ,N_("file write error"))
X(COMPR_ALGO ,N_("Unknown compress algorithm")) X(COMPR_ALGO ,N_("unknown compress algorithm"))
X(OPEN_FILE ,N_("File open error")) X(OPEN_FILE ,N_("file open error"))
X(CREATE_FILE ,N_("File create error")) X(CREATE_FILE ,N_("file create error"))
X(PASSPHRASE ,N_("Invalid passphrase")) X(PASSPHRASE ,N_("invalid passphrase"))
X(NI_PUBKEY ,N_("Unimplemented pubkey algorithm")) X(NI_PUBKEY ,N_("unimplemented pubkey algorithm"))
X(NI_CIPHER ,N_("Unimplemented cipher algorithm")) X(NI_CIPHER ,N_("unimplemented cipher algorithm"))
X(SIG_CLASS ,N_("Unknown signature class")) X(SIG_CLASS ,N_("unknown signature class"))
X(TRUSTDB ,N_("Trust database error")) X(TRUSTDB ,N_("trust database error"))
X(BAD_MPI ,N_("Bad MPI")) X(BAD_MPI ,N_("bad MPI"))
X(RESOURCE_LIMIT ,N_("Resource limit")) X(RESOURCE_LIMIT ,N_("resource limit"))
X(INV_KEYRING ,N_("Invalid keyring")) X(INV_KEYRING ,N_("invalid keyring"))
X(BAD_CERT ,N_("Bad certificate")) X(BAD_CERT ,N_("bad certificate"))
X(INV_USER_ID ,N_("Malformed user id")) X(INV_USER_ID ,N_("malformed user id"))
X(CLOSE_FILE ,N_("File close error")) X(CLOSE_FILE ,N_("file close error"))
X(RENAME_FILE ,N_("File rename error")) X(RENAME_FILE ,N_("file rename error"))
X(DELETE_FILE ,N_("File delete error")) X(DELETE_FILE ,N_("file delete error"))
X(UNEXPECTED ,N_("Unexpected data")) X(UNEXPECTED ,N_("unexpected data"))
X(TIME_CONFLICT ,N_("Timestamp conflict")) X(TIME_CONFLICT ,N_("timestamp conflict"))
X(WR_PUBKEY_ALGO ,N_("Unusable pubkey algorithm")) X(WR_PUBKEY_ALGO ,N_("unusable pubkey algorithm"))
X(FILE_EXISTS ,N_("File exists")) X(FILE_EXISTS ,N_("file exists"))
X(WEAK_KEY ,N_("Weak key")) X(WEAK_KEY ,N_("weak key"))
default: p = buf; sprintf(buf, "g10err=%d", err); break; default: p = buf; sprintf(buf, "g10err=%d", err); break;
} }
#undef X #undef X

21
util/iobuf.c
View File

@ -444,7 +444,7 @@ iobuf_close( IOBUF a )
log_error("iobuf_flush failed on close: %s\n", g10_errstr(rc)); log_error("iobuf_flush failed on close: %s\n", g10_errstr(rc));
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("iobuf-%d.%d: close '%s'\n", a->no, a->subno, a->desc ); log_debug("iobuf-%d.%d: close `%s'\n", a->no, a->subno, a->desc );
if( a->filter && (rc = a->filter(a->filter_ov, IOBUFCTRL_FREE, if( a->filter && (rc = a->filter(a->filter_ov, IOBUFCTRL_FREE,
a->chain, NULL, &dummy_len)) ) a->chain, NULL, &dummy_len)) )
log_error("IOBUFCTRL_FREE failed on close: %s\n", g10_errstr(rc) ); log_error("IOBUFCTRL_FREE failed on close: %s\n", g10_errstr(rc) );
@ -526,7 +526,7 @@ iobuf_open( const char *fname )
file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len ); file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len );
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("iobuf-%d.%d: open '%s'\n", a->no, a->subno, fname ); log_debug("iobuf-%d.%d: open `%s'\n", a->no, a->subno, fname );
return a; return a;
} }
@ -560,7 +560,7 @@ iobuf_create( const char *fname )
file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len ); file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len );
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("iobuf-%d.%d: create '%s'\n", a->no, a->subno, a->desc ); log_debug("iobuf-%d.%d: create `%s'\n", a->no, a->subno, a->desc );
return a; return a;
} }
@ -590,7 +590,7 @@ iobuf_append( const char *fname )
file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len ); file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len );
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("iobuf-%d.%d: append '%s'\n", a->no, a->subno, a->desc ); log_debug("iobuf-%d.%d: append `%s'\n", a->no, a->subno, a->desc );
return a; return a;
} }
@ -616,7 +616,7 @@ iobuf_openrw( const char *fname )
file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len ); file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len );
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("iobuf-%d.%d: openrw '%s'\n", a->no, a->subno, a->desc ); log_debug("iobuf-%d.%d: openrw `%s'\n", a->no, a->subno, a->desc );
return a; return a;
} }
@ -708,9 +708,9 @@ iobuf_push_filter( IOBUF a,
f( ov, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &dummy_len ); f( ov, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &dummy_len );
if( DBG_IOBUF ) { if( DBG_IOBUF ) {
log_debug("iobuf-%d.%d: push '%s'\n", a->no, a->subno, a->desc ); log_debug("iobuf-%d.%d: push `%s'\n", a->no, a->subno, a->desc );
for(b=a; b; b = b->chain ) for(b=a; b; b = b->chain )
log_debug("\tchain: %d.%d '%s'\n", b->no, b->subno, b->desc ); log_debug("\tchain: %d.%d `%s'\n", b->no, b->subno, b->desc );
} }
/* now we can initialize the new function if we have one */ /* now we can initialize the new function if we have one */
@ -735,7 +735,7 @@ iobuf_pop_filter( IOBUF a, int (*f)(void *opaque, int control,
BUG(); BUG();
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("iobuf-%d.%d: pop '%s'\n", a->no, a->subno, a->desc ); log_debug("iobuf-%d.%d: pop `%s'\n", a->no, a->subno, a->desc );
if( !a->filter ) { /* this is simple */ if( !a->filter ) { /* this is simple */
b = a->chain; b = a->chain;
assert(b); assert(b);
@ -872,9 +872,9 @@ iobuf_clear_eof(IOBUF a)
assert(a->usage == 1); assert(a->usage == 1);
if( a->filter ) if( a->filter )
log_info("iobuf-%d.%d: clear_eof '%s' with enabled filter\n", a->no, a->subno, a->desc ); log_info("iobuf-%d.%d: clear_eof `%s' with enabled filter\n", a->no, a->subno, a->desc );
if( !a->filter_eof ) if( !a->filter_eof )
log_info("iobuf-%d.%d: clear_eof '%s' with no EOF pending\n", a->no, a->subno, a->desc ); log_info("iobuf-%d.%d: clear_eof `%s' with no EOF pending\n", a->no, a->subno, a->desc );
iobuf_pop_filter(a, NULL, NULL); iobuf_pop_filter(a, NULL, NULL);
} }
@ -1104,6 +1104,7 @@ iobuf_unget_and_close_temp( IOBUF a, IOBUF temp )
a->unget.buf = m_alloc( a->unget.size ); a->unget.buf = m_alloc( a->unget.size );
a->nofast |= 2; a->nofast |= 2;
a->unget.len = temp->d.len; a->unget.len = temp->d.len;
a->unget.start = 0;
memcpy( a->unget.buf, temp->d.buf, a->unget.len ); memcpy( a->unget.buf, temp->d.buf, a->unget.len );
iobuf_close(temp); iobuf_close(temp);
} }

2
util/secmem.c
View File

@ -24,8 +24,8 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include <unistd.h>
#if defined(HAVE_MLOCK) || defined(HAVE_MMAP) #if defined(HAVE_MLOCK) || defined(HAVE_MMAP)
#include <unistd.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>