From patchwork Sun Jun 2 15:11:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 10971791 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CA8D014C0 for ; Sun, 2 Jun 2019 15:13:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B087428AB3 for ; Sun, 2 Jun 2019 15:13:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3E9C28AE0; Sun, 2 Jun 2019 15:13:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EC5328AB3 for ; Sun, 2 Jun 2019 15:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726290AbfFBPNk (ORCPT ); Sun, 2 Jun 2019 11:13:40 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:39839 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726168AbfFBPNk (ORCPT ); Sun, 2 Jun 2019 11:13:40 -0400 Received: by mail-pl1-f193.google.com with SMTP id g9so5950632plm.6 for ; Sun, 02 Jun 2019 08:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=T7dnR15q3Ha30UDfuZrZzYdkykzQGLAbNaO7785ayXw=; b=vdDp9CS6nTjD9CBr0/HS9WS1FMmh+QGZNvSgx74Q6yBjePIVHO0t3ky0r8zmZntJ1U 9d6veZTmYWOGKHP/000vdp2Wf4Q4RmlYc8laIXwWznaaNceHEp46NiWGNJ875cNYNvIW 6qnmkhZiVWI66OFyNWMmIUrHjArHeyBx/jDquD3jJa9B0yPqOsU7uPUiKBVcN6Abl3ek x1Z8AusD8ONRKXGADXZZ85ZKcMFxYwVA1ei215Lank1qI5l+r2CZb9pOiw81zZOKjSRJ 0zbD8yqxXdVX+IdjahT0jhK/Z6UI1EA1+RFkaUwNwynHqkZrbZkit5+qNt/Kx6BPWNGe h1ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=T7dnR15q3Ha30UDfuZrZzYdkykzQGLAbNaO7785ayXw=; b=NRaOD1owhXHoN1t3OEZgttLe0CZ2q6CByKvnrGhNx0LK9B29gPwFQLHbTaNgTe47DI j2paDIMUUF/JemlCjcLyS96fBQqaOuX1c4nEXaGAaqIpSm1wS9zFzAQGbH0arbXIL8dm TSJBbjVs2wLuvRGBX33A0YGJehYEwyAxHQ+MbzBo8cbH1F4PtMH46m3U8tThB2Ezae80 otj2gfRNtWz+BOUG5uyvI0i3axaG9oS7ILpNFFH93Rw0319icKBjxGzC1L5iJ785VXfQ ofdox9hPdJnWM/azBLk7ghD6wryuj8HGEs7gXORvwLyPQpHh8foIvGsOq3vm88yKLhOE 7H7g== X-Gm-Message-State: APjAAAWH0kMk9RGPuj9SLSdF1K+wiX/cegIgrjHKPVxDTJWUYk+G8LMF DDmvd+FLl5x1P0DEkUtNt/E= X-Google-Smtp-Source: APXvYqwEVWL9+YRXST20zBPf7Rq3l2wfclXbt0NuRpjxcFDZYOSsG9+HFVQukb9zD27F0W8tlvlgAg== X-Received: by 2002:a17:902:2bc9:: with SMTP id l67mr24335675plb.171.1559488419564; Sun, 02 Jun 2019 08:13:39 -0700 (PDT) Received: from localhost.localdomain ([2408:84e1:105:c5ce:65c5:bc73:cd52:9a5c]) by smtp.gmail.com with ESMTPSA id x13sm10552793pfa.154.2019.06.02.08.13.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Jun 2019 08:13:38 -0700 (PDT) From: Jiang Xin To: Junio C Hamano , Git List , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= , Johannes Schindelin Cc: Jiang Xin Subject: [PATCH] i18n: fix typos found during l10n for git 2.22.0 Date: Sun, 2 Jun 2019 23:11:22 +0800 Message-Id: <20190602151122.7512-1-worldhello.net@gmail.com> X-Mailer: git-send-email 2.22.0.rc2.14.g03eb6640cb.dirty MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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_(""), - 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_(""), 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);