From: Ævar Arnfjörð Bjarmason Date: Mon, 30 Apr 2012 15:33:14 +0000 (+0000) Subject: git-commit: remove lego in i18n messages X-Git-Tag: v1.7.11-rc0~70^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4064e665ca02f1a05011c4010043de802ba1d569;p=git.git git-commit: remove lego in i18n messages Change the "Please enter the commit message for your changes." and the subsequent blurb of text not to be split up. This makes translating it much easier. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/builtin/commit.c b/builtin/commit.c index c7c491e25..01780293a 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -798,16 +798,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix, : "CHERRY_PICK_HEAD")); fprintf(s->fp, "\n"); - status_printf(s, GIT_COLOR_NORMAL, - _("Please enter the commit message for your changes.")); if (cleanup_mode == CLEANUP_ALL) - status_printf_more(s, GIT_COLOR_NORMAL, - _(" Lines starting\n" - "with '#' will be ignored, and an empty" + status_printf(s, GIT_COLOR_NORMAL, + _("Please enter the commit message for your changes." + " Lines starting\nwith '#' will be ignored, and an empty" " message aborts the commit.\n")); else /* CLEANUP_SPACE, that is. */ - status_printf_more(s, GIT_COLOR_NORMAL, - _(" Lines starting\n" + status_printf(s, GIT_COLOR_NORMAL, + _("Please enter the commit message for your changes." + " Lines starting\n" "with '#' will be kept; you may remove them" " yourself if you want to.\n" "An empty message aborts the commit.\n"));