gnupg/g10 (ChangeLog exec.c keyring.c sign.c)

[cvs user dshaw]

    Date: Thursday, October 28, 2004 @ 04:14:06
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog exec.c keyring.c sign.c

* 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.


-----------+
 ChangeLog |    6 ++++++
 exec.c    |    2 +-
 keyring.c |   36 ++++++++++++++++++++----------------
 sign.c    |   15 +++++++--------
 4 files changed, 34 insertions(+), 25 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.629 gnupg/g10/ChangeLog:1.630
--- gnupg/g10/ChangeLog:1.629	Thu Oct 28 03:58:01 2004
+++ gnupg/g10/ChangeLog	Thu Oct 28 04:14:06 2004
@@ -1,5 +1,11 @@
 2004-10-27  David Shaw  <dshaw at jabberwocky.com>
 
+	* 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.
 
Index: gnupg/g10/exec.c
diff -u gnupg/g10/exec.c:1.17 gnupg/g10/exec.c:1.18
--- gnupg/g10/exec.c:1.17	Thu Oct 14 09:11:56 2004
+++ gnupg/g10/exec.c	Thu Oct 28 04:14:06 2004
@@ -486,7 +486,7 @@
     (*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;
Index: gnupg/g10/keyring.c
diff -u gnupg/g10/keyring.c:1.14 gnupg/g10/keyring.c:1.15
--- gnupg/g10/keyring.c:1.14	Thu Oct 14 09:11:56 2004
+++ gnupg/g10/keyring.c	Thu Oct 28 04:14:06 2004
@@ -371,10 +371,11 @@
         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 @@
 
     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 @@
     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 @@
         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 @@
 	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);
Index: gnupg/g10/sign.c
diff -u gnupg/g10/sign.c:1.132 gnupg/g10/sign.c:1.133
--- gnupg/g10/sign.c:1.132	Thu Oct 14 09:11:56 2004
+++ gnupg/g10/sign.c	Thu Oct 28 04:14:06 2004
@@ -775,8 +775,7 @@
         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 @@
                     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 @@
         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;
 	}