All of lore.kernel.org
 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 4/7] l10n: builtin/pull.c: mark strings for translation
Date: Fri,  8 Apr 2016 20:02:42 +0000	[thread overview]
Message-ID: <1460145765-7454-4-git-send-email-vascomalmeida@sapo.pt> (raw)
In-Reply-To: <1460145765-7454-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 10eff03..a99d6b9 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -458,13 +458,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 <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)
@@ -473,7 +473,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 <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.1.4

  parent reply	other threads:[~2016-04-08 20:10 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-08 20:02 [PATCH 1/7] l10n: index-pack: use plural string instead of normal one Vasco Almeida
2016-04-08 20:02 ` [PATCH 2/7] l10n: unpack-trees: mark strings for translation Vasco Almeida
2016-04-08 20:23   ` Junio C Hamano
2016-04-09 12:19     ` Vasco Almeida
2016-04-08 20:02 ` [PATCH 3/7] l10n: git-parse-remote.sh: " Vasco Almeida
2016-04-08 20:30   ` Junio C Hamano
2016-04-08 20:02 ` Vasco Almeida [this message]
2016-04-08 20:33   ` [PATCH 4/7] l10n: builtin/pull.c: " Junio C Hamano
2016-04-09 12:34     ` Vasco Almeida
2016-04-08 20:02 ` [PATCH 5/7] l10n: builtin/pull.c: split strings marked " Vasco Almeida
2016-04-08 20:02 ` [PATCH 6/7] l10n: mv.c: add a comma ',' to string Vasco Almeida
2016-04-08 20:35   ` Junio C Hamano
2016-04-08 20:02 ` [PATCH 7/7] l10n: builtin/branch.c: mark option for translation Vasco Almeida
2016-04-08 20:26 ` [PATCH 1/7] l10n: index-pack: use plural string instead of normal one Junio C Hamano

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=1460145765-7454-4-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.