From: Ævar Arnfjörð Bjarmason Date: Sun, 10 Apr 2011 19:34:05 +0000 (+0000) Subject: i18n: mark merge CHERRY_PICK_HEAD messages for translation X-Git-Tag: v1.7.5.4~11^2~21 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f68f1801726eb64d139dfb7d7858a470aef595f2;p=git.git i18n: mark merge CHERRY_PICK_HEAD messages for translation 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/merge.c b/builtin/merge.c index 6e63c0839..08245b6d6 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();