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>
Jiang Xin committed
Feb 2, 2012 at 01:20 UTC
be39de2b262bfcd440ed81b4de33711eb8a37cf4
1 file changed
+3
-3
builtin/commit.c
+3
-3
@@ -196,16 +196,16 @@ static void determine_whence(struct wt_status *s)
196
197
static const char *whence_s(void)
198
{
199
- char *s = "";
199
+ const char *s = "";
200
201
switch (whence) {
202
case FROM_COMMIT:
203
break;
204
case FROM_MERGE:
205
- s = "merge";
205
+ s = _("merge");
206
break;
207
case FROM_CHERRY_PICK:
208
- s = "cherry-pick";
208
+ s = _("cherry-pick");
209
break;
210
}
211