security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup.

Browse Source 
Change some "this" to `this'.
This commit is contained in:
David Shaw 2004-08-27 17:32:31 +00:00
parent 6c5507fff0
commit ea279f1bae
5 changed files with 68 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2004-08-27 David Shaw <dshaw@jabberwocky.com>
* encode.c, exec.c, g10.c, sign.c: Some translatable string
cleanup. Change some "this" to `this'.
2004-08-23 David Shaw <dshaw@jabberwocky.com> 2004-08-23 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (keyserver_spawn): Show log line for what keyserver * keyserver.c (keyserver_spawn): Show log line for what keyserver

8
g10/encode.c
View File

@ -523,8 +523,8 @@ encode_crypt( const char *filename, STRLIST remusr, int use_symkey )
if(!opt.expert && if(!opt.expert &&
select_algo_from_prefs(pk_list,PREFTYPE_SYM, select_algo_from_prefs(pk_list,PREFTYPE_SYM,
opt.def_cipher_algo,NULL)!=opt.def_cipher_algo) opt.def_cipher_algo,NULL)!=opt.def_cipher_algo)
log_info(_("forcing symmetric cipher %s (%d) " log_info(_("WARNING: forcing symmetric cipher %s (%d)"
"violates recipient preferences\n"), " violates recipient preferences\n"),
cipher_algo_to_string(opt.def_cipher_algo), cipher_algo_to_string(opt.def_cipher_algo),
opt.def_cipher_algo); opt.def_cipher_algo);
@ -631,8 +631,8 @@ encode_crypt( const char *filename, STRLIST remusr, int use_symkey )
else if(!opt.expert && else if(!opt.expert &&
select_algo_from_prefs(pk_list,PREFTYPE_ZIP, select_algo_from_prefs(pk_list,PREFTYPE_ZIP,
compr_algo,NULL)!=compr_algo) compr_algo,NULL)!=compr_algo)
log_info(_("forcing compression algorithm %s (%d) " log_info(_("WARNING: forcing compression algorithm %s (%d)"
"violates recipient preferences\n"), " violates recipient preferences\n"),
compress_algo_to_string(compr_algo),compr_algo); compress_algo_to_string(compr_algo),compr_algo);
/* algo 0 means no compression */ /* algo 0 means no compression */

16
g10/exec.c
View File

@ -352,8 +352,8 @@ int exec_write(struct exec_info **info,const char *program,
#ifdef EXEC_TEMPFILE_ONLY #ifdef EXEC_TEMPFILE_ONLY
if(!(*info)->use_temp_files) if(!(*info)->use_temp_files)
{ {
log_error(_("this platform requires temp files when calling external " log_error(_("this platform requires temporary files when calling"
"programs\n")); " external programs\n"));
goto fail; goto fail;
} }
@ -429,10 +429,12 @@ int exec_write(struct exec_info **info,const char *program,
/* If we get this far the exec failed. Clean up and return. */ /* If we get this far the exec failed. Clean up and return. */
log_error(_("unable to execute %s \"%s\": %s\n"), if(args_in==NULL)
args_in==NULL?"program":"shell", log_error(_("unable to execute program `%s': %s\n"),
args_in==NULL?program:shell, program,strerror(errno));
strerror(errno)); else
log_error(_("unable to execute shell `%s': %s\n"),
shell,strerror(errno));
/* This mimics the POSIX sh behavior - 127 means "not found" /* This mimics the POSIX sh behavior - 127 means "not found"
from the shell. */ from the shell. */
@ -478,7 +480,7 @@ int exec_write(struct exec_info **info,const char *program,
(*info)->tochild=fopen((*info)->tempfile_in,binary?"wb":"w"); (*info)->tochild=fopen((*info)->tempfile_in,binary?"wb":"w");
if((*info)->tochild==NULL) if((*info)->tochild==NULL)
{ {
log_error(_("can't create `%s': %s\n"), log_error(_("can't create file `%s': %s\n"),
(*info)->tempfile_in,strerror(errno)); (*info)->tempfile_in,strerror(errno));
ret=G10ERR_WRITE_FILE; ret=G10ERR_WRITE_FILE;
goto fail; goto fail;

77
g10/g10.c
View File

@ -1165,50 +1165,50 @@ check_permissions(const char *path,int item)
if(own) if(own)
{ {
if(item==0) if(item==0)
log_info(_("WARNING: unsafe ownership on " log_info(_("WARNING: unsafe ownership on"
"homedir \"%s\"\n"),tmppath); " homedir `%s'\n"),tmppath);
else if(item==1) else if(item==1)
log_info(_("WARNING: unsafe ownership on " log_info(_("WARNING: unsafe ownership on"
"configuration file \"%s\"\n"),tmppath); " configuration file `%s'\n"),tmppath);
else else
log_info(_("WARNING: unsafe ownership on " log_info(_("WARNING: unsafe ownership on"
"extension \"%s\"\n"),tmppath); " extension `%s'\n"),tmppath);
} }
if(perm) if(perm)
{ {
if(item==0) if(item==0)
log_info(_("WARNING: unsafe permissions on " log_info(_("WARNING: unsafe permissions on"
"homedir \"%s\"\n"),tmppath); " homedir `%s'\n"),tmppath);
else if(item==1) else if(item==1)
log_info(_("WARNING: unsafe permissions on " log_info(_("WARNING: unsafe permissions on"
"configuration file \"%s\"\n"),tmppath); " configuration file `%s'\n"),tmppath);
else else
log_info(_("WARNING: unsafe permissions on " log_info(_("WARNING: unsafe permissions on"
"extension \"%s\"\n"),tmppath); " extension `%s'\n"),tmppath);
} }
if(enc_dir_own) if(enc_dir_own)
{ {
if(item==0) if(item==0)
log_info(_("WARNING: unsafe enclosing directory ownership on " log_info(_("WARNING: unsafe enclosing directory ownership on"
"homedir \"%s\"\n"),tmppath); " homedir `%s'\n"),tmppath);
else if(item==1) else if(item==1)
log_info(_("WARNING: unsafe enclosing directory ownership on " log_info(_("WARNING: unsafe enclosing directory ownership on"
"configuration file \"%s\"\n"),tmppath); " configuration file `%s'\n"),tmppath);
else else
log_info(_("WARNING: unsafe enclosing directory ownership on " log_info(_("WARNING: unsafe enclosing directory ownership on"
"extension \"%s\"\n"),tmppath); " extension `%s'\n"),tmppath);
} }
if(enc_dir_perm) if(enc_dir_perm)
{ {
if(item==0) if(item==0)
log_info(_("WARNING: unsafe enclosing directory permissions on " log_info(_("WARNING: unsafe enclosing directory permissions on"
"homedir \"%s\"\n"),tmppath); " homedir `%s'\n"),tmppath);
else if(item==1) else if(item==1)
log_info(_("WARNING: unsafe enclosing directory permissions on " log_info(_("WARNING: unsafe enclosing directory permissions on"
"configuration file \"%s\"\n"),tmppath); " configuration file `%s'\n"),tmppath);
else else
log_info(_("WARNING: unsafe enclosing directory permissions on " log_info(_("WARNING: unsafe enclosing directory permissions on"
"extension \"%s\"\n"),tmppath); " extension `%s'\n"),tmppath);
} }
} }
@ -1333,7 +1333,7 @@ list_config(char *items)
break; break;
if(!any) if(!any)
log_error(_("unknown configuration item \"%s\"\n"),name); log_error(_("unknown configuration item `%s'\n"),name);
} }
} }
@ -1886,8 +1886,8 @@ main( int argc, char **argv )
#ifndef __riscos__ #ifndef __riscos__
#if defined(USE_DYNAMIC_LINKING) || defined(_WIN32) #if defined(USE_DYNAMIC_LINKING) || defined(_WIN32)
if(check_permissions(pargs.r.ret_str,2)) if(check_permissions(pargs.r.ret_str,2))
log_info(_("cipher extension \"%s\" not loaded due to " log_info(_("cipher extension `%s' not loaded due to"
"unsafe permissions\n"),pargs.r.ret_str); " unsafe permissions\n"),pargs.r.ret_str);
else else
register_cipher_extension(orig_argc? *orig_argv:NULL, register_cipher_extension(orig_argc? *orig_argv:NULL,
pargs.r.ret_str); pargs.r.ret_str);
@ -2098,7 +2098,7 @@ main( int argc, char **argv )
case oNoMDCWarn: opt.no_mdc_warn=1; break; case oNoMDCWarn: opt.no_mdc_warn=1; break;
case oDisplayCharset: case oDisplayCharset:
if( set_native_charset( pargs.r.ret_str ) ) if( set_native_charset( pargs.r.ret_str ) )
log_error(_("%s is not a valid character set\n"), log_error(_("`%s' is not a valid character set\n"),
pargs.r.ret_str); pargs.r.ret_str);
break; break;
case oNotDashEscaped: opt.not_dash_escaped = 1; break; case oNotDashEscaped: opt.not_dash_escaped = 1; break;
@ -2679,18 +2679,18 @@ main( int argc, char **argv )
switch(badtype) switch(badtype)
{ {
case PREFTYPE_SYM: case PREFTYPE_SYM:
log_info(_("you may not use cipher algorithm \"%s\" " log_info(_("you may not use cipher algorithm `%s'"
"while in %s mode\n"), " while in %s mode\n"),
badalg,compliance_option_string()); badalg,compliance_option_string());
break; break;
case PREFTYPE_HASH: case PREFTYPE_HASH:
log_info(_("you may not use digest algorithm \"%s\" " log_info(_("you may not use digest algorithm `%s'"
"while in %s mode\n"), " while in %s mode\n"),
badalg,compliance_option_string()); badalg,compliance_option_string());
break; break;
case PREFTYPE_ZIP: case PREFTYPE_ZIP:
log_info(_("you may not use compression algorithm \"%s\" " log_info(_("you may not use compression algorithm `%s'"
"while in %s mode\n"), " while in %s mode\n"),
badalg,compliance_option_string()); badalg,compliance_option_string());
break; break;
default: default:
@ -3041,7 +3041,7 @@ main( int argc, char **argv )
} }
else if( argc == 2 ) { /* -kv userid keyring */ else if( argc == 2 ) { /* -kv userid keyring */
if( access( argv[1], R_OK ) ) { if( access( argv[1], R_OK ) ) {
log_error(_("can't open %s: %s\n"), log_error(_("can't open `%s': %s\n"),
print_fname_stdin(argv[1]), strerror(errno)); print_fname_stdin(argv[1]), strerror(errno));
} }
else { else {
@ -3677,8 +3677,8 @@ add_notation_data( const char *string, int which )
if ((*s & 0x80)) if ((*s & 0x80))
highbit = 1; highbit = 1;
else if (iscntrl(*s)) { else if (iscntrl(*s)) {
log_error(_("a notation value must not use " log_error(_("a notation value must not use"
"any control characters\n") ); " any control characters\n") );
return; return;
} }
} }
@ -3746,8 +3746,7 @@ add_keyserver_url( const char *string, int which )
if(which) if(which)
BUG(); BUG();
else else
log_error(_("the given signature preferred" log_error(_("the given preferred keyserver URL is invalid\n"));
" keyserver URL is invalid\n"));
} }
if(which) if(which)

20
g10/sign.c
View File

@ -762,12 +762,13 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
if( outfile ) { if( outfile ) {
if( !(out = iobuf_create( outfile )) ) { if( !(out = iobuf_create( outfile )) ) {
log_error(_("can't create %s: %s\n"), outfile, strerror(errno) ); log_error(_("can't create file `%s': %s\n"),
outfile, strerror(errno) );
rc = G10ERR_CREATE_FILE; rc = G10ERR_CREATE_FILE;
goto leave; goto leave;
} }
else if( opt.verbose ) else if( opt.verbose )
log_info(_("writing to `%s'\n"), outfile ); log_info(_("writing to file `%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;
@ -791,8 +792,8 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
select_algo_from_prefs(pk_list,PREFTYPE_HASH, select_algo_from_prefs(pk_list,PREFTYPE_HASH,
opt.def_digest_algo, opt.def_digest_algo,
NULL)!=opt.def_digest_algo) NULL)!=opt.def_digest_algo)
log_info(_("forcing digest algorithm %s (%d) " log_info(_("WARNING: forcing digest algorithm %s (%d)"
"violates recipient preferences\n"), " violates recipient preferences\n"),
digest_algo_to_string(opt.def_digest_algo), digest_algo_to_string(opt.def_digest_algo),
opt.def_digest_algo); opt.def_digest_algo);
} }
@ -860,8 +861,8 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
else if(!opt.expert && pk_list else if(!opt.expert && pk_list
&& select_algo_from_prefs(pk_list,PREFTYPE_ZIP, && select_algo_from_prefs(pk_list,PREFTYPE_ZIP,
compr_algo,NULL)!=compr_algo) compr_algo,NULL)!=compr_algo)
log_info(_("forcing compression algorithm %s (%d) " log_info(_("WARNING: forcing compression algorithm %s (%d)"
"violates recipient preferences\n"), " violates recipient preferences\n"),
compress_algo_to_string(compr_algo),compr_algo); compress_algo_to_string(compr_algo),compr_algo);
/* algo 0 means no compression */ /* algo 0 means no compression */
@ -888,7 +889,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
for( sl = strlist_last(filenames); sl; for( sl = strlist_last(filenames); sl;
sl = strlist_prev( filenames, sl ) ) { sl = strlist_prev( filenames, sl ) ) {
if( !(inp = iobuf_open(sl->d)) ) { if( !(inp = iobuf_open(sl->d)) ) {
log_error(_("can't open %s: %s\n"), log_error(_("can't open file `%s': %s\n"),
sl->d, strerror(errno) ); sl->d, strerror(errno) );
rc = G10ERR_OPEN_FILE; rc = G10ERR_OPEN_FILE;
goto leave; goto leave;
@ -998,12 +999,13 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
if( outfile ) { if( outfile ) {
if( !(out = iobuf_create( outfile )) ) { if( !(out = iobuf_create( outfile )) ) {
log_error(_("can't create %s: %s\n"), outfile, strerror(errno) ); log_error(_("can't create file `%s': %s\n"),
outfile, strerror(errno) );
rc = G10ERR_CREATE_FILE; rc = G10ERR_CREATE_FILE;
goto leave; goto leave;
} }
else if( opt.verbose ) else if( opt.verbose )
log_info(_("writing to `%s'\n"), outfile ); log_info(_("writing to file `%s'\n"), outfile );
} }
else if( (rc = open_outfile( fname, 1, &out )) ) else if( (rc = open_outfile( fname, 1, &out )) )
goto leave; goto leave;