i18n: merge-file: 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
c7d93da38e0c4f6bee1e14c32827e33cdbfb4524
1 file changed
+10
-10
builtin/merge-file.c
+10
-10
@@ -5,7 +5,7 @@
5
#include "parse-options.h"
6
7
static const char *const merge_file_usage[] = {
8
- "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2",
8
+ N_("git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"),
9
NULL
10
};
11
@@ -30,19 +30,19 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
30
int quiet = 0;
31
int prefixlen = 0;
32
struct option options[] = {
33
- OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"),
34
- OPT_SET_INT(0, "diff3", &xmp.style, "use a diff3 based merge", XDL_MERGE_DIFF3),
35
- OPT_SET_INT(0, "ours", &xmp.favor, "for conflicts, use our version",
33
+ OPT_BOOLEAN('p', "stdout", &to_stdout, N_("send results to standard output")),
34
+ OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3),
35
+ OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"),
36
XDL_MERGE_FAVOR_OURS),
37
- OPT_SET_INT(0, "theirs", &xmp.favor, "for conflicts, use their version",
37
+ OPT_SET_INT(0, "theirs", &xmp.favor, N_("for conflicts, use their version"),
38
XDL_MERGE_FAVOR_THEIRS),
39
- OPT_SET_INT(0, "union", &xmp.favor, "for conflicts, use a union version",
39
+ OPT_SET_INT(0, "union", &xmp.favor, N_("for conflicts, use a union version"),
40
XDL_MERGE_FAVOR_UNION),
41
OPT_INTEGER(0, "marker-size", &xmp.marker_size,
42
- "for conflicts, use this marker size"),
43
- OPT__QUIET(&quiet, "do not warn about conflicts"),
44
- OPT_CALLBACK('L', NULL, names, "name",
45
- "set labels for file1/orig_file/file2", &label_cb),
42
+ N_("for conflicts, use this marker size")),
43
+ OPT__QUIET(&quiet, N_("do not warn about conflicts")),
44
+ OPT_CALLBACK('L', NULL, names, N_("name"),
45
+ N_("set labels for file1/orig_file/file2"), &label_cb),
46
OPT_END(),
47
};
48