Skip to contentSkip to conversation

i18n: fix typos found during l10n for git 2.22.0

PATCH In review Jiang Xin 3 participants 4 messages Jun 2, 2019 – Jun 4, 2019 1 message not in the archive

lore
Share & tools
lore

Jiang Xin

author
#0 lore raw

PATCH 1/1 i18n: fix typos found during l10n for git 2.22.0

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)

---
 diff.c        | 2 +-
 remote-curl.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff.c +1 -1
index 2068b1c06e..a654d46f6a 100644
@@ -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"),
remote-curl.c +2 -2
index a1bf4f68c7..051f26629d 100644
@@ -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);
Signature · 1 line
2.22.0.rc2.14.g03eb6640cb.dirty
#1 lore raw

Hi Jian Xin,

Quoted 2 lines · Jiang Xin

+ 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

#2 lore raw
Quoted 11 lines · Johannes Schindelin

Hi Jian Xin,

Quoted 2 lines · Jiang Xin

+ 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.

A message that is not in the archive (sent off-list or not yet received): 2609655.nBnP9L6vNR@cayenne

author
#4 lore raw

[L10N] Kickoff for Git 2.22.0 round #3

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 <[email protected]>

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