opensourcemirror
/
git
mirror of https://github.com/git/git.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Jean-Noël Avila 2022-04-11 19:23:30 +00:00 committed by Junio C Hamano
parent ab1f2765f7
commit af15f84da7
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() OPT_END()
}; };
const char *const usage[] = { 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 NULL
}; };

7
git-send-email.perl
View File

@ -2096,10 +2096,9 @@ sub validate_patch {
chdir($cwd_save) or die("chdir: $!"); chdir($cwd_save) or die("chdir: $!");
} }
if ($hook_error) { if ($hook_error) {
$hook_error = sprintf(__("fatal: %s: rejected by %s hook\n" . $hook_error = sprintf(
$hook_error . "\n" . __("fatal: %s: rejected by %s hook\n%s\nwarning: no patches were sent\n"),
"warning: no patches were sent\n"), $fn, $hook_name, $hook_error);
$fn, $hook_name);
die $hook_error; die $hook_error;
} }
} }