Skip to content

Commit 096bbd6

Browse files
gitstergitster
committed
Merge branch 'nd/i18n-parseopt-help'
A lot of i18n mark-up for the help text from "git <cmd> -h". * nd/i18n-parseopt-help: (66 commits) Use imperative form in help usage to describe an action Reduce translations by using same terminologies i18n: write-tree: mark parseopt strings for translation i18n: verify-tag: mark parseopt strings for translation i18n: verify-pack: mark parseopt strings for translation i18n: update-server-info: mark parseopt strings for translation i18n: update-ref: mark parseopt strings for translation i18n: update-index: mark parseopt strings for translation i18n: tag: mark parseopt strings for translation i18n: symbolic-ref: mark parseopt strings for translation i18n: show-ref: mark parseopt strings for translation i18n: show-branch: mark parseopt strings for translation i18n: shortlog: mark parseopt strings for translation i18n: rm: mark parseopt strings for translation i18n: revert, cherry-pick: mark parseopt strings for translation i18n: rev-parse: mark parseopt strings for translation i18n: reset: mark parseopt strings for translation i18n: rerere: mark parseopt strings for translation i18n: status: mark parseopt strings for translation i18n: replace: mark parseopt strings for translation ...
2 parents e245397 + f63cf8c commit 096bbd6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+912
-912
lines changed

‎archive.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
#include "unpack-trees.h"
88

99
static char const * const archive_usage[] = {
10-
"git archive [options] <tree-ish> [<path>...]",
11-
"git archive --list",
12-
"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]",
13-
"git archive --remote <repo> [--exec <cmd>] --list",
10+
N_("git archive [options] <tree-ish> [<path>...]"),
11+
N_("git archive --list"),
12+
N_("git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"),
13+
N_("git archive --remote <repo> [--exec <cmd>] --list"),
1414
NULL
1515
};
1616

@@ -319,32 +319,32 @@ static int parse_archive_args(int argc, const char **argv,
319319
int worktree_attributes = 0;
320320
struct option opts[] = {
321321
OPT_GROUP(""),
322-
OPT_STRING(0, "format", &format, "fmt", "archive format"),
323-
OPT_STRING(0, "prefix", &base, "prefix",
324-
"prepend prefix to each pathname in the archive"),
325-
OPT_STRING('o', "output", &output, "file",
326-
"write the archive to this file"),
322+
OPT_STRING(0, "format", &format, N_("fmt"), N_("archive format")),
323+
OPT_STRING(0, "prefix", &base, N_("prefix"),
324+
N_("prepend prefix to each pathname in the archive")),
325+
OPT_STRING('o', "output", &output, N_("file"),
326+
N_("write the archive to this file")),
327327
OPT_BOOL(0, "worktree-attributes", &worktree_attributes,
328-
"read .gitattributes in working directory"),
329-
OPT__VERBOSE(&verbose, "report archived files on stderr"),
330-
OPT__COMPR('0', &compression_level, "store only", 0),
331-
OPT__COMPR('1', &compression_level, "compress faster", 1),
328+
N_("read .gitattributes in working directory")),
329+
OPT__VERBOSE(&verbose, N_("report archived files on stderr")),
330+
OPT__COMPR('0', &compression_level, N_("store only"), 0),
331+
OPT__COMPR('1', &compression_level, N_("compress faster"), 1),
332332
OPT__COMPR_HIDDEN('2', &compression_level, 2),
333333
OPT__COMPR_HIDDEN('3', &compression_level, 3),
334334
OPT__COMPR_HIDDEN('4', &compression_level, 4),
335335
OPT__COMPR_HIDDEN('5', &compression_level, 5),
336336
OPT__COMPR_HIDDEN('6', &compression_level, 6),
337337
OPT__COMPR_HIDDEN('7', &compression_level, 7),
338338
OPT__COMPR_HIDDEN('8', &compression_level, 8),
339-
OPT__COMPR('9', &compression_level, "compress better", 9),
339+
OPT__COMPR('9', &compression_level, N_("compress better"), 9),
340340
OPT_GROUP(""),
341341
OPT_BOOL('l', "list", &list,
342-
"list supported archive formats"),
342+
N_("list supported archive formats")),
343343
OPT_GROUP(""),
344-
OPT_STRING(0, "remote", &remote, "repo",
345-
"retrieve the archive from remote repository <repo>"),
346-
OPT_STRING(0, "exec", &exec, "cmd",
347-
"path to the remote git-upload-archive command"),
344+
OPT_STRING(0, "remote", &remote, N_("repo"),
345+
N_("retrieve the archive from remote repository <repo>")),
346+
OPT_STRING(0, "exec", &exec, N_("command"),
347+
N_("path to the remote git-upload-archive command")),
348348
OPT_END()
349349
};
350350

‎builtin/add.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "bulk-checkin.h"
1717

1818
static const char * const builtin_add_usage[] = {
19-
"git add [options] [--] <filepattern>...",
19+
N_("git add [options] [--] <filepattern>..."),
2020
NULL
2121
};
2222
static int patch_interactive, add_interactive, edit_interactive;
@@ -315,19 +315,19 @@ static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
315315
static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0;
316316

317317
static struct option builtin_add_options[] = {
318-
OPT__DRY_RUN(&show_only, "dry run"),
319-
OPT__VERBOSE(&verbose, "be verbose"),
318+
OPT__DRY_RUN(&show_only, N_("dry run")),
319+
OPT__VERBOSE(&verbose, N_("be verbose")),
320320
OPT_GROUP(""),
321-
OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
322-
OPT_BOOLEAN('p', "patch", &patch_interactive, "select hunks interactively"),
323-
OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
324-
OPT__FORCE(&ignored_too, "allow adding otherwise ignored files"),
325-
OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
326-
OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
327-
OPT_BOOLEAN('A', "all", &addremove, "add changes from all tracked and untracked files"),
328-
OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
329-
OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
330-
OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, "check if - even missing - files are ignored in dry run"),
321+
OPT_BOOLEAN('i', "interactive", &add_interactive, N_("interactive picking")),
322+
OPT_BOOLEAN('p', "patch", &patch_interactive, N_("select hunks interactively")),
323+
OPT_BOOLEAN('e', "edit", &edit_interactive, N_("edit current diff and apply")),
324+
OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files")),
325+
OPT_BOOLEAN('u', "update", &take_worktree_changes, N_("update tracked files")),
326+
OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")),
327+
OPT_BOOLEAN('A', "all", &addremove, N_("add changes from all tracked and untracked files")),
328+
OPT_BOOLEAN( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
329+
OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
330+
OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
331331
OPT_END(),
332332
};
333333

‎builtin/apply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4296,7 +4296,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
42964296
OPT_NOOP_NOARG(0, "allow-binary-replacement"),
42974297
OPT_NOOP_NOARG(0, "binary"),
42984298
OPT_BOOLEAN(0, "numstat", &numstat,
4299-
N_("shows number of added and deleted lines in decimal notation")),
4299+
N_("show number of added and deleted lines in decimal notation")),
43004300
OPT_BOOLEAN(0, "summary", &summary,
43014301
N_("instead of applying the patch, output a summary for the input")),
43024302
OPT_BOOLEAN(0, "check", &check,

‎builtin/archive.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
8888
const char *output = NULL;
8989
const char *remote = NULL;
9090
struct option local_opts[] = {
91-
OPT_STRING('o', "output", &output, "file",
92-
"write the archive to this file"),
93-
OPT_STRING(0, "remote", &remote, "repo",
94-
"retrieve the archive from remote repository <repo>"),
95-
OPT_STRING(0, "exec", &exec, "cmd",
96-
"path to the remote git-upload-archive command"),
91+
OPT_STRING('o', "output", &output, N_("file"),
92+
N_("write the archive to this file")),
93+
OPT_STRING(0, "remote", &remote, N_("repo"),
94+
N_("retrieve the archive from remote repository <repo>")),
95+
OPT_STRING(0, "exec", &exec, N_("command"),
96+
N_("path to the remote git-upload-archive command")),
9797
OPT_END()
9898
};
9999

‎builtin/bisect--helper.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "bisect.h"
55

66
static const char * const git_bisect_helper_usage[] = {
7-
"git bisect--helper --next-all [--no-checkout]",
7+
N_("git bisect--helper --next-all [--no-checkout]"),
88
NULL
99
};
1010

@@ -14,9 +14,9 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
1414
int no_checkout = 0;
1515
struct option options[] = {
1616
OPT_BOOLEAN(0, "next-all", &next_all,
17-
"perform 'git bisect next'"),
17+
N_("perform 'git bisect next'")),
1818
OPT_BOOLEAN(0, "no-checkout", &no_checkout,
19-
"update BISECT_HEAD instead of checking out the current commit"),
19+
N_("update BISECT_HEAD instead of checking out the current commit")),
2020
OPT_END()
2121
};
2222

‎builtin/blame.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
#include "utf8.h"
2323
#include "userdiff.h"
2424

25-
static char blame_usage[] = "git blame [options] [rev-opts] [rev] [--] file";
25+
static char blame_usage[] = N_("git blame [options] [rev-opts] [rev] [--] file");
2626

2727
static const char *blame_opt_usage[] = {
2828
blame_usage,
2929
"",
30-
"[rev-opts] are documented in git-rev-list(1)",
30+
N_("[rev-opts] are documented in git-rev-list(1)"),
3131
NULL
3232
};
3333

@@ -2313,27 +2313,27 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
23132313
static const char *revs_file = NULL;
23142314
static const char *contents_from = NULL;
23152315
static const struct option options[] = {
2316-
OPT_BOOLEAN(0, "incremental", &incremental, "Show blame entries as we find them, incrementally"),
2317-
OPT_BOOLEAN('b', NULL, &blank_boundary, "Show blank SHA-1 for boundary commits (Default: off)"),
2318-
OPT_BOOLEAN(0, "root", &show_root, "Do not treat root commits as boundaries (Default: off)"),
2319-
OPT_BOOLEAN(0, "show-stats", &show_stats, "Show work cost statistics"),
2320-
OPT_BIT(0, "score-debug", &output_option, "Show output score for blame entries", OUTPUT_SHOW_SCORE),
2321-
OPT_BIT('f', "show-name", &output_option, "Show original filename (Default: auto)", OUTPUT_SHOW_NAME),
2322-
OPT_BIT('n', "show-number", &output_option, "Show original linenumber (Default: off)", OUTPUT_SHOW_NUMBER),
2323-
OPT_BIT('p', "porcelain", &output_option, "Show in a format designed for machine consumption", OUTPUT_PORCELAIN),
2324-
OPT_BIT(0, "line-porcelain", &output_option, "Show porcelain format with per-line commit information", OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
2325-
OPT_BIT('c', NULL, &output_option, "Use the same output mode as git-annotate (Default: off)", OUTPUT_ANNOTATE_COMPAT),
2326-
OPT_BIT('t', NULL, &output_option, "Show raw timestamp (Default: off)", OUTPUT_RAW_TIMESTAMP),
2327-
OPT_BIT('l', NULL, &output_option, "Show long commit SHA1 (Default: off)", OUTPUT_LONG_OBJECT_NAME),
2328-
OPT_BIT('s', NULL, &output_option, "Suppress author name and timestamp (Default: off)", OUTPUT_NO_AUTHOR),
2329-
OPT_BIT('e', "show-email", &output_option, "Show author email instead of name (Default: off)", OUTPUT_SHOW_EMAIL),
2330-
OPT_BIT('w', NULL, &xdl_opts, "Ignore whitespace differences", XDF_IGNORE_WHITESPACE),
2331-
OPT_BIT(0, "minimal", &xdl_opts, "Spend extra cycles to find better match", XDF_NEED_MINIMAL),
2332-
OPT_STRING('S', NULL, &revs_file, "file", "Use revisions from <file> instead of calling git-rev-list"),
2333-
OPT_STRING(0, "contents", &contents_from, "file", "Use <file>'s contents as the final image"),
2334-
{ OPTION_CALLBACK, 'C', NULL, &opt, "score", "Find line copies within and across files", PARSE_OPT_OPTARG, blame_copy_callback },
2335-
{ OPTION_CALLBACK, 'M', NULL, &opt, "score", "Find line movements within and across files", PARSE_OPT_OPTARG, blame_move_callback },
2336-
OPT_CALLBACK('L', NULL, &bottomtop, "n,m", "Process only line range n,m, counting from 1", blame_bottomtop_callback),
2316+
OPT_BOOLEAN(0, "incremental", &incremental, N_("Show blame entries as we find them, incrementally")),
2317+
OPT_BOOLEAN('b', NULL, &blank_boundary, N_("Show blank SHA-1 for boundary commits (Default: off)")),
2318+
OPT_BOOLEAN(0, "root", &show_root, N_("Do not treat root commits as boundaries (Default: off)")),
2319+
OPT_BOOLEAN(0, "show-stats", &show_stats, N_("Show work cost statistics")),
2320+
OPT_BIT(0, "score-debug", &output_option, N_("Show output score for blame entries"), OUTPUT_SHOW_SCORE),
2321+
OPT_BIT('f', "show-name", &output_option, N_("Show original filename (Default: auto)"), OUTPUT_SHOW_NAME),
2322+
OPT_BIT('n', "show-number", &output_option, N_("Show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER),
2323+
OPT_BIT('p', "porcelain", &output_option, N_("Show in a format designed for machine consumption"), OUTPUT_PORCELAIN),
2324+
OPT_BIT(0, "line-porcelain", &output_option, N_("Show porcelain format with per-line commit information"), OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
2325+
OPT_BIT('c', NULL, &output_option, N_("Use the same output mode as git-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT),
2326+
OPT_BIT('t', NULL, &output_option, N_("Show raw timestamp (Default: off)"), OUTPUT_RAW_TIMESTAMP),
2327+
OPT_BIT('l', NULL, &output_option, N_("Show long commit SHA1 (Default: off)"), OUTPUT_LONG_OBJECT_NAME),
2328+
OPT_BIT('s', NULL, &output_option, N_("Suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
2329+
OPT_BIT('e', "show-email", &output_option, N_("Show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
2330+
OPT_BIT('w', NULL, &xdl_opts, N_("Ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
2331+
OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL),
2332+
OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from <file> instead of calling git-rev-list")),
2333+
OPT_STRING(0, "contents", &contents_from, N_("file"), N_("Use <file>'s contents as the final image")),
2334+
{ OPTION_CALLBACK, 'C', NULL, &opt, N_("score"), N_("Find line copies within and across files"), PARSE_OPT_OPTARG, blame_copy_callback },
2335+
{ OPTION_CALLBACK, 'M', NULL, &opt, N_("score"), N_("Find line movements within and across files"), PARSE_OPT_OPTARG, blame_move_callback },
2336+
OPT_CALLBACK('L', NULL, &bottomtop, N_("n,m"), N_("Process only line range n,m, counting from 1"), blame_bottomtop_callback),
23372337
OPT__ABBREV(&abbrev),
23382338
OPT_END()
23392339
};

‎builtin/branch.c

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#include "column.h"
2020

2121
static const char * const builtin_branch_usage[] = {
22-
"git branch [options] [-r | -a] [--merged | --no-merged]",
23-
"git branch [options] [-l] [-f] <branchname> [<start-point>]",
24-
"git branch [options] [-r] (-d | -D) <branchname>...",
25-
"git branch [options] (-m | -M) [<oldbranch>] <newbranch>",
22+
N_("git branch [options] [-r | -a] [--merged | --no-merged]"),
23+
N_("git branch [options] [-l] [-f] <branchname> [<start-point>]"),
24+
N_("git branch [options] [-r] (-d | -D) <branchname>..."),
25+
N_("git branch [options] (-m | -M) [<oldbranch>] <newbranch>"),
2626
NULL
2727
};
2828

@@ -718,56 +718,56 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
718718
struct commit_list *with_commit = NULL;
719719

720720
struct option options[] = {
721-
OPT_GROUP("Generic options"),
721+
OPT_GROUP(N_("Generic options")),
722722
OPT__VERBOSE(&verbose,
723-
"show hash and subject, give twice for upstream branch"),
724-
OPT__QUIET(&quiet, "suppress informational messages"),
725-
OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))",
723+
N_("show hash and subject, give twice for upstream branch")),
724+
OPT__QUIET(&quiet, N_("suppress informational messages")),
725+
OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"),
726726
BRANCH_TRACK_EXPLICIT),
727-
OPT_SET_INT( 0, "set-upstream", &track, "change upstream info",
727+
OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
728728
BRANCH_TRACK_OVERRIDE),
729-
OPT__COLOR(&branch_use_color, "use colored output"),
730-
OPT_SET_INT('r', "remotes", &kinds, "act on remote-tracking branches",
729+
OPT__COLOR(&branch_use_color, N_("use colored output")),
730+
OPT_SET_INT('r', "remotes", &kinds, N_("act on remote-tracking branches"),
731731
REF_REMOTE_BRANCH),
732732
{
733-
OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
734-
"print only branches that contain the commit",
733+
OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
734+
N_("print only branches that contain the commit"),
735735
PARSE_OPT_LASTARG_DEFAULT,
736736
parse_opt_with_commit, (intptr_t)"HEAD",
737737
},
738738
{
739-
OPTION_CALLBACK, 0, "with", &with_commit, "commit",
740-
"print only branches that contain the commit",
739+
OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"),
740+
N_("print only branches that contain the commit"),
741741
PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
742742
parse_opt_with_commit, (intptr_t) "HEAD",
743743
},
744744
OPT__ABBREV(&abbrev),
745745

746-
OPT_GROUP("Specific git-branch actions:"),
747-
OPT_SET_INT('a', "all", &kinds, "list both remote-tracking and local branches",
746+
OPT_GROUP(N_("Specific git-branch actions:")),
747+
OPT_SET_INT('a', "all", &kinds, N_("list both remote-tracking and local branches"),
748748
REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
749-
OPT_BIT('d', "delete", &delete, "delete fully merged branch", 1),
750-
OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
751-
OPT_BIT('m', "move", &rename, "move/rename a branch and its reflog", 1),
752-
OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
753-
OPT_BOOLEAN(0, "list", &list, "list branch names"),
754-
OPT_BOOLEAN('l', "create-reflog", &reflog, "create the branch's reflog"),
749+
OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1),
750+
OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
751+
OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
752+
OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
753+
OPT_BOOLEAN(0, "list", &list, N_("list branch names")),
754+
OPT_BOOLEAN('l', "create-reflog", &reflog, N_("create the branch's reflog")),
755755
OPT_BOOLEAN(0, "edit-description", &edit_description,
756-
"edit the description for the branch"),
757-
OPT__FORCE(&force_create, "force creation (when already exists)"),
756+
N_("edit the description for the branch")),
757+
OPT__FORCE(&force_create, N_("force creation (when already exists)")),
758758
{
759759
OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
760-
"commit", "print only not merged branches",
760+
N_("commit"), N_("print only not merged branches"),
761761
PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
762762
opt_parse_merge_filter, (intptr_t) "HEAD",
763763
},
764764
{
765765
OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
766-
"commit", "print only merged branches",
766+
N_("commit"), N_("print only merged branches"),
767767
PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
768768
opt_parse_merge_filter, (intptr_t) "HEAD",
769769
},
770-
OPT_COLUMN(0, "column", &colopts, "list branches in columns"),
770+
OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
771771
OPT_END(),
772772
};
773773

‎builtin/cat-file.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ static int batch_objects(int print_contents)
244244
}
245245

246246
static const char * const cat_file_usage[] = {
247-
"git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>",
248-
"git cat-file (--batch|--batch-check) < <list_of_objects>",
247+
N_("git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"),
248+
N_("git cat-file (--batch|--batch-check) < <list_of_objects>"),
249249
NULL
250250
};
251251

@@ -263,19 +263,19 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
263263
const char *exp_type = NULL, *obj_name = NULL;
264264

265265
const struct option options[] = {
266-
OPT_GROUP("<type> can be one of: blob, tree, commit, tag"),
267-
OPT_SET_INT('t', NULL, &opt, "show object type", 't'),
268-
OPT_SET_INT('s', NULL, &opt, "show object size", 's'),
266+
OPT_GROUP(N_("<type> can be one of: blob, tree, commit, tag")),
267+
OPT_SET_INT('t', NULL, &opt, N_("show object type"), 't'),
268+
OPT_SET_INT('s', NULL, &opt, N_("show object size"), 's'),
269269
OPT_SET_INT('e', NULL, &opt,
270-
"exit with zero when there's no error", 'e'),
271-
OPT_SET_INT('p', NULL, &opt, "pretty-print object's content", 'p'),
270+
N_("exit with zero when there's no error"), 'e'),
271+
OPT_SET_INT('p', NULL, &opt, N_("pretty-print object's content"), 'p'),
272272
OPT_SET_INT(0, "textconv", &opt,
273-
"for blob objects, run textconv on object's content", 'c'),
273+
N_("for blob objects, run textconv on object's content"), 'c'),
274274
OPT_SET_INT(0, "batch", &batch,
275-
"show info and content of objects fed from the standard input",
275+
N_("show info and content of objects fed from the standard input"),
276276
BATCH),
277277
OPT_SET_INT(0, "batch-check", &batch,
278-
"show info about objects fed from the standard input",
278+
N_("show info about objects fed from the standard input"),
279279
BATCH_CHECK),
280280
OPT_END()
281281
};

‎builtin/check-attr.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ static int all_attrs;
88
static int cached_attrs;
99
static int stdin_paths;
1010
static const char * const check_attr_usage[] = {
11-
"git check-attr [-a | --all | attr...] [--] pathname...",
12-
"git check-attr --stdin [-a | --all | attr...] < <list-of-paths>",
11+
N_("git check-attr [-a | --all | attr...] [--] pathname..."),
12+
N_("git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"),
1313
NULL
1414
};
1515

1616
static int null_term_line;
1717

1818
static const struct option check_attr_options[] = {
19-
OPT_BOOLEAN('a', "all", &all_attrs, "report all attributes set on file"),
20-
OPT_BOOLEAN(0, "cached", &cached_attrs, "use .gitattributes only from the index"),
21-
OPT_BOOLEAN(0 , "stdin", &stdin_paths, "read file names from stdin"),
19+
OPT_BOOLEAN('a', "all", &all_attrs, N_("report all attributes set on file")),
20+
OPT_BOOLEAN(0, "cached", &cached_attrs, N_("use .gitattributes only from the index")),
21+
OPT_BOOLEAN(0 , "stdin", &stdin_paths, N_("read file names from stdin")),
2222
OPT_BOOLEAN('z', NULL, &null_term_line,
23-
"input paths are terminated by a null character"),
23+
N_("input paths are terminated by a null character")),
2424
OPT_END()
2525
};
2626

0 commit comments

Comments
 (0)