Two small l10n/i18n patches (resend)

Two small l10n/i18n patches (resend)

[Raphaël Hertzog]

(I'm not subscribed, please keep me in CC. Resending as suggested by Duy
Nguyen in the hope that my patches get picked this time)

Hello,

I was reviewing the output of "git bisect" with my French locale
and I saw a clear mistake in the French translation (fixed
in the first commit) and I also noticed that the last message
was still in English. After review of the code, it's not a missing
translation, the problem comes down to two strings which
are not marked for translation.

So the second commit marks those strings for translation. I ensured
that "make test" is still working after those two commits.

Thank you for considering my patches. I leave it to the regular
translators to add translations for the newly added strings.

Cheers,
 Raphael Hertzog.

[PATCH 1/2] l10n: fr: fix a message seen in git bisect

[Raphaël Hertzog]

"cette" can be only be used before a word (like in "cette bouteille" for
"this bottle"), but here "this" refers to the current step and we have
to use "ceci" in French.

Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
---
 po/fr.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 2bae75360..eb760686a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1062,8 +1062,8 @@ msgstr[1] "(à peu près %d étapes)"
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
-msgstr[0] "Bissection : %d révision à tester après cette %s\n"
-msgstr[1] "Bissection : %d révisions à tester après cette %s\n"
+msgstr[0] "Bissection : %d révision à tester après ceci %s\n"
+msgstr[1] "Bissection : %d révisions à tester après ceci %s\n"
 
 #: blame.c:1756
 msgid "--contents and --reverse do not blend well."
-- 
2.18.0

Re: [PATCH 1/2] l10n: fr: fix a message seen in git bisect

[Jean-Noël Avila]

OK, Will queue this patch for next round of translation

Re: [PATCH 1/2] l10n: fr: fix a message seen in git bisect

[Junio C Hamano]

Jean-Noël Avila <jn.avila@free.fr> writes:

> OK, Will queue this patch for next round of translation

Thanks for an Ack.

[PATCH 2/2] i18n: bisect: mark three supplementary strings for translation

[Raphaël Hertzog]

The whole bisect procedure is translated but the last message that the
user will see in the process is not translated. Let's fix this.

Also mark the "revision walk setup failed" error message for
translation. It's already used in other files so will not generate
any new string to translate.

Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
---
 bisect.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bisect.c b/bisect.c
index 6de1abd40..678df54cc 100644
--- a/bisect.c
+++ b/bisect.c
@@ -653,7 +653,7 @@ static void bisect_rev_setup(struct rev_info *revs, const char *prefix,
 static void bisect_common(struct rev_info *revs)
 {
 	if (prepare_revision_walk(revs))
-		die("revision walk setup failed");
+		die(_("revision walk setup failed"));
 	if (revs->tree_objects)
 		mark_edges_uninteresting(revs, NULL);
 }
@@ -664,8 +664,8 @@ static void exit_if_skipped_commits(struct commit_list *tried,
 	if (!tried)
 		return;
 
-	printf("There are only 'skip'ped commits left to test.\n"
-	       "The first %s commit could be any of:\n", term_bad);
+	printf(_("There are only 'skip'ped commits left to test.\n"
+		 "The first %s commit could be any of:\n"), term_bad);
 
 	for ( ; tried; tried = tried->next)
 		printf("%s\n", oid_to_hex(&tried->item->object.oid));
@@ -990,7 +990,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
 
 	if (!oidcmp(bisect_rev, current_bad_oid)) {
 		exit_if_skipped_commits(tried, current_bad_oid);
-		printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
+		printf(_("%s is the first %s commit\n"), oid_to_hex(bisect_rev),
 			term_bad);
 		show_diff_tree(prefix, revs.commits->item);
 		/* This means the bisection process succeeded. */
-- 
2.18.0