зеркало из https://github.com/microsoft/git.git
i18n: builtin/pull.c: mark placeholders for translation
Some translations might also translate "<remote>" and "<branch>". Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
045fac5845
Коммит
8a0de58a2a
|
@ -458,13 +458,13 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
|
|||
fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
|
||||
fprintf_ln(stderr, _("See git-pull(1) for details."));
|
||||
fprintf(stderr, "\n");
|
||||
fprintf_ln(stderr, " git pull <remote> <branch>");
|
||||
fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
|
||||
fprintf(stderr, "\n");
|
||||
} else if (!curr_branch->merge_nr) {
|
||||
const char *remote_name = NULL;
|
||||
|
||||
if (for_each_remote(get_only_remote, &remote_name) || !remote_name)
|
||||
remote_name = "<remote>";
|
||||
remote_name = _("<remote>");
|
||||
|
||||
fprintf_ln(stderr, _("There is no tracking information for the current branch."));
|
||||
if (opt_rebase)
|
||||
|
@ -473,7 +473,7 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
|
|||
fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
|
||||
fprintf_ln(stderr, _("See git-pull(1) for details."));
|
||||
fprintf(stderr, "\n");
|
||||
fprintf_ln(stderr, " git pull <remote> <branch>");
|
||||
fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
|
||||
fprintf(stderr, "\n");
|
||||
fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:\n"
|
||||
"\n"
|
||||
|
|
Загрузка…
Ссылка в новой задаче