From: "Jean-Noël Avila" <jn.avila@free.fr>
To: git@vger.kernel.org
Cc: "Jean-Noël Avila" <jn.avila@free.fr>
Subject: [PATCH] Fix typos in translatable strings for v2.21.0
Date: Sat, 9 Feb 2019 22:30:44 +0100 [thread overview]
Message-ID: <20190209213044.29539-1-jn.avila@free.fr> (raw)
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
builtin/bisect--helper.c | 4 ++--
builtin/fetch.c | 2 +-
builtin/rebase.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index c1cff32661..e7325fe37f 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -173,7 +173,7 @@ static int bisect_reset(const char *commit)
argv_array_clear(&argv);
return error(_("could not check out original"
" HEAD '%s'. Try 'git bisect"
- "reset <commit>'."), branch.buf);
+ " reset <commit>'."), branch.buf);
}
argv_array_clear(&argv);
}
@@ -646,7 +646,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
OPT_BOOL(0, "no-checkout", &no_checkout,
N_("update BISECT_HEAD instead of checking out the current commit")),
OPT_BOOL(0, "no-log", &nolog,
- N_("no log for BISECT_WRITE ")),
+ N_("no log for BISECT_WRITE")),
OPT_END()
};
struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 5a09fe24cd..b620fd54b4 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1480,7 +1480,7 @@ static inline void fetch_one_setup_partial(struct remote *remote)
if (strcmp(remote->name, repository_format_partial_clone)) {
if (filter_options.choice)
die(_("--filter can only be used with the remote "
- "configured in extensions.partialclone"));
+ "configured in extensions.partialClone"));
return;
}
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 96efd40901..1c39abc02e 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1434,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
}
if (options.reschedule_failed_exec && !is_interactive(&options))
- die(_("--reschedule-failed-exec requires an interactive rebase"));
+ die(_("%s requires an interactive rebase", "--reschedule-failed-exec"));
if (options.git_am_opts.argc) {
/* all am options except -q are compatible only with --am */
--
2.21.0.rc0
next reply other threads:[~2019-02-09 21:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-09 21:30 Jean-Noël Avila [this message]
2019-02-09 21:33 ` [PATCH] Fix typos in translatable strings for v2.21.0 Jean-Noël AVILA
2019-02-11 6:44 ` Jean-Noël Avila
2019-02-11 8:09 ` Jiang Xin
2019-02-11 8:50 ` Jean-Noël Avila
2019-02-11 20:57 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190209213044.29539-1-jn.avila@free.fr \
--to=jn.avila@free.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).