diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-04-11 16:45:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-11 16:45:17 -0700 |
| commit | 33159949d2f23f30048ead5f9f78b05b21d93e40 (patch) | |
| tree | 86a9f02b331eea3d7a92751a8c29e27920464f24 | |
| parent | f1b50ec6f85883c483b344442c69cd3d88b38380 (diff) | |
| parent | af15f84da731e59197af147497868f684b8c5650 (diff) | |
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
| -rw-r--r-- | builtin/submodule--helper.c | 2 | ||||
| -rwxr-xr-x | git-send-email.perl | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 0b8b226c8f..2c87ef9364 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -3082,7 +3082,7 @@ static int module_create_branch(int argc, const char **argv, const char *prefix) 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 a98460bdb9..5861e99a6e 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -2096,10 +2096,9 @@ sub validate_patch { 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; } } |