From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2013 22:41:34 +0000 (-0800)
Subject: Merge branch 'sb/gpg-i18n'
X-Git-Tag: v1.8.2-rc0~45
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9a1ab9e72fe8acd03b92bb481d7cd95207fda8f5?ds=inline;hp=-c

Merge branch 'sb/gpg-i18n'

* sb/gpg-i18n:
gpg: allow translation of more error messages
---

9a1ab9e72fe8acd03b92bb481d7cd95207fda8f5
diff --combined gpg-interface.c
index 5f142f6198,e8eba1ad99..45590330aa
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@@ -109,10 -109,10 +109,10 @@@ int verify_signed_buffer(const char *pa
  	args_gpg[0] = gpg_program;
  	fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX");
  	if (fd < 0)
- 		return error("could not create temporary file '%s': %s",
+ 		return error(_("could not create temporary file '%s': %s"),
  			     path, strerror(errno));
  	if (write_in_full(fd, signature, signature_size) < 0)
- 		return error("failed writing detached signature to '%s': %s",
+ 		return error(_("failed writing detached signature to '%s': %s"),
  			     path, strerror(errno));
  	close(fd);
  
@@@ -124,16 -124,14 +124,16 @@@
  	args_gpg[2] = path;
  	if (start_command(&gpg)) {
  		unlink(path);
- 		return error("could not run gpg.");
+ 		return error(_("could not run gpg."));
  	}
  
  	write_in_full(gpg.in, payload, payload_size);
  	close(gpg.in);
  
 -	if (gpg_output)
 +	if (gpg_output) {
  		strbuf_read(gpg_output, gpg.err, 0);
 +		close(gpg.err);
 +	}
  	ret = finish_command(&gpg);
  
  	unlink_or_warn(path);