Fix typos in translatable strings for v2.21.0

jnavila · gitster · commit 32ceace39fa2 · 2019-02-11T12:58:06.000-08:00
Signed-off-by: Jean-Noël Avila &lt;jn.avila@free.fr&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -1480,7 +1480,7 @@ static inline void fetch_one_setup_partial(struct remote *remote)`
`1480`	`1480`	`if (strcmp(remote->name, repository_format_partial_clone)) {`
`1481`	`1481`	`if (filter_options.choice)`
`1482`	`1482`	`die(_("--filter can only be used with the remote "`
`1483`		`- "configured in extensions.partialclone"));`
	`1483`	`+ "configured in extensions.partialClone"));`
`1484`	`1484`	`return;`
`1485`	`1485`	`}`
`1486`	`1486`
Original file line number	Diff line number	Diff line change
`@@ -1434,7 +1434,7 @@ int cmd_rebase(int argc, const char *argv, const char prefix)`
`1434`	`1434`	`}`
`1435`	`1435`
`1436`	`1436`	`if (options.reschedule_failed_exec && !is_interactive(&options))`
`1437`		`- die(_("--reschedule-failed-exec requires an interactive rebase"));`
	`1437`	`+ die(_("%s requires an interactive rebase"), "--reschedule-failed-exec");`
`1438`	`1438`
`1439`	`1439`	`if (options.git_am_opts.argc) {`
`1440`	`1440`	`/* all am options except -q are compatible only with --am */`