i18n: read-tree: 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
230c6cdb00cddd5f4f1084e6855214da93642219
1 file changed
+19
-19
builtin/read-tree.c
+19
-19
@@ -33,7 +33,7 @@ static int list_tree(unsigned char *sha1)
33
}
34
35
static const char * const read_tree_usage[] = {
36
- "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])",
36
+ N_("git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
37
NULL
38
};
39
@@ -104,37 +104,37 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
104
struct unpack_trees_options opts;
105
int prefix_set = 0;
106
const struct option read_tree_options[] = {
107
- { OPTION_CALLBACK, 0, "index-output", NULL, "file",
108
- "write resulting index to <file>",
107
+ { OPTION_CALLBACK, 0, "index-output", NULL, N_("file"),
108
+ N_("write resulting index to <file>"),
109
PARSE_OPT_NONEG, index_output_cb },
110
OPT_SET_INT(0, "empty", &read_empty,
111
- "only empty the index", 1),
112
- OPT__VERBOSE(&opts.verbose_update, "be verbose"),
113
- OPT_GROUP("Merging"),
111
+ N_("only empty the index"), 1),
112
+ OPT__VERBOSE(&opts.verbose_update, N_("be verbose")),
113
+ OPT_GROUP(N_("Merging")),
114
OPT_SET_INT('m', NULL, &opts.merge,
115
- "perform a merge in addition to a read", 1),
115
+ N_("perform a merge in addition to a read"), 1),
116
OPT_SET_INT(0, "trivial", &opts.trivial_merges_only,
117
- "3-way merge if no file level merging required", 1),
117
+ N_("3-way merge if no file level merging required"), 1),
118
OPT_SET_INT(0, "aggressive", &opts.aggressive,
119
- "3-way merge in presence of adds and removes", 1),
119
+ N_("3-way merge in presence of adds and removes"), 1),
120
OPT_SET_INT(0, "reset", &opts.reset,
121
- "same as -m, but discard unmerged entries", 1),
122
- { OPTION_STRING, 0, "prefix", &opts.prefix, "<subdirectory>/",
123
- "read the tree into the index under <subdirectory>/",
121
+ N_("same as -m, but discard unmerged entries"), 1),
122
+ { OPTION_STRING, 0, "prefix", &opts.prefix, N_("<subdirectory>/"),
123
+ N_("read the tree into the index under <subdirectory>/"),
124
PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP },
125
OPT_SET_INT('u', NULL, &opts.update,
126
- "update working tree with merge result", 1),
126
+ N_("update working tree with merge result"), 1),
127
{ OPTION_CALLBACK, 0, "exclude-per-directory", &opts,
128
- "gitignore",
129
- "allow explicitly ignored files to be overwritten",
128
+ N_("gitignore"),
129
+ N_("allow explicitly ignored files to be overwritten"),
130
PARSE_OPT_NONEG, exclude_per_directory_cb },
131
OPT_SET_INT('i', NULL, &opts.index_only,
132
- "don't check the working tree after merging", 1),
133
- OPT__DRY_RUN(&opts.dry_run, "don't update the index or the work tree"),
132
+ N_("don't check the working tree after merging"), 1),
133
+ OPT__DRY_RUN(&opts.dry_run, N_("don't update the index or the work tree")),
134
OPT_SET_INT(0, "no-sparse-checkout", &opts.skip_sparse_checkout,
135
- "skip applying sparse checkout filter", 1),
135
+ N_("skip applying sparse checkout filter"), 1),
136
OPT_SET_INT(0, "debug-unpack", &opts.debug_unpack,
137
- "debug unpack-trees", 1),
137
+ N_("debug unpack-trees"), 1),
138
OPT_END()
139
};
140