Hi,
On Thu, 21 Jun 2018, Duy Nguyen wrote:
> Nice. There's another string in bisect_common() that should also be
> translated: "revision walk setup failed". Maybe you can mark it too?
Sure. A new version of the second patch is attached.
Cheers,
--
Raphaël Hertzog ◈ Debian Developer
Support Debian LTS: https://www.freexian.com/services/debian-lts.html
Learn to master Debian: https://debian-handbook.info/get/
>From 9731f23b9e2f47bdb90e552264c9d030b4f40629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@xxxxxxxxxx>
Date: Thu, 21 Jun 2018 16:06:48 +0200
Subject: [PATCH 2/2] i18n: bisect: mark three supplementary strings for
translation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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@xxxxxxxxxx>
---
bisect.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/bisect.c b/bisect.c
index a579b5088..4943eb333 100644
--- a/bisect.c
+++ b/bisect.c
@@ -647,7 +647,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);
}
@@ -658,8 +658,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));
@@ -984,7 +984,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.rc2
