From: Ævar Arnfjörð Bjarmason Date: Sun, 10 Apr 2011 19:34:05 GMT Subject: [PATCH/RFC 4/7] i18n: mark merge CHERRY_PICK_HEAD messages for translation Message-ID: <1302464048-21806-5-git-send-email-avarab@gmail.com> In-Reply-To: <1302464048-21806-1-git-send-email-avarab@gmail.com> Mark CHERRY_PICK_HEAD related messages in builtin/merge.c that were added in v1.7.5-rc0~88^2~2 (Introduce CHERRY_PICK_HEAD) by Jay Soffian for translation. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/merge.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 6e63c08..08245b6 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1043,10 +1043,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix) } if (file_exists(git_path("CHERRY_PICK_HEAD"))) { if (advice_resolve_conflict) - die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" - "Please, commit your changes before you can merge."); + die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" + "Please, commit your changes before you can merge.")); else - die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."); + die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).")); } resolve_undo_clear(); -- 1.7.4.1