From: "Raphaël Hertzog" <hertzog@debian.org>
To: git@vger.kernel.org
Cc: jn.avila@free.fr, "Junio C Hamano" <gitster@pobox.com>,
"Raphaël Hertzog" <hertzog@debian.org>
Subject: [PATCH 2/2] i18n: bisect: mark three supplementary strings for translation
Date: Wed, 4 Jul 2018 17:43:57 +0200 [thread overview]
Message-ID: <20180704154357.26964-3-hertzog@debian.org> (raw)
In-Reply-To: <20180704154357.26964-1-hertzog@debian.org>
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
prev parent reply other threads:[~2018-07-04 15:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-04 15:43 Two small l10n/i18n patches (resend) Raphaël Hertzog
2018-07-04 15:43 ` [PATCH 1/2] l10n: fr: fix a message seen in git bisect Raphaël Hertzog
2018-07-04 15:45 ` Jean-Noël Avila
2018-07-06 19:14 ` Junio C Hamano
2018-07-04 15:43 ` Raphaël Hertzog [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180704154357.26964-3-hertzog@debian.org \
--to=hertzog@debian.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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 NNTP newsgroup(s).