Merge branch 'ja/i18n-fix-for-2.36'
Fixes to some localizable strings.
* ja/i18n-fix-for-2.36:
i18n: fix some badly formatted i18n strings
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 0b8b226..2c87ef9 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -3082,7 +3082,7 @@
OPT_END()
};
const char *const usage[] = {
- N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"),
+ N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"),
NULL
};
diff --git a/git-send-email.perl b/git-send-email.perl
index a98460b..5861e99 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -2096,10 +2096,9 @@
chdir($cwd_save) or die("chdir: $!");
}
if ($hook_error) {
- $hook_error = sprintf(__("fatal: %s: rejected by %s hook\n" .
- $hook_error . "\n" .
- "warning: no patches were sent\n"),
- $fn, $hook_name);
+ $hook_error = sprintf(
+ __("fatal: %s: rejected by %s hook\n%s\nwarning: no patches were sent\n"),
+ $fn, $hook_name, $hook_error);
die $hook_error;
}
}
