Git development
 help / color / mirror / Atom feed
From: Vasco Almeida <vascomalmeida@sapo.pt>
To: git@vger.kernel.org
Cc: Vasco Almeida <vascomalmeida@sapo.pt>,
	Jiang Xin <worldhello.net@gmail.com>
Subject: [PATCH v3 5/7] i18n: builtin/pull.c: split strings marked for translation
Date: Tue, 19 Apr 2016 13:19:22 +0000	[thread overview]
Message-ID: <1461071964-323-5-git-send-email-vascomalmeida@sapo.pt> (raw)
In-Reply-To: <1461071964-323-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 c199f28..2ec5a9b 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -491,10 +491,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.1.4

  parent reply	other threads:[~2016-04-19 13:20 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-19 13:19 [PATCH v3 1/7] i18n: index-pack: use plural string instead of normal one Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 2/7] i18n: unpack-trees: mark strings for translation Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 3/7] i18n: git-parse-remote.sh: " Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 4/7] i18n: builtin/pull.c: mark placeholders " Vasco Almeida
2016-04-19 13:19 ` Vasco Almeida [this message]
2016-04-19 13:19 ` [PATCH v3 6/7] i18n: builtin/rm.c: remove a comma ',' from string Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 7/7] i18n: builtin/branch.c: mark option for translation Vasco Almeida
2016-04-19 19:06 ` [PATCH v3 1/7] i18n: index-pack: use plural string instead of normal one Junio C Hamano
2016-04-19 19:46   ` Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 0/7] i18n miscellaneous updates Vasco Almeida
2016-05-12 21:10   ` Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 1/7] i18n: index-pack: use plural string instead of normal one Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 2/7] i18n: unpack-trees: mark strings for translation Vasco Almeida
2016-05-12 22:50   ` Junio C Hamano
2016-05-12 23:16     ` [PATCH] i18n: unpack-trees: avoid substituting only a verb in sentences Vasco Almeida
2016-05-12 23:28       ` Junio C Hamano
2016-05-12 23:30         ` Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 3/7] i18n: git-parse-remote.sh: mark strings for translation Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 4/7] i18n: builtin/pull.c: mark placeholders " Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 5/7] i18n: builtin/pull.c: split strings marked " Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 6/7] i18n: builtin/rm.c: remove a comma ',' from string Vasco Almeida
2016-05-12 21:05   ` Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 7/7] i18n: builtin/branch.c: mark option for translation Vasco Almeida

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1461071964-323-5-git-send-email-vascomalmeida@sapo.pt \
    --to=vascomalmeida@sapo.pt \
    --cc=git@vger.kernel.org \
    --cc=worldhello.net@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox