Fix typos in translatable strings for v2.21.0

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index c1cff3266114323f466133b98050f5aec71c5f91..e7325fe37f6148fd1ccd6fc5842bbc8f5022c306 100644 (file)
--- 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"
                        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);
        }
                }
                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,
                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 };
                OPT_END()
        };
        struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 5a09fe24cddac79bb66f90b0405f5bcc9855dbee..b620fd54b4e95cad77532ec3fe02e2ff1179c431 100644 (file)
--- 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 "
        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;
        }
 
                return;
        }
 

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 96efd40901dba9424e61775e3033622ceaaba388..7c7bc13e912aa8ba5d2c4dfa781fb74cd20ac6d4 100644 (file)
--- 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))
        }
 
        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 */
 
        if (options.git_am_opts.argc) {
                /* all am options except -q are compatible only with --am */