From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Sep 2016 22:15:28 +0000 (-0700)
Subject: Merge branch 'va/i18n'
X-Git-Tag: v2.11.0-rc0~122
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1fe6f5fb0a4bf348b22790b4d766a463e013a384

Merge branch 'va/i18n'

More i18n.

* va/i18n:
i18n: update-index: mark warnings for translation
i18n: show-branch: mark plural strings for translation
i18n: show-branch: mark error messages for translation
i18n: receive-pack: mark messages for translation
notes: spell first word of error messages in lowercase
i18n: notes: mark error messages for translation
i18n: merge-recursive: mark verbose message for translation
i18n: merge-recursive: mark error messages for translation
i18n: config: mark error message for translation
i18n: branch: mark option description for translation
i18n: blame: mark error messages for translation
---

1fe6f5fb0a4bf348b22790b4d766a463e013a384
diff --cc builtin/blame.c
index ccaf8be5e7,27aea7944c..2ff18b168e
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@@ -2790,10 -2790,10 +2790,10 @@@ parse_done
  	else {
  		o = get_origin(&sb, sb.final, path);
  		if (fill_blob_sha1_and_mode(o))
- 			die("no such path %s in %s", path, final_commit_name);
+ 			die(_("no such path %s in %s"), path, final_commit_name);
  
  		if (DIFF_OPT_TST(&sb.revs->diffopt, ALLOW_TEXTCONV) &&
 -		    textconv_object(path, o->mode, o->blob_sha1, 1, (char **) &sb.final_buf,
 +		    textconv_object(path, o->mode, &o->blob_oid, 1, (char **) &sb.final_buf,
  				    &sb.final_buf_size))
  			;
  		else
@@@ -2801,8 -2801,8 +2801,8 @@@
  						      &sb.final_buf_size);
  
  		if (!sb.final_buf)
- 			die("Cannot read blob %s for path %s",
+ 			die(_("cannot read blob %s for path %s"),
 -			    sha1_to_hex(o->blob_sha1),
 +			    oid_to_hex(&o->blob_oid),
  			    path);
  	}
  	num_read_blob++;