diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-08-20 19:32:22 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-20 12:23:18 -0700 |
| commit | f037dbf49c6c8ef66d7efda30dde01e2cafb57ff (patch) | |
| tree | 85dd6d826ea408b4ddc60ed53648955ef0dc9acb /builtin/merge-base.c | |
| parent | 373f9221749d71f44214c940ebecda6bb83bc6a0 (diff) | |
| download | git-f037dbf49c6c8ef66d7efda30dde01e2cafb57ff.tar.gz git-f037dbf49c6c8ef66d7efda30dde01e2cafb57ff.tar.xz | |
i18n: merge-base: mark parseopt strings for translation
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-base.c')
| -rw-r--r-- | builtin/merge-base.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/merge-base.c b/builtin/merge-base.c index 4f30f1b0c..2f223a664 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -23,9 +23,9 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all) } static const char * const merge_base_usage[] = { - "git merge-base [-a|--all] <commit> <commit>...", - "git merge-base [-a|--all] --octopus <commit>...", - "git merge-base --independent <commit>...", + N_("git merge-base [-a|--all] <commit> <commit>..."), + N_("git merge-base [-a|--all] --octopus <commit>..."), + N_("git merge-base --independent <commit>..."), NULL }; @@ -79,9 +79,9 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix) int reduce = 0; struct option options[] = { - OPT_BOOLEAN('a', "all", &show_all, "output all common ancestors"), - OPT_BOOLEAN(0, "octopus", &octopus, "find ancestors for a single n-way merge"), - OPT_BOOLEAN(0, "independent", &reduce, "list revs not reachable from others"), + OPT_BOOLEAN('a', "all", &show_all, N_("output all common ancestors")), + OPT_BOOLEAN(0, "octopus", &octopus, N_("find ancestors for a single n-way merge")), + OPT_BOOLEAN(0, "independent", &reduce, N_("list revs not reachable from others")), OPT_END() }; |