Re: [PATCH 1/3] i18n: fix typos for translation
From: Junio C Hamano <hidden>
Date: 2016-08-23 16:07:43
Jean-Noel Avila [off-list ref] writes:
quoted hunk
Signed-off-by: Jean-Noel Avila <redacted> --- 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.
quoted hunk
"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)