* [PATCH] Fix typos in translatable strings for v2.21.0
@ 2019-02-09 21:30 Jean-Noël Avila
2019-02-09 21:33 ` Jean-Noël AVILA
2019-02-11 6:44 ` Jean-Noël Avila
0 siblings, 2 replies; 6+ messages in thread
From: Jean-Noël Avila @ 2019-02-09 21:30 UTC (permalink / raw)
To: git; +Cc: Jean-Noël Avila
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix typos in translatable strings for v2.21.0
2019-02-09 21:30 [PATCH] Fix typos in translatable strings for v2.21.0 Jean-Noël Avila
@ 2019-02-09 21:33 ` Jean-Noël AVILA
2019-02-11 6:44 ` Jean-Noël Avila
1 sibling, 0 replies; 6+ messages in thread
From: Jean-Noël AVILA @ 2019-02-09 21:33 UTC (permalink / raw)
To: git
Please forget this one. Will re-submit.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Fix typos in translatable strings for v2.21.0
2019-02-09 21:30 [PATCH] Fix typos in translatable strings for v2.21.0 Jean-Noël Avila
2019-02-09 21:33 ` Jean-Noël AVILA
@ 2019-02-11 6:44 ` Jean-Noël Avila
2019-02-11 8:09 ` Jiang Xin
1 sibling, 1 reply; 6+ messages in thread
From: Jean-Noël Avila @ 2019-02-11 6:44 UTC (permalink / raw)
To: git; +Cc: Jean-Noël Avila
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..7c7bc13e91 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix typos in translatable strings for v2.21.0
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
0 siblings, 1 reply; 6+ messages in thread
From: Jiang Xin @ 2019-02-11 8:09 UTC (permalink / raw)
To: Jean-Noël Avila, Junio C Hamano; +Cc: Git List
Jean-Noël Avila <jn.avila@free.fr> 于2019年2月11日周一 下午2:48写道：
>
> 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(-)
This re-roll is v2 (forgot suffix v2 in subject), and LGTM.
Difference between v1 and v2:
- die(_("--reschedule-failed-exec requires an
interactive rebase"));
-+ die(_("%s requires an interactive rebase",
"--reschedule-failed-exec"));
++ die(_("%s requires an interactive rebase"),
"--reschedule-failed-exec");
>
> 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);
fixed typo: git bisectreset -> git bisect reset
> }
> 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")),
strip trailing writespace.
> 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"));
Use camelcase for config variable name.
> return;
> }
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 96efd40901..7c7bc13e91 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");
Reuse l10n string ("%s requires an interactive rebase") defined in
builtin/rebase.c:121:
case REBASE_AM:
die(_("%s requires an interactive rebase"), option);
>
> if (options.git_am_opts.argc) {
> /* all am options except -q are compatible only with --am */
> --
> 2.21.0.rc0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix typos in translatable strings for v2.21.0
2019-02-11 8:09 ` Jiang Xin
@ 2019-02-11 8:50 ` Jean-Noël Avila
2019-02-11 20:57 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Jean-Noël Avila @ 2019-02-11 8:50 UTC (permalink / raw)
To: Jiang Xin, Junio C Hamano; +Cc: Git List
On 11 février 2019, Jiang Xin wrote:
> Jean-Noël Avila <jn.avila@free.fr> 于2019年2月11日周一 下午2:48写道：
>> 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(-)
> This re-roll is v2 (forgot suffix v2 in subject), and LGTM.
> Difference between v1 and v2:
>
> - die(_("--reschedule-failed-exec requires an
> interactive rebase"));
> -+ die(_("%s requires an interactive rebase",
> "--reschedule-failed-exec"));
> ++ die(_("%s requires an interactive rebase"),
> "--reschedule-failed-exec");
Thanks for reviewing. The first submission was too hasty and did not
even compile.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix typos in translatable strings for v2.21.0
2019-02-11 8:50 ` Jean-Noël Avila
@ 2019-02-11 20:57 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2019-02-11 20:57 UTC (permalink / raw)
To: Jean-Noël Avila; +Cc: Jiang Xin, Git List
Jean-Noël Avila <jn.avila@free.fr> writes:
> On 11 février 2019, Jiang Xin wrote:
>
>> Jean-Noël Avila <jn.avila@free.fr> 于2019年2月11日周一 下午2:48写道：
>>> 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(-)
>> This re-roll is v2 (forgot suffix v2 in subject), and LGTM.
>> Difference between v1 and v2:
>>
>> - die(_("--reschedule-failed-exec requires an
>> interactive rebase"));
>> -+ die(_("%s requires an interactive rebase",
>> "--reschedule-failed-exec"));
>> ++ die(_("%s requires an interactive rebase"),
>> "--reschedule-failed-exec");
> Thanks for reviewing. The first submission was too hasty and did not
> even compile.
Thanks, both. Will queue.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-02-11 20:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-09 21:30 [PATCH] Fix typos in translatable strings for v2.21.0 Jean-Noël Avila
2019-02-09 21:33 ` 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
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).