Merge branch 'sb/gpg-i18n'

* sb/gpg-i18n:
  gpg: allow translation of more error messages
This commit is contained in:
Junio C Hamano 2013-02-07 14:41:34 -08:00
commit 9a1ab9e72f

View File

@ -109,10 +109,10 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
args_gpg[0] = gpg_program; args_gpg[0] = gpg_program;
fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX"); fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX");
if (fd < 0) if (fd < 0)
return error("could not create temporary file '%s': %s", return error(_("could not create temporary file '%s': %s"),
path, strerror(errno)); path, strerror(errno));
if (write_in_full(fd, signature, signature_size) < 0) 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)); path, strerror(errno));
close(fd); close(fd);
@ -124,7 +124,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
args_gpg[2] = path; args_gpg[2] = path;
if (start_command(&gpg)) { if (start_command(&gpg)) {
unlink(path); unlink(path);
return error("could not run gpg."); return error(_("could not run gpg."));
} }
write_in_full(gpg.in, payload, payload_size); write_in_full(gpg.in, payload, payload_size);