From: "Raphaël Hertzog" <hertzog@debian.org>
To: git@vger.kernel.org
Cc: "Jean-Noël Avila" <jn.avila@free.fr>,
"Raphaël Hertzog" <hertzog@debian.org>
Subject: [PATCH 2/2] i18n: bisect: mark two supplementary strings for translation
Date: Thu, 21 Jun 2018 16:27:42 +0200 [thread overview]
Message-ID: <20180621142742.28575-3-hertzog@debian.org> (raw)
In-Reply-To: <20180621142742.28575-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.
Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
---
bisect.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bisect.c b/bisect.c
index a579b5088..8edc7a7a6 100644
--- a/bisect.c
+++ b/bisect.c
@@ -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
next prev parent reply other threads:[~2018-06-21 14:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-21 14:27 Two small l10n/i18n patches Raphaël Hertzog
2018-06-21 14:27 ` [PATCH 1/2] l10n: fr: fix a message seen in git bisect Raphaël Hertzog
2018-06-21 14:27 ` Raphaël Hertzog [this message]
2018-06-21 14:48 ` [PATCH 2/2] i18n: bisect: mark two supplementary strings for translation Duy Nguyen
2018-06-21 15:21 ` Raphael Hertzog
2018-06-25 15:29 ` Raphael Hertzog
2018-06-30 9:11 ` Duy Nguyen
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180621142742.28575-3-hertzog@debian.org \
--to=hertzog@debian.org \
--cc=git@vger.kernel.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).