git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio Hamano" <gitster@pobox.com>,
	"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 5/5] git-commit: remove lego in i18n messages
Date: Mon, 30 Apr 2012 15:33:14 +0000	[thread overview]
Message-ID: <1335799995-7667-6-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1335799995-7667-1-git-send-email-avarab@gmail.com>

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>
---
 builtin/commit.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/builtin/commit.c b/builtin/commit.c
index c7c491e..438f257 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -798,17 +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"
-				"with '#' will be kept; you may remove them"
+			status_printf(s, GIT_COLOR_NORMAL,
+				_("Please enter the commit message for your changes."
+				" Lines starting\nwith '#' will be kept; you may remove them"
 				" yourself if you want to.\n"
 				"An empty message aborts the commit.\n"));
 		if (only_include_assumed)
-- 
1.7.10.546.gbaa1a.dirty

  parent reply	other threads:[~2012-04-30 15:33 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-30 15:33 [PATCH 0/5] i18n: TRANSLATORS commends and LEGO-- Ævar Arnfjörð Bjarmason
2012-04-30 15:33 ` [PATCH 1/5] diff: move TRANSLATORS comments so they're picked up Ævar Arnfjörð Bjarmason
2012-04-30 17:30   ` Junio C Hamano
2012-04-30 17:54     ` Ævar Arnfjörð Bjarmason
2012-04-30 15:33 ` [PATCH 2/5] i18n: Add more TRANSLATORS comments Ævar Arnfjörð Bjarmason
2012-04-30 17:37   ` Junio C Hamano
2012-04-30 15:33 ` [PATCH 3/5] git-branch: remove lego in i18n messages Ævar Arnfjörð Bjarmason
2012-04-30 17:38   ` Junio C Hamano
2012-04-30 15:33 ` [PATCH 4/5] git-commit: " Ævar Arnfjörð Bjarmason
2012-04-30 15:33 ` Ævar Arnfjörð Bjarmason [this message]
2012-04-30 17:54   ` [PATCH 5/5] " Junio C Hamano
2012-04-30 15:34 ` [PATCH 0/5] i18n: TRANSLATORS commends and LEGO-- Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1335799995-7667-6-git-send-email-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).