зеркало из https://github.com/microsoft/git.git
i18n: git-fetch split up "(non-fast-forward)" message
Split up the "(non-fast-forward)" message from printf directives and make it translatable. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
f7b3742a6b
Коммит
321a153c5a
|
@ -317,9 +317,9 @@ static int update_local_ref(struct ref *ref,
|
|||
r ? _("unable to update local ref") : _("forced update"));
|
||||
return r;
|
||||
} else {
|
||||
sprintf(display, "! %-*s %-*s -> %s (non-fast-forward)",
|
||||
TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
|
||||
pretty_ref);
|
||||
sprintf(display, "! %-*s %-*s -> %s %s",
|
||||
TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), REFCOL_WIDTH, remote,
|
||||
pretty_ref, _("(non-fast-forward)"));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче