[PATCH v4 5/7] i18n: builtin/pull.c: split strings marked for translation
- From
Vasco Almeida <vascomalmeida@sapo.pt>
- Date
- May 12, 2016, 19:59 UTC
- Message-ID
- <1463083168-29213-6-git-send-email-vascomalmeida@sapo.pt>
- In-Reply-To
- <1463083168-29213-1-git-send-email-vascomalmeida@sapo.pt>
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> --- builtin/pull.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c index 96b98ea..1d7333c 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -495,10 +495,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."),
-- 2.7.3