Skip to content

Commit daf9f64

Browse files
vascoolgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8a0de58 commit daf9f64

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

builtin/pull.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,10 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
475475
fprintf(stderr, "\n");
476476
fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
477477
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);
482482
} else
483483
fprintf_ln(stderr, _("Your configuration specifies to merge with the ref '%s'\n"
484484
"from the remote, but no such ref was fetched."),

0 commit comments

Comments
 (0)