git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alangi Derick <alangiderick@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Subject: [PATCH] fix a translation error in diff-tree
Date: Mon, 4 May 2015 12:22:33 +0100	[thread overview]
Message-ID: <55476653.e33ac20a.753d.ffffc3cc@mx.google.com> (raw)

Signed-off-by: Alangi Derick <alangiderick@gmail.com>
---
 builtin/diff-tree.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index 12b683d..602b5f9 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -45,7 +45,7 @@ static int stdin_diff_trees(struct tree *tree1, char *line, int len)
 	unsigned char sha1[20];
 	struct tree *tree2;
 	if (len != 82 || !isspace(line[40]) || get_sha1_hex(line + 41, sha1))
-		return error("Need exactly two trees, separated by a space");
+		return error(_("Need exactly two trees, separated by a space"));
 	tree2 = lookup_tree(sha1);
 	if (!tree2 || parse_tree(tree2))
 		return -1;
@@ -75,7 +75,7 @@ static int diff_tree_stdin(char *line)
 		return stdin_diff_commit((struct commit *)obj, line, len);
 	if (obj->type == OBJ_TREE)
 		return stdin_diff_trees((struct tree *)obj, line, len);
-	error("Object %s is a %s, not a commit or tree",
+	error(_("Object %s is a %s, not a commit or tree"),
 	      sha1_to_hex(sha1), typename(obj->type));
 	return -1;
 }
-- 
2.4.0.5.g7a7787e.dirty

             reply	other threads:[~2015-05-04 12:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-04 11:22 Alangi Derick [this message]
2015-05-04 17:47 ` [PATCH] fix a translation error in diff-tree 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=55476653.e33ac20a.753d.ffffc3cc@mx.google.com \
    --to=alangiderick@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 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 NNTP newsgroup(s).