From: Jiang Xin <worldhello.net@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"Git List" <git@vger.kernel.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Cc: Jiang Xin <worldhello.net@gmail.com>
Subject: [PATCH] i18n: fix typos found during l10n for git 2.22.0
Date: Sun, 2 Jun 2019 23:11:22 +0800 [thread overview]
Message-ID: <20190602151122.7512-1-worldhello.net@gmail.com> (raw)
Find two typos introduced by the following commits:
+ 31fba9d3b4 (diff-parseopt: convert --[src|dst]-prefix, 2019-03-24)
+ ed8b4132c8 (remote-curl: mark all error messages for translation,
2019-03-05)
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
diff.c | 2 +-
remote-curl.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index 2068b1c06e..a654d46f6a 100644
--- a/diff.c
+++ b/diff.c
@@ -5354,7 +5354,7 @@ static void prep_parse_options(struct diff_options *options)
N_("show the given source prefix instead of \"a/\""),
PARSE_OPT_NONEG),
OPT_STRING_F(0, "dst-prefix", &options->b_prefix, N_("<prefix>"),
- N_("show the given source prefix instead of \"b/\""),
+ N_("show the given destination prefix instead of \"b/\""),
PARSE_OPT_NONEG),
OPT_CALLBACK_F(0, "line-prefix", options, N_("<prefix>"),
N_("prepend an additional prefix to every line of output"),
diff --git a/remote-curl.c b/remote-curl.c
index a1bf4f68c7..051f26629d 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -1117,13 +1117,13 @@ static void parse_fetch(struct strbuf *buf)
const char *q;
if (parse_oid_hex(p, &old_oid, &q))
- die(_("protocol error: expected sha/ref, got %s'"), p);
+ die(_("protocol error: expected sha/ref, got '%s'"), p);
if (*q == ' ')
name = q + 1;
else if (!*q)
name = "";
else
- die(_("protocol error: expected sha/ref, got %s'"), p);
+ die(_("protocol error: expected sha/ref, got '%s'"), p);
ref = alloc_ref(name);
oidcpy(&ref->old_oid, &old_oid);
--
2.22.0.rc2.14.g03eb6640cb.dirty
next reply other threads:[~2019-06-02 15:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-02 15:11 Jiang Xin [this message]
2019-06-03 13:43 ` [PATCH] i18n: fix typos found during l10n for git 2.22.0 Johannes Schindelin
2019-06-03 18:10 ` Junio C Hamano
[not found] ` <2609655.nBnP9L6vNR@cayenne>
2019-06-04 0:46 ` [L10N] Kickoff for Git 2.22.0 round #3 Jiang Xin
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=20190602151122.7512-1-worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=pclouds@gmail.com \
/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).