i18n: git-commit whence_s "merge/cherry-pick" message
authorJiang Xin <worldhello.net@gmail.com>
Wed, 1 Feb 2012 17:20:30 +0000 (01:20 +0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 23:46:24 +0000 (15:46 -0800)
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>
builtin/commit.c

index eba1377eb32c02e57c46364c381df940afa66048..470b4a4e8c704b995124ebd08bcab225a62601e8 100644 (file)
@@ -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;
        }