diff options
| author |  Vasco Almeida <vascomalmeida@sapo.pt> | 2016-04-19 13:19:22 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-19 12:07:49 -0700 |
| commit | daf9f6499f853804270da4456664c2ff576774de (patch) | |
| tree | 5febed46ac80852f5434910dfd500026a123b213 | |
| parent | i18n: builtin/pull.c: mark placeholders for translation (diff) | |
| download | tgif-daf9f6499f853804270da4456664c2ff576774de.tar.xz | |
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>
| -rw-r--r-- | builtin/pull.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 61079f10a2..6214af9b10 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -475,10 +475,10 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs fprintf(stderr, "\n"); 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" - " git branch --set-upstream-to=%s/<branch> %s\n"), - remote_name, curr_branch->name); + fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:")); + fprintf(stderr, "\n"); + fprintf_ln(stderr, " git branch --set-upstream-to=%s/%s %s\n", + remote_name, _("<branch>"), curr_branch->name); } else fprintf_ln(stderr, _("Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched."), |