All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Michael J Gruber <git@grubix.eu>,
	Jeff King <peff@peff.net>
Subject: [PATCH v3] commit-template: change a message to be more intuitive
Date: Fri, 15 Sep 2017 10:20:25 +0530	[thread overview]
Message-ID: <20170915045025.4272-1-kaarticsivaraam91196@gmail.com> (raw)
In-Reply-To: <xmqqefr8zouy.fsf@gitster.mtv.corp.google.com>

It's not good to use the phrase 'do not touch' to convey the information
that the cut-line should not be modified or removed as it could possibly
be mis-interpreted by a person who doesn't know that the word 'touch' has
the meaning of 'tamper with'. Further, it could make translations a little
difficult as it might not have the intended meaning in a few languages (for
which translations don't exist yet) when translated as such.

So, use intuitive terms in the sentence. Replacing the word 'touch' with
other terms has introduced the possibility of the following sentence to be
mis-interpreted, so change the terms in that too.

Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
---
 Changes in v3:
 
    - changed the wordings of the second sentence as there seemed to be a
      magical 'or else' connecting the two lines.
 
 I didn't expect the least that this would go upto v3. In case anyboy finds
 something wrong with this change too, it's a lot better to drop this altogether
 than going for a v4.

 wt-status.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wt-status.c b/wt-status.c
index 77c27c511..23e87e74d 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -934,7 +934,7 @@ size_t wt_status_locate_end(const char *s, size_t len)
 
 void wt_status_add_cut_line(FILE *fp)
 {
-	const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
+	const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
 	struct strbuf buf = STRBUF_INIT;
 
 	fprintf(fp, "%c %s", comment_line_char, cut_line);
-- 
2.14.1.1006.g90ad9a07c


  reply	other threads:[~2017-09-15  4:50 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <<e656d1b4-c95e-e51d-5f48-bb3450580fa4@gmail.com>
2017-09-13 13:05 ` [PATCH v2] commit-template: change a message to be more intuitive Kaartic Sivaraam
2017-09-14  7:36   ` Michael J Gruber
2017-09-14 14:17     ` Kaartic Sivaraam
2017-09-14 14:41       ` Jeff King
2017-09-15  2:18         ` Junio C Hamano
2017-09-15  4:50           ` Kaartic Sivaraam [this message]
2017-09-15 10:00             ` [PATCH v3] " Michael J Gruber
2017-09-15 12:39               ` Kaartic Sivaraam
2017-09-15  1:58     ` [PATCH v2] " Kaartic Sivaraam
2017-09-12 10:55 [PATCH] " Kaartic Sivaraam
2017-09-13 10:29 ` Kevin Daudt
2017-09-13 11:20   ` Jeff King
2017-09-13 12:31     ` Kaartic Sivaraam
2017-09-13 13:05       ` [PATCH v2] " Kaartic Sivaraam
2017-09-13 12:29   ` [PATCH] " Kaartic Sivaraam

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=20170915045025.4272-1-kaarticsivaraam91196@gmail.com \
    --to=kaarticsivaraam91196@gmail.com \
    --cc=git@grubix.eu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.