From: Junio C Hamano <gitster@pobox.com>
To: Jean-Noel Avila <jn.avila@free.fr>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/3] i18n: fix typos for translation
Date: Wed, 24 Aug 2016 08:44:48 -0700 [thread overview]
Message-ID: <xmqqwpj6rx1r.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqk2f7xyfe.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 23 Aug 2016 09:06:13 -0700")
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.avila@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.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@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
next prev parent reply other threads:[~2016-08-24 15:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-15 15:04 [L10N] Kickoff of translation for Git 2.10.0 round 1 Jiang Xin
2016-08-20 16:01 ` Jean-Noël AVILA
2016-08-20 18:03 ` Junio C Hamano
2016-08-20 18:38 ` Jean-Noël AVILA
2016-08-21 15:45 ` Jiang Xin
2016-08-23 15:58 ` Junio C Hamano
2016-08-23 18:16 ` Jean-Noël AVILA
2016-08-21 14:50 ` [PATCH 1/3] i18n: fix typos for translation Jean-Noel Avila
2016-08-21 14:50 ` [PATCH 2/3] i18n: fix git rebase interactive commit messages Jean-Noel Avila
2016-08-21 14:50 ` [PATCH 3/3] i18n: simplify numeric error reporting Jean-Noel Avila
2016-08-24 15:48 ` Junio C Hamano
2016-08-23 16:06 ` [PATCH 1/3] i18n: fix typos for translation Junio C Hamano
2016-08-24 15:44 ` Junio C Hamano [this message]
2016-08-24 15:45 ` Junio C Hamano
2016-08-25 5:24 ` [L10N] Kickoff of translation for Git 2.10.0 round 1 Alex Henrie
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=xmqqwpj6rx1r.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--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).