i18n: builtin/pull.c: split strings marked for translation
Split string "If you wish to set tracking information for this branch you can do so with:\n" to match occurring string in git-parse-remote.sh. In this case, the translator handles it only once. On the other hand, the translations of the string that were already made are mark as fuzzy and the translator needs to correct it herself. 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
daf9f6499f853804270da4456664c2ff576774de
1 file changed
+4
-4
builtin/pull.c
+4
-4
@@ -475,10 +475,10 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
475
fprintf(stderr, "\n");
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"
480
- " git branch --set-upstream-to=%s/<branch> %s\n"),
481
- remote_name, curr_branch->name);
478
+ fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:"));
479
+ fprintf(stderr, "\n");
480
+ fprintf_ln(stderr, " git branch --set-upstream-to=%s/%s %s\n",
481
+ remote_name, _("<branch>"), curr_branch->name);
482
} else
483
fprintf_ln(stderr, _("Your configuration specifies to merge with the ref '%s'\n"
484
"from the remote, but no such ref was fetched."),