Skip to content

Commit 8a0de58

Browse files
vascoolgitster
authored andcommitted
i18n: builtin/pull.c: mark placeholders for translation
Some translations might also translate "<remote>" and "<branch>". Signed-off-by: Vasco Almeida <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 045fac5 commit 8a0de58

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

builtin/pull.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,13 +458,13 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
458458
fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
459459
fprintf_ln(stderr, _("See git-pull(1) for details."));
460460
fprintf(stderr, "\n");
461-
fprintf_ln(stderr, " git pull <remote> <branch>");
461+
fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
462462
fprintf(stderr, "\n");
463463
} else if (!curr_branch->merge_nr) {
464464
const char *remote_name = NULL;
465465

466466
if (for_each_remote(get_only_remote, &remote_name) || !remote_name)
467-
remote_name = "<remote>";
467+
remote_name = _("<remote>");
468468

469469
fprintf_ln(stderr, _("There is no tracking information for the current branch."));
470470
if (opt_rebase)
@@ -473,7 +473,7 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
473473
fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
474474
fprintf_ln(stderr, _("See git-pull(1) for details."));
475475
fprintf(stderr, "\n");
476-
fprintf_ln(stderr, " git pull <remote> <branch>");
476+
fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
477477
fprintf(stderr, "\n");
478478
fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:\n"
479479
"\n"

0 commit comments

Comments
 (0)