Git development
 help / color / mirror / Atom feed
From: Vasco Almeida <vascomalmeida@sapo.pt>
To: git@vger.kernel.org
Cc: Vasco Almeida <vascomalmeida@sapo.pt>
Subject: [PATCH v4 4/7] i18n: builtin/pull.c: mark placeholders for translation
Date: Thu, 12 May 2016 19:59:25 +0000	[thread overview]
Message-ID: <1463083168-29213-5-git-send-email-vascomalmeida@sapo.pt> (raw)
In-Reply-To: <1463083168-29213-1-git-send-email-vascomalmeida@sapo.pt>
In-Reply-To: <1461071964-323-1-git-send-email-vascomalmeida@sapo.pt>

Some translations might also translate "<remote>" and "<branch>".

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
---
 builtin/pull.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/pull.c b/builtin/pull.c
index 596b92f..96b98ea 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -478,13 +478,13 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
 			fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
 		fprintf_ln(stderr, _("See git-pull(1) for details."));
 		fprintf(stderr, "\n");
-		fprintf_ln(stderr, "    git pull <remote> <branch>");
+		fprintf_ln(stderr, "    git pull %s %s", _("<remote>"), _("<branch>"));
 		fprintf(stderr, "\n");
 	} else if (!curr_branch->merge_nr) {
 		const char *remote_name = NULL;
 
 		if (for_each_remote(get_only_remote, &remote_name) || !remote_name)
-			remote_name = "<remote>";
+			remote_name = _("<remote>");
 
 		fprintf_ln(stderr, _("There is no tracking information for the current branch."));
 		if (opt_rebase)
@@ -493,7 +493,7 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
 			fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
 		fprintf_ln(stderr, _("See git-pull(1) for details."));
 		fprintf(stderr, "\n");
-		fprintf_ln(stderr, "    git pull <remote> <branch>");
+		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"
-- 
2.7.3

  parent reply	other threads:[~2016-05-12 20:00 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 ` [PATCH v3 5/7] i18n: builtin/pull.c: split strings marked " Vasco Almeida
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 ` Vasco Almeida [this message]
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=1463083168-29213-5-git-send-email-vascomalmeida@sapo.pt \
    --to=vascomalmeida@sapo.pt \
    --cc=git@vger.kernel.org \
    /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