diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2012-02-02 01:20:30 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-02-01 15:46:24 -0800 |
| commit | be39de2b262bfcd440ed81b4de33711eb8a37cf4 (patch) | |
| tree | 012be41eacb74025ab6ba1c23937a87f489dfe07 | |
| parent | Git 1.7.9 (diff) | |
| download | tgif-be39de2b262bfcd440ed81b4de33711eb8a37cf4.tar.xz | |
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>
| -rw-r--r-- | builtin/commit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index eba1377eb3..470b4a4e8c 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; } |