i18n: mark merge "Could not read from" message for translation

avar · gitster · commit 650ed9db7418 · 2011-04-12T00:12:53.000-07:00
Mark the "Could not read from '%s'" message that was added to
builtin/merge.c in v1.7.4.2~25^2 (merge: honor prepare-commit-msg
hook) by Jay Soffian for translation.

Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -822,7 +822,7 @@ static void read_merge_msg(void)
 {
 	strbuf_reset(&merge_msg);
 	if (strbuf_read_file(&merge_msg, git_path("MERGE_MSG"), 0) < 0)
-		die_errno("Could not read from '%s'", git_path("MERGE_MSG"));
+		die_errno(_("Could not read from '%s'"), git_path("MERGE_MSG"));
 }
 
 static void run_prepare_commit_msg(void)

Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,7 @@ static void read_merge_msg(void)`
`822`	`822`	`{`
`823`	`823`	`strbuf_reset(&merge_msg);`
`824`	`824`	`if (strbuf_read_file(&merge_msg, git_path("MERGE_MSG"), 0) < 0)`
`825`		`- die_errno("Could not read from '%s'", git_path("MERGE_MSG"));`
	`825`	`+ die_errno(_("Could not read from '%s'"), git_path("MERGE_MSG"));`
`826`	`826`	`}`
`827`	`827`
`828`	`828`	`static void run_prepare_commit_msg(void)`