{"thread":{"id":"51224","subject":"[PATCH] i18n: fix typos found during l10n for git 2.22.0","startedAt":"2019-06-02T15:13:41Z","lastAt":"2019-06-04T00:47:14Z","messageCount":4,"participants":["Jiang Xin","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"376551","messageId":"20190602151122.7512-1-worldhello.net@gmail.com","threadId":"51224","inReplyTo":null,"subject":"[PATCH] i18n: fix typos found during l10n for git 2.22.0","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2019-06-02T15:11:22Z","receivedAt":"2019-06-02T15:13:41Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Find two typos introduced by the following commits:\n\n+ 31fba9d3b4 (diff-parseopt: convert --[src|dst]-prefix, 2019-03-24)\n+ ed8b4132c8 (remote-curl: mark all error messages for translation,\n 2019-03-05)\n\nSigned-off-by: Jiang Xin \n---\n diff.c | 2 +-\n remote-curl.c | 4 ++--\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/diff.c b/diff.c\nindex 2068b1c06e..a654d46f6a 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -5354,7 +5354,7 @@ static void prep_parse_options(struct diff_options *options)\n \t\t\t N_(\"show the given source prefix instead of \\\"a/\\\"\"),\n \t\t\t PARSE_OPT_NONEG),\n \t\tOPT_STRING_F(0, \"dst-prefix\", &options->b_prefix, N_(\"\"),\n-\t\t\t N_(\"show the given source prefix instead of \\\"b/\\\"\"),\n+\t\t\t N_(\"show the given destination prefix instead of \\\"b/\\\"\"),\n \t\t\t PARSE_OPT_NONEG),\n \t\tOPT_CALLBACK_F(0, \"line-prefix\", options, N_(\"\"),\n \t\t\t N_(\"prepend an additional prefix to every line of output\"),\ndiff --git a/remote-curl.c b/remote-curl.c\nindex a1bf4f68c7..051f26629d 100644\n--- a/remote-curl.c\n+++ b/remote-curl.c\n@@ -1117,13 +1117,13 @@ static void parse_fetch(struct strbuf *buf)\n \t\t\tconst char *q;\n \n \t\t\tif (parse_oid_hex(p, &old_oid, &q))\n-\t\t\t\tdie(_(\"protocol error: expected sha/ref, got %s'\"), p);\n+\t\t\t\tdie(_(\"protocol error: expected sha/ref, got '%s'\"), p);\n \t\t\tif (*q == ' ')\n \t\t\t\tname = q + 1;\n \t\t\telse if (!*q)\n \t\t\t\tname = \"\";\n \t\t\telse\n-\t\t\t\tdie(_(\"protocol error: expected sha/ref, got %s'\"), p);\n+\t\t\t\tdie(_(\"protocol error: expected sha/ref, got '%s'\"), p);\n \n \t\t\tref = alloc_ref(name);\n \t\t\toidcpy(&ref->old_oid, &old_oid);\n-- \n2.22.0.rc2.14.g03eb6640cb.dirty\n\n"},{"id":"376565","messageId":"nycvar.QRO.7.76.6.1906031543190.48@tvgsbejvaqbjf.bet","threadId":"51224","inReplyTo":"20190602151122.7512-1-worldhello.net@gmail.com","subject":"Re: [PATCH] i18n: fix typos found during l10n for git 2.22.0","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-06-03T13:43:44Z","receivedAt":"2019-06-03T13:43:45Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Jian Xin,\n\nOn Sun, 2 Jun 2019, Jiang Xin wrote:\n\n> + ed8b4132c8 (remote-curl: mark all error messages for translation,\n> 2019-03-05)\n\nUrgh. Sorry for that, and thank you for cleaning up my mess...\n\nCiao,\nDscho\n"},{"id":"376593","messageId":"xmqqftoqv8uc.fsf@gitster-ct.c.googlers.com","threadId":"51224","inReplyTo":"nycvar.QRO.7.76.6.1906031543190.48@tvgsbejvaqbjf.bet","subject":"Re: [PATCH] i18n: fix typos found during l10n for git 2.22.0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-06-03T18:10:03Z","receivedAt":"2019-06-03T18:10:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> Hi Jian Xin,\n>\n> On Sun, 2 Jun 2019, Jiang Xin wrote:\n>\n>> + ed8b4132c8 (remote-curl: mark all error messages for translation,\n>> 2019-03-05)\n>\n> Urgh. Sorry for that, and thank you for cleaning up my mess...\n>\n> Ciao,\n> Dscho\n\nThanks for a fix and a quick ack. Very much appreciated during the\nrc freeze period.\n"},{"id":"376629","messageId":"20190604004640.3935-1-worldhello.net@gmail.com","threadId":"51224","inReplyTo":"2609655.nBnP9L6vNR@cayenne","subject":"[L10N] Kickoff for Git 2.22.0 round #3","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2019-06-04T00:46:40Z","receivedAt":"2019-06-04T00:47:14Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Hi,\n\nGit v2.22.0-rc3 has been released, and there are 3 new localizable strings.\nLet's start new round of git l10n based on the following commit:\n\n l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed)\n \n Generate po/git.pot from v2.22.0-rc3 for git v2.22.0 l10n round 3.\n \n Signed-off-by: Jiang Xin \n\nYou can get it from the usual place:\n\n https://github.com/git-l10n/git-po/\n\nAs how to update your XX.po and help to translate Git, please see\n\"Updating a XX.po file\" and other sections in \"po/README\" file.\n\n--\nJiang Xin\n"}]}