From: Ævar Arnfjörð Bjarmason Date: Sun, 10 Apr 2011 19:34:03 +0000 (+0000) Subject: i18n: mark merge "Could not read from" message for translation X-Git-Tag: v1.7.5.4~11^2~23 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=650ed9db74188654656afcd38b1d7672161cb90b;p=git.git i18n: mark merge "Could not read from" message for translation 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/merge.c b/builtin/merge.c index d54e7ddbb..7eda05d86 100644 --- 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)