[PATCH 12/25] gettextize: git-merge "Merge made by %s." message
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 2, 2010, 19:40 UTC
- Message-ID
- <1283456446-22577-13-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1283373845-2022-1-git-send-email-avarab@gmail.com>
Like the "In-index merge" message "Merge made by %s." emits to stdout via finish(), so translating it should be fine.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/merge.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c index 956ce14..9121c7b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -820,7 +820,7 @@ static int finish_automerge(struct commit_list *common, free_commit_list(remoteheads); strbuf_addch(&merge_msg, '\n'); commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL); - strbuf_addf(&buf, "Merge made by %s.", wt_strategy); + strbuf_addf(&buf, _("Merge made by %s."), wt_strategy); finish(result_commit, buf.buf); strbuf_release(&buf); drop_save();
-- 1.7.2.2.614.g1dc9