Re: [PATCH 1/3] i18n: fix typos for translation

[Junio C Hamano]

Here comes suggested replacement for 1/3 and 2/3.

Let's not correct "C" in "Cannot" at this stage and leave them to
the next cycle; there are too many of them.

-- >8 --
From: Jean-Noel Avila <jn.av...@free.fr>
Date: Sun, 21 Aug 2016 16:50:37 +0200
Subject: [PATCH 1/3] i18n: fix typos for translation

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr>
Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
 sequencer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
2.10.0-rc1-130-gf5df0f2

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] i18n: fix typos for translation

[Junio C Hamano]

And here is the second one, using wording suggested by Jiang.

-- >8 -- 
From: Jean-Noel Avila 
Date: Sun, 21 Aug 2016 16:50:38 +0200
Subject: [PATCH] i18n: fix git rebase interactive commit messages

For proper i18n, the logic cannot embed english specific processing.

Signed-off-by: Jean-Noel Avila 
Signed-off-by: Junio C Hamano 
---
 git-rebase--interactive.sh | 45 +++--
 1 file changed, 3 insertions(+), 42 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index e2da524..7e558b0 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -404,51 +404,12 @@ pick_one_preserving_merges () {
 
 this_nth_commit_message () {
n=$1
-   case "$n" in
-   1) gettext "This is the 1st commit message:";;
-   2) gettext "This is the 2nd commit message:";;
-   3) gettext "This is the 3rd commit message:";;
-   4) gettext "This is the 4th commit message:";;
-   5) gettext "This is the 5th commit message:";;
-   6) gettext "This is the 6th commit message:";;
-   7) gettext "This is the 7th commit message:";;
-   8) gettext "This is the 8th commit message:";;
-   9) gettext "This is the 9th commit message:";;
-   10) gettext "This is the 10th commit message:";;
-   # TRANSLATORS: if the language you are translating into
-   # doesn't allow you to compose a sentence in this fashion,
-   # consider translating as if this and the following few strings
-   # were "This is the commit message ${n}:"
-   *1[0-9]|*[04-9]) eval_gettext "This is the \${n}th commit message:";;
-   *1) eval_gettext "This is the \${n}st commit message:";;
-   *2) eval_gettext "This is the \${n}nd commit message:";;
-   *3) eval_gettext "This is the \${n}rd commit message:";;
-   *) eval_gettext "This is the commit message \${n}:";;
-   esac
+   eval_gettext "This is the commit message #\${n}:"
 }
+
 skip_nth_commit_message () {
n=$1
-   case "$n" in
-   1) gettext "The 1st commit message will be skipped:";;
-   2) gettext "The 2nd commit message will be skipped:";;
-   3) gettext "The 3rd commit message will be skipped:";;
-   4) gettext "The 4th commit message will be skipped:";;
-   5) gettext "The 5th commit message will be skipped:";;
-   6) gettext "The 6th commit message will be skipped:";;
-   7) gettext "The 7th commit message will be skipped:";;
-   8) gettext "The 8th commit message will be skipped:";;
-   9) gettext "The 9th commit message will be skipped:";;
-   10) gettext "The 10th commit message will be skipped:";;
-   # TRANSLATORS: if the language you are translating into
-   # doesn't allow you to compose a sentence in this fashion,
-   # consider translating as if this and the following few strings
-   # were "The commit message ${n} will be skipped:"
-   *1[0-9]|*[04-9]) eval_gettext "The \${n}th commit message will be 
skipped:";;
-   *1) eval_gettext "The \${n}st commit message will be skipped:";;
-   *2) eval_gettext "The \${n}nd commit message will be skipped:";;
-   *3) eval_gettext "The \${n}rd commit message will be skipped:";;
-   *) eval_gettext "The commit message \${n} will be skipped:";;
-   esac
+   eval_gettext "The commit message #\${n} will be skipped:"
 }
 
 update_squash_messages () {
-- 
2.10.0-rc1-130-gf5df0f2

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] i18n: fix typos for translation

[Junio C Hamano]

Jean-Noel Avila  writes:

> Signed-off-by: Jean-Noel Avila 
> ---
>  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(_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, ) && 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(, fp);
> @@ -944,7 +944,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
>  
>   read_bisect_terms(_bad, _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)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/3] i18n: fix typos for translation

[Jean-Noel Avila]

Signed-off-by: Jean-Noel Avila 
---
 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(_revs, ' ');
 
-   warning(_("the merge base between %s and [%s] "
+   warning(_("The merge base between %s and [%s] "
"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, ) && 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(, fp);
@@ -944,7 +944,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
 
read_bisect_terms(_bad, _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)
-- 
2.10.0.rc0.37.gd7d1c14.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html