зеркало из https://github.com/microsoft/git.git
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:
Родитель
ab1f2765f7
Коммит
af15f84da7
|
@ -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
|
||||
};
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче