Merge branch 'sb/gpg-i18n'

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

diff --combined gpg-interface.c
index 5f142f619855ccd664a84be366bf6877a48e6da4,e8eba1ad99f6de4987d6d69064fee7f2d74d9120..45590330aa3131da69174899783913cee9a44c31
--- 1/gpg-interface.c
--- 2/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);