Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: ls-files: mark parseopt strings for translation
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Mon, 20 Aug 2012 12:32:20 +0000
(19:32 +0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 20 Aug 2012 19:23:18 +0000
(12:23 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/ls-files.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
e62cd35
)
diff --git
a/builtin/ls-files.c
b/builtin/ls-files.c
index 31b3f2d9006e0f5703ca9fb37bea247012581c0e..b5434af0c87741f3160388cf86904c6e3f903527 100644
(file)
--- a/
builtin/ls-files.c
+++ b/
builtin/ls-files.c
@@
-405,7
+405,7
@@
int report_path_error(const char *ps_matched, const char **pathspec, const char
}
static const char * const ls_files_usage[] = {
}
static const char * const ls_files_usage[] = {
-
"git ls-files [options] [<file>...]"
,
+
N_("git ls-files [options] [<file>...]")
,
NULL
};
NULL
};
@@
-457,57
+457,57
@@
int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
struct dir_struct dir;
struct option builtin_ls_files_options[] = {
{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,
struct dir_struct dir;
struct option builtin_ls_files_options[] = {
{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,
-
"paths are separated with NUL character"
,
+
N_("paths are separated with NUL character")
,
PARSE_OPT_NOARG, option_parse_z },
OPT_BOOLEAN('t', NULL, &show_tag,
PARSE_OPT_NOARG, option_parse_z },
OPT_BOOLEAN('t', NULL, &show_tag,
-
"identify the file status with tags"
),
+
N_("identify the file status with tags")
),
OPT_BOOLEAN('v', NULL, &show_valid_bit,
OPT_BOOLEAN('v', NULL, &show_valid_bit,
-
"use lowercase letters for 'assume unchanged' files"
),
+
N_("use lowercase letters for 'assume unchanged' files")
),
OPT_BOOLEAN('c', "cached", &show_cached,
OPT_BOOLEAN('c', "cached", &show_cached,
-
"show cached files in the output (default)"
),
+
N_("show cached files in the output (default)")
),
OPT_BOOLEAN('d', "deleted", &show_deleted,
OPT_BOOLEAN('d', "deleted", &show_deleted,
-
"show deleted files in the output"
),
+
N_("show deleted files in the output")
),
OPT_BOOLEAN('m', "modified", &show_modified,
OPT_BOOLEAN('m', "modified", &show_modified,
-
"show modified files in the output"
),
+
N_("show modified files in the output")
),
OPT_BOOLEAN('o', "others", &show_others,
OPT_BOOLEAN('o', "others", &show_others,
-
"show other files in the output"
),
+
N_("show other files in the output")
),
OPT_BIT('i', "ignored", &dir.flags,
OPT_BIT('i', "ignored", &dir.flags,
-
"show ignored files in the output"
,
+
N_("show ignored files in the output")
,
DIR_SHOW_IGNORED),
OPT_BOOLEAN('s', "stage", &show_stage,
DIR_SHOW_IGNORED),
OPT_BOOLEAN('s', "stage", &show_stage,
-
"show staged contents' object name in the output"
),
+
N_("show staged contents' object name in the output")
),
OPT_BOOLEAN('k', "killed", &show_killed,
OPT_BOOLEAN('k', "killed", &show_killed,
-
"show files on the filesystem that need to be removed"
),
+
N_("show files on the filesystem that need to be removed")
),
OPT_BIT(0, "directory", &dir.flags,
OPT_BIT(0, "directory", &dir.flags,
-
"show 'other' directories' name only"
,
+
N_("show 'other' directories' name only")
,
DIR_SHOW_OTHER_DIRECTORIES),
OPT_NEGBIT(0, "empty-directory", &dir.flags,
DIR_SHOW_OTHER_DIRECTORIES),
OPT_NEGBIT(0, "empty-directory", &dir.flags,
-
"don't show empty directories"
,
+
N_("don't show empty directories")
,
DIR_HIDE_EMPTY_DIRECTORIES),
OPT_BOOLEAN('u', "unmerged", &show_unmerged,
DIR_HIDE_EMPTY_DIRECTORIES),
OPT_BOOLEAN('u', "unmerged", &show_unmerged,
-
"show unmerged files in the output"
),
+
N_("show unmerged files in the output")
),
OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo,
OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo,
-
"show resolve-undo information"
),
- { OPTION_CALLBACK, 'x', "exclude", &dir.exclude_list[EXC_CMDL],
"pattern"
,
-
"skip files matching pattern"
,
+
N_("show resolve-undo information")
),
+ { OPTION_CALLBACK, 'x', "exclude", &dir.exclude_list[EXC_CMDL],
N_("pattern")
,
+
N_("skip files matching pattern")
,
0, option_parse_exclude },
0, option_parse_exclude },
- { OPTION_CALLBACK, 'X', "exclude-from", &dir,
"file"
,
-
"exclude patterns are read from <file>"
,
+ { OPTION_CALLBACK, 'X', "exclude-from", &dir,
N_("file")
,
+
N_("exclude patterns are read from <file>")
,
0, option_parse_exclude_from },
0, option_parse_exclude_from },
- OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir,
"file"
,
-
"read additional per-directory exclude patterns in <file>"
),
+ OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir,
N_("file")
,
+
N_("read additional per-directory exclude patterns in <file>")
),
{ OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
{ OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
-
"add the standard git exclusions"
,
+
N_("add the standard git exclusions")
,
PARSE_OPT_NOARG, option_parse_exclude_standard },
{ OPTION_SET_INT, 0, "full-name", &prefix_len, NULL,
PARSE_OPT_NOARG, option_parse_exclude_standard },
{ OPTION_SET_INT, 0, "full-name", &prefix_len, NULL,
-
"make the output relative to the project top directory"
,
+
N_("make the output relative to the project top directory")
,
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL },
OPT_BOOLEAN(0, "error-unmatch", &error_unmatch,
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL },
OPT_BOOLEAN(0, "error-unmatch", &error_unmatch,
-
"if any <file> is not in the index, treat this as an error"
),
- OPT_STRING(0, "with-tree", &with_tree,
"tree-ish"
,
-
"pretend that paths removed since <tree-ish> are still present"
),
+
N_("if any <file> is not in the index, treat this as an error")
),
+ OPT_STRING(0, "with-tree", &with_tree,
N_("tree-ish")
,
+
N_("pretend that paths removed since <tree-ish> are still present")
),
OPT__ABBREV(&abbrev),
OPT__ABBREV(&abbrev),
- OPT_BOOLEAN(0, "debug", &debug_mode,
"show debugging data"
),
+ OPT_BOOLEAN(0, "debug", &debug_mode,
N_("show debugging data")
),
OPT_END()
};
OPT_END()
};