From: Jiang Xin <worldhello.net@gmail.com>
Date: Wed, 1 Feb 2012 17:20:30 +0000 (+0800)
Subject: i18n: git-commit whence_s "merge/cherry-pick" message
X-Git-Tag: v1.7.9.2~28^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be39de2b262bfcd440ed81b4de33711eb8a37cf4;p=git.git

i18n: git-commit whence_s "merge/cherry-pick" message

Mark the "merge/cherry-pick" messages in whence_s for translation.
These messages returned from whence_s function are used as argument
to build other messages.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/commit.c b/builtin/commit.c
index eba1377eb..470b4a4e8 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -196,16 +196,16 @@ static void determine_whence(struct wt_status *s)
 
 static const char *whence_s(void)
 {
-	char *s = "";
+	const char *s = "";
 
 	switch (whence) {
 	case FROM_COMMIT:
 		break;
 	case FROM_MERGE:
-		s = "merge";
+		s = _("merge");
 		break;
 	case FROM_CHERRY_PICK:
-		s = "cherry-pick";
+		s = _("cherry-pick");
 		break;
 	}