git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages

From
Vasco Almeida <vascomalmeida@sapo.pt>
Date
Jun 24, 2016, 11:39 UTC
Message-ID
<576D1BEA.8020509@sapo.pt>
In-Reply-To
<20160624053135.7848-1-alexhenrie24@gmail.com>
Às 05:31 de 24-06-2016, Alex Henrie escreveu:
Show 16 quoted lines
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
>  unpack-trees.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/unpack-trees.c b/unpack-trees.c
> index 6bc9512..11c37fb 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
>  	if (!strcmp(cmd, "checkout"))
>  		msg = advice_commit_before_merge
>  		      ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
> -			  "Please commit your changes or stash them before you can switch branches.")
> +			  "Please commit your changes or stash them before you switch branches.")
>  		      : _("Your local changes to the following files would be overwritten by checkout:\n%%s");

The only downside I can tell about this is translator are going to have to update those strings on their translations, but that is a normal thing to do on an active project like Git.

I'm not a native speak either, but I think I have translated that as if the sentences were like this patch introduces. I agree with this change.

Previous: Matthieu MoyNext: Junio C Hamano
Message 3 of 5 in “unpack-trees: fix English grammar in do-this-before-that messages”
  1. unpack-trees: fix English grammar in do-this-before-that messagesAlex Henrie, Jun 24, 2016
  2. Matthieu MoyJun 24, 2016
  3. Vasco AlmeidaJun 24, 2016
  4. Junio C HamanoJun 24, 2016
  5. Vasco AlmeidaJun 24, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.