i18n: fix some badly formatted i18n strings
String in submodule--helper is not correctly formatting placeholders. The string in git-send-email is partial. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jean-Noël Avila committed
Apr 11, 2022 at 19:23 UTC
af15f84da731e59197af147497868f684b8c5650
2 files changed
+4
-5
builtin/submodule--helper.c
+1
-1
@@ -3082,7 +3082,7 @@ static int module_create_branch(int argc, const char **argv, const char *prefix)
3082
OPT_END()
3083
};
3084
const char *const usage[] = {
3085
- N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"),
3085
+ N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"),
3086
NULL
3087
};
3088
git-send-email.perl
+3
-4
@@ -2096,10 +2096,9 @@ sub validate_patch {
2096
chdir($cwd_save) or die("chdir: $!");
2097
}
2098
if ($hook_error) {
2099
- $hook_error = sprintf(__("fatal: %s: rejected by %s hook\n" .
2100
- $hook_error . "\n" .
2101
- "warning: no patches were sent\n"),
2102
- $fn, $hook_name);
2099
+ $hook_error = sprintf(
2100
+ __("fatal: %s: rejected by %s hook\n%s\nwarning: no patches were sent\n"),
2101
+ $fn, $hook_name, $hook_error);
2102
die $hook_error;
2103
}
2104
}