mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 18:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ja/i18n-fix-for-2.36'

Browse Source 
Fixes to some localizable strings.

* ja/i18n-fix-for-2.36:
  i18n: fix some badly formatted i18n strings
This commit is contained in:
Junio C Hamano 2022-04-11 16:45:17 -07:00
commit 33159949d2
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/submodule--helper.c
View File

@ -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
};

7
git-send-email.perl
View File

@ -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;
}
}