| Message ID | 20190602151122.7512-1-worldhello.net@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i18n: fix typos found during l10n for git 2.22.0 | expand |
Hi Jian Xin, On Sun, 2 Jun 2019, Jiang Xin wrote: > + ed8b4132c8 (remote-curl: mark all error messages for translation, > 2019-03-05) Urgh. Sorry for that, and thank you for cleaning up my mess... Ciao, Dscho
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > Hi Jian Xin, > > On Sun, 2 Jun 2019, Jiang Xin wrote: > >> + ed8b4132c8 (remote-curl: mark all error messages for translation, >> 2019-03-05) > > Urgh. Sorry for that, and thank you for cleaning up my mess... > > Ciao, > Dscho Thanks for a fix and a quick ack. Very much appreciated during the rc freeze period.
Hi,
Git v2.22.0-rc3 has been released, and there are 3 new localizable strings.
Let's start new round of git l10n based on the following commit:
l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed)
Generate po/git.pot from v2.22.0-rc3 for git v2.22.0 l10n round 3.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
You can get it from the usual place:
https://github.com/git-l10n/git-po/
As how to update your XX.po and help to translate Git, please see
"Updating a XX.po file" and other sections in "po/README" file.
--
Jiang Xin
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);
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(-)