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>
Vasco Almeida committed
Apr 19, 2016 at 13:19 UTC
8a0de58a2a0cfd64944c2de9df184253286b7eac
1 file changed
+3
-3
builtin/pull.c
+3
-3
@@ -458,13 +458,13 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
458
fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
459
fprintf_ln(stderr, _("See git-pull(1) for details."));
460
fprintf(stderr, "\n");
461
- fprintf_ln(stderr, " git pull <remote> <branch>");
461
+ fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
462
fprintf(stderr, "\n");
463
} else if (!curr_branch->merge_nr) {
464
const char *remote_name = NULL;
465
466
if (for_each_remote(get_only_remote, &remote_name) || !remote_name)
467
- remote_name = "<remote>";
467
+ remote_name = _("<remote>");
468
469
fprintf_ln(stderr, _("There is no tracking information for the current branch."));
470
if (opt_rebase)
@@ -473,7 +473,7 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
473
fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
474
fprintf_ln(stderr, _("See git-pull(1) for details."));
475
fprintf(stderr, "\n");
476
- fprintf_ln(stderr, " git pull <remote> <branch>");
476
+ fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
477
fprintf(stderr, "\n");
478
fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:\n"
479
"\n"