summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2012-04-30 15:33:14 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-30 10:54:28 -0700
commit4064e665ca02f1a05011c4010043de802ba1d569 (patch)
tree3bb2e97123522ea3fe7f91a7df461034e9649173
parentgit-commit: remove lego in i18n messages (diff)
downloadtgif-4064e665ca02f1a05011c4010043de802ba1d569.tar.xz
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>
-rw-r--r--builtin/commit.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index c7c491e250..01780293aa 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"));