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 v2 5/7] i18n: builtin/pull.c: split strings marked for translation
Date: Sat, 9 Apr 2016 20:38:42 +0000 [thread overview]
Message-ID: <1460234324-13506-5-git-send-email-vascomalmeida@sapo.pt> (raw)
In-Reply-To: <1460234324-13506-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 9e8883c..617893c 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."),
--
2.1.4
next prev parent reply other threads:[~2016-04-09 20:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-09 20:38 [PATCH v2 1/7] i18n: index-pack: use plural string instead of normal one Vasco Almeida
2016-04-09 20:38 ` [PATCH v2 2/7] i18n: unpack-trees: mark strings for translation Vasco Almeida
2016-04-09 20:38 ` [PATCH v2 3/7] i18n: git-parse-remote.sh: " Vasco Almeida
2016-04-12 17:47 ` Junio C Hamano
2016-04-09 20:38 ` [PATCH v2 4/7] i18n: builtin/pull.c: " Vasco Almeida
2016-04-10 18:01 ` Junio C Hamano
2016-04-11 10:43 ` Vasco Almeida
2016-04-12 9:52 ` Duy Nguyen
2016-04-29 6:57 ` Jean-Noël Avila
2016-04-09 20:38 ` Vasco Almeida [this message]
2016-04-09 20:38 ` [PATCH v2 6/7] i18n: builtin/rm.c: remove a comma ',' from string Vasco Almeida
2016-04-09 20:38 ` [PATCH v2 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460234324-13506-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).