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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit.c b/builtin/commit.c
index c7c491e2506f82497be9ea1b51000903b9d3b9a3..01780293aa6afcd81e2f37490b59e44cf553bdca 100644 (file)
--- 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");
                                         : "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)
                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. */
                                " 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"));
                                "with '#' will be kept; you may remove them"
                                " yourself if you want to.\n"
                                "An empty message aborts the commit.\n"));