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>
Nguyễn Thái Ngọc Duy committed
Aug 20, 2012 at 19:32 UTC
f037dbf49c6c8ef66d7efda30dde01e2cafb57ff
1 file changed
+6
-6
builtin/merge-base.c
+6
-6
@@ -23,9 +23,9 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
23
}
24
25
static const char * const merge_base_usage[] = {
26
- "git merge-base [-a|--all] <commit> <commit>...",
27
- "git merge-base [-a|--all] --octopus <commit>...",
28
- "git merge-base --independent <commit>...",
26
+ N_("git merge-base [-a|--all] <commit> <commit>..."),
27
+ N_("git merge-base [-a|--all] --octopus <commit>..."),
28
+ N_("git merge-base --independent <commit>..."),
29
NULL
30
};
31
@@ -79,9 +79,9 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
79
int reduce = 0;
80
81
struct option options[] = {
82
- OPT_BOOLEAN('a', "all", &show_all, "output all common ancestors"),
83
- OPT_BOOLEAN(0, "octopus", &octopus, "find ancestors for a single n-way merge"),
84
- OPT_BOOLEAN(0, "independent", &reduce, "list revs not reachable from others"),
82
+ OPT_BOOLEAN('a', "all", &show_all, N_("output all common ancestors")),
83
+ OPT_BOOLEAN(0, "octopus", &octopus, N_("find ancestors for a single n-way merge")),
84
+ OPT_BOOLEAN(0, "independent", &reduce, N_("list revs not reachable from others")),
85
OPT_END()
86
};
87