git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 4/7] l10n: builtin/pull.c: mark strings for translation

From
Vasco Almeida <vascomalmeida@sapo.pt>
Date
Apr 8, 2016, 20:02 UTC
Message-ID
<1460145765-7454-4-git-send-email-vascomalmeida@sapo.pt>
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
Previous: Junio C HamanoNext: Junio C Hamano
Message 7 of 14 in “l10n: index-pack: use plural string instead of normal one”
  1. 1/7 l10n: index-pack: use plural string instead of normal oneVasco Almeida, Apr 8, 2016
  2. 2/7 l10n: unpack-trees: mark strings for translationVasco Almeida, Apr 8, 2016
  3. Junio C HamanoApr 8, 2016
  4. Vasco AlmeidaApr 9, 2016
  5. 3/7 l10n: git-parse-remote.sh: mark strings for translationVasco Almeida, Apr 8, 2016
  6. Junio C HamanoApr 8, 2016
  7. 4/7 l10n: builtin/pull.c: mark strings for translationVasco Almeida, Apr 8, 2016
  8. Junio C HamanoApr 8, 2016
  9. Vasco AlmeidaApr 9, 2016
  10. 5/7 l10n: builtin/pull.c: split strings marked for translationVasco Almeida, Apr 8, 2016
  11. 6/7 l10n: mv.c: add a comma ',' to stringVasco Almeida, Apr 8, 2016
  12. Junio C HamanoApr 8, 2016
  13. 7/7 l10n: builtin/branch.c: mark option for translationVasco Almeida, Apr 8, 2016
  14. Junio C HamanoApr 8, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.