i18n: fix typos found during l10n for git 2.22.0

Fix 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>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index 2068b1c06ed900a703012f5d4afd1bbecd868435..a654d46f6a93de96d85706c7373ef0d617081a21 100644 (file)
--- 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 \"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"),
                             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 a1bf4f68c77d9e3b46fe2008a00c21b08b754060..051f26629d7b9f6679e47f6dc353f09c16c377ae 100644 (file)
--- 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))
                        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
                        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);
 
                        ref = alloc_ref(name);
                        oidcpy(&ref->old_oid, &old_oid);