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

[PATCH/RFC 6/7] i18n: mark checkout --detach messages for translation

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Apr 10, 2011, 19:34 UTC
Message-ID
<1302464048-21806-7-git-send-email-avarab@gmail.com>
In-Reply-To
<1302464048-21806-1-git-send-email-avarab@gmail.com>

Mark messages added in v1.7.5-rc0~117^2~2 (checkout: introduce --detach synonym for "git checkout foo^{commit}") by Junio C Hamano for translation.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 builtin/checkout.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index eece5d6..0b65edd 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -961,9 +961,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 		die (_("--patch is incompatible with all other options"));
 
 	if (opts.force_detach && (opts.new_branch || opts.new_orphan_branch))
-		die("--detach cannot be used with -b/-B/--orphan");
+		die(_("--detach cannot be used with -b/-B/--orphan"));
 	if (opts.force_detach && 0 < opts.track)
-		die("--detach cannot be used with -t");
+		die(_("--detach cannot be used with -t"));
 
 	/* --track without -b should DWIM */
 	if (0 < opts.track && !opts.new_branch) {
@@ -1043,7 +1043,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 		}
 
 		if (opts.force_detach)
-			die("git checkout: --detach does not take a path argument");
+			die(_("git checkout: --detach does not take a path argument"));
 
 		if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
 			die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\nchecking out of the index."));
-- 
1.7.4.1
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 14 of 21 in “i18n: mark missing C messages”
  1. 0/7 i18n: mark missing C messagesÆvar Arnfjörð Bjarmason, Apr 10, 2011
  2. 1/7 i18n: mark init-db messages for translationÆvar Arnfjörð Bjarmason, Apr 10, 2011
  3. Junio C HamanoApr 12, 2011
  4. Junio C HamanoApr 12, 2011
  5. Ævar Arnfjörð BjarmasonApr 12, 2011
  6. Junio C HamanoApr 12, 2011
  7. Junio C HamanoApr 12, 2011
  8. Junio C HamanoApr 12, 2011
  9. i18n: use test_i18n{grep,cmp} in t7508Junio C Hamano, Apr 14, 2011
  10. 2/7 i18n: mark merge "Could not read from" message for translationÆvar Arnfjörð Bjarmason, Apr 10, 2011
  11. 3/7 i18n: mark merge "upstream" messages for translationÆvar Arnfjörð Bjarmason, Apr 10, 2011
  12. 4/7 i18n: mark merge CHERRY_PICK_HEAD messages for translationÆvar Arnfjörð Bjarmason, Apr 10, 2011
  13. 5/7 i18n: mark clone nonexistent repository message for translationÆvar Arnfjörð Bjarmason, Apr 10, 2011
  14. 6/7 i18n: mark checkout --detach messages for translationÆvar Arnfjörð Bjarmason, Apr 10, 2011
  15. 7/7 i18n: mark checkout plural warning for translationÆvar Arnfjörð Bjarmason, Apr 10, 2011
  16. Junio C HamanoApr 12, 2011
  17. Ævar Arnfjörð BjarmasonApr 12, 2011
  18. Junio C HamanoApr 12, 2011
  19. Ævar Arnfjörð BjarmasonApr 13, 2011
  20. Junio C HamanoApr 13, 2011
  21. Junio C HamanoApr 12, 2011

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.