From d89c701acb2e6dfd0f6ada6742a6057ad4698dcb Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 28 Oct 2004 02:14:06 +0000 Subject: [PATCH] * keyring.c: Make some strings translatable. * exec.c, sign.c: Change "can't open file" to "can't open" and "can't create file" to "can't create" to be consistent with other strings so we don't have to translate both. --- g10/ChangeLog | 6 ++++++ g10/exec.c | 2 +- g10/keyring.c | 36 ++++++++++++++++++++---------------- g10/sign.c | 15 +++++++-------- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 7b1f6f652..930bf1c65 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,11 @@ 2004-10-27 David Shaw + * keyring.c: Make some strings translatable. + + * exec.c, sign.c: Change "can't open file" to "can't open" and + "can't create file" to "can't create" to be consistent with other + strings so we don't have to translate both. + * delkey.c, export.c, keyedit.c, pkclist.c, revoke.c, skclist.c: Fix a few missed possible \"username\" quotes. diff --git a/g10/exec.c b/g10/exec.c index 408f6d7bf..0ba85a564 100644 --- a/g10/exec.c +++ b/g10/exec.c @@ -486,7 +486,7 @@ int exec_write(struct exec_info **info,const char *program, (*info)->tochild=fopen((*info)->tempfile_in,binary?"wb":"w"); if((*info)->tochild==NULL) { - log_error(_("can't create file `%s': %s\n"), + log_error(_("can't create `%s': %s\n"), (*info)->tempfile_in,strerror(errno)); ret=G10ERR_WRITE_FILE; goto fail; diff --git a/g10/keyring.c b/g10/keyring.c index 0d33b59f8..2ac39a551 100644 --- a/g10/keyring.c +++ b/g10/keyring.c @@ -371,10 +371,11 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb) return -1; /* no successful search */ a = iobuf_open (hd->found.kr->fname); - if (!a) { - log_error ("can't open `%s'\n", hd->found.kr->fname); + if (!a) + { + log_error(_("can't open `%s'\n"), hd->found.kr->fname); return G10ERR_KEYRING_OPEN; - } + } if (iobuf_seek (a, hd->found.offset) ) { log_error ("can't seek `%s'\n", hd->found.kr->fname); @@ -656,10 +657,11 @@ prepare_search (KEYRING_HANDLE hd) hd->current.eof = 0; hd->current.iobuf = iobuf_open (hd->current.kr->fname); - if (!hd->current.iobuf) { - log_error ("can't open `%s'\n", hd->current.kr->fname ); + if (!hd->current.iobuf) + { + log_error(_("can't open `%s'\n"), hd->current.kr->fname ); return (hd->current.error = G10ERR_OPEN_FILE); - } + } return 0; } @@ -1193,12 +1195,13 @@ create_tmp_file (const char *template, else *r_fp = iobuf_create (tmpfname); umask(oldmask); - if (!*r_fp) { - log_error ("can't create `%s': %s\n", tmpfname, strerror(errno) ); + if (!*r_fp) + { + log_error(_("can't create `%s': %s\n"), tmpfname, strerror(errno) ); m_free (tmpfname); m_free (bakfname); return G10ERR_OPEN_FILE; - } + } *r_bakfname = bakfname; *r_tmpfname = tmpfname; @@ -1492,11 +1495,11 @@ do_copy (int mode, const char *fname, KBNODE root, int secret, else newfp = iobuf_create (fname); umask(oldmask); - if( !newfp ) { - log_error (_("can't create `%s': %s\n"), - fname, strerror(errno)); + if( !newfp ) + { + log_error (_("can't create `%s': %s\n"), fname, strerror(errno)); return G10ERR_OPEN_FILE; - } + } if( !opt.quiet ) log_info(_("%s: keyring created\n"), fname ); @@ -1516,11 +1519,12 @@ do_copy (int mode, const char *fname, KBNODE root, int secret, return 0; /* ready */ } - if( !fp ) { - log_error ("can't open `%s': %s\n", fname, strerror(errno) ); + if( !fp ) + { + log_error(_("can't open `%s': %s\n"), fname, strerror(errno) ); rc = G10ERR_OPEN_FILE; goto leave; - } + } /* Create the new file. */ rc = create_tmp_file (fname, &bakfname, &tmpfname, &newfp); diff --git a/g10/sign.c b/g10/sign.c index 6a1e4da22..5a0b0ed67 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -775,8 +775,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr, else out = iobuf_create( outfile ); if( !out ) { - log_error(_("can't create file `%s': %s\n"), - outfile, strerror(errno) ); + log_error(_("can't create `%s': %s\n"), outfile, strerror(errno) ); rc = G10ERR_CREATE_FILE; goto leave; } @@ -908,12 +907,13 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr, inp = NULL; errno = EPERM; } - if( !inp ) { - log_error(_("can't open file `%s': %s\n"), - sl->d, strerror(errno) ); + if( !inp ) + { + log_error(_("can't open `%s': %s\n"), + sl->d, strerror(errno) ); rc = G10ERR_OPEN_FILE; goto leave; - } + } handle_progress (&pfx, inp, sl->d); if( opt.verbose ) fprintf(stderr, " `%s'", sl->d ); @@ -1032,8 +1032,7 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile ) else out = iobuf_create( outfile ); if( !out ) { - log_error(_("can't create file `%s': %s\n"), - outfile, strerror(errno) ); + log_error(_("can't create `%s': %s\n"), outfile, strerror(errno) ); rc = G10ERR_CREATE_FILE; goto leave; }