From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2016 21:48:38 +0000 (-0700)
Subject: Merge branch 'va/i18n'
X-Git-Tag: v2.10.0-rc0~44
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/768ededa9c4e804ead6d473d4fe3a8092a77b05c?hp=--cc

Merge branch 'va/i18n'

More i18n marking.

* va/i18n:
i18n: config: unfold error messages marked for translation
i18n: notes: mark comment for translation
---

768ededa9c4e804ead6d473d4fe3a8092a77b05c
diff --cc submodule-config.c
index faedb1a489,1753e01755..d22a851d27
--- a/submodule-config.c
+++ b/submodule-config.c
@@@ -442,9 -448,8 +442,9 @@@ static const struct submodule *config_f
  	parameter.commit_sha1 = commit_sha1;
  	parameter.gitmodules_sha1 = sha1;
  	parameter.overwrite = 0;
- 	git_config_from_mem(parse_config, "submodule-blob", rev.buf,
+ 	git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf,
  			config, config_size, &parameter);
 +	strbuf_release(&rev);
  	free(config);
  
  	switch (lookup_type) {