git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jean-Noel Avila <jn.avila@free.fr>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/3] i18n: fix typos for translation
Date: Tue, 23 Aug 2016 09:06:13 -0700	[thread overview]
Message-ID: <xmqqk2f7xyfe.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160821145039.12121-1-jn.avila@free.fr> (Jean-Noel Avila's message of "Sun, 21 Aug 2016 16:50:37 +0200")

Jean-Noel Avila <jn.avila@free.fr> writes:

> Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
> ---
>  bisect.c    | 10 +++++-----
>  sequencer.c |  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/bisect.c b/bisect.c
> index 6f512c2..b9a0701 100644
> --- a/bisect.c
> +++ b/bisect.c
> @@ -760,7 +760,7 @@ static void handle_skipped_merge_base(const unsigned char *mb)
>  	char *bad_hex = oid_to_hex(current_bad_oid);
>  	char *good_hex = join_sha1_array_hex(&good_revs, ' ');
>  
> -	warning(_("the merge base between %s and [%s] "
> +	warning(_("The merge base between %s and [%s] "

I _think_ most these are not typos and must stay as they are.  From
time to time we try to clean things up, cf. 8c3ca351 (config:
lower-case first word of error strings, 2016-04-09).

The removal of "a" from "a another reviert" is good.  If you are
fixing the cases, you would want to do the correction the other way.

>  		"must be skipped.\n"
>  		"So we cannot be sure the first %s commit is "
>  		"between %s and %s.\n"
> @@ -846,7 +846,7 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
>  	int fd;
>  
>  	if (!current_bad_oid)
> -		die(_("a %s revision is needed"), term_bad);
> +		die(_("A %s revision is needed"), term_bad);
>  
>  	/* Check if file BISECT_ANCESTORS_OK exists. */
>  	if (!stat(filename, &st) && S_ISREG(st.st_mode))
> @@ -863,7 +863,7 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
>  	/* Create file BISECT_ANCESTORS_OK. */
>  	fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
>  	if (fd < 0)
> -		warning_errno(_("could not create file '%s'"),
> +		warning_errno(_("Could not create file '%s'"),
>  			      filename);
>  	else
>  		close(fd);
> @@ -914,7 +914,7 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
>  			*read_good = "good";
>  			return;
>  		} else {
> -			die_errno(_("could not read file '%s'"), filename);
> +			die_errno(_("Could not read file '%s'"), filename);
>  		}
>  	} else {
>  		strbuf_getline_lf(&str, fp);
> @@ -944,7 +944,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
>  
>  	read_bisect_terms(&term_bad, &term_good);
>  	if (read_bisect_refs())
> -		die(_("reading bisect refs failed"));
> +		die(_("Reading bisect refs failed"));
>  
>  	check_good_are_ancestors_of_bad(prefix, no_checkout);
>  
> diff --git a/sequencer.c b/sequencer.c
> index 2e9c7d0..3804fa9 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -702,7 +702,7 @@ static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts *
>  	if (action != opts->action) {
>  		if (action == REPLAY_REVERT)
>  		      error((opts->action == REPLAY_REVERT)
> -			    ? _("Cannot revert during a another revert.")
> +			    ? _("Cannot revert during another revert.")
>  			    : _("Cannot revert during a cherry-pick."));
>  		else
>  		      error((opts->action == REPLAY_REVERT)

  parent reply	other threads:[~2016-08-23 16:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-15 15:04 [L10N] Kickoff of translation for Git 2.10.0 round 1 Jiang Xin
2016-08-20 16:01 ` Jean-Noël AVILA
2016-08-20 18:03   ` Junio C Hamano
2016-08-20 18:38     ` Jean-Noël AVILA
2016-08-21 15:45       ` Jiang Xin
2016-08-23 15:58       ` Junio C Hamano
2016-08-23 18:16         ` Jean-Noël AVILA
2016-08-21 14:50     ` [PATCH 1/3] i18n: fix typos for translation Jean-Noel Avila
2016-08-21 14:50       ` [PATCH 2/3] i18n: fix git rebase interactive commit messages Jean-Noel Avila
2016-08-21 14:50       ` [PATCH 3/3] i18n: simplify numeric error reporting Jean-Noel Avila
2016-08-24 15:48         ` Junio C Hamano
2016-08-23 16:06       ` Junio C Hamano [this message]
2016-08-24 15:44         ` [PATCH 1/3] i18n: fix typos for translation Junio C Hamano
2016-08-24 15:45         ` Junio C Hamano
2016-08-25  5:24   ` [L10N] Kickoff of translation for Git 2.10.0 round 1 Alex Henrie

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=xmqqk2f7xyfe.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jn.avila@free.fr \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).