i18n: checkout: 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:31 UTC
e05a10937cd7e7ac627a400053e134f91d91161c
1 file changed
+20
-20
builtin/checkout.c
+20
-20
@@ -22,8 +22,8 @@
22
#include "argv-array.h"
23
24
static const char * const checkout_usage[] = {
25
- "git checkout [options] <branch>",
26
- "git checkout [options] [<branch>] -- <file>...",
25
+ N_("git checkout [options] <branch>"),
26
+ N_("git checkout [options] [<branch>] -- <file>..."),
27
NULL,
28
};
29
@@ -934,28 +934,28 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
934
int patch_mode = 0;
935
int dwim_new_local_branch = 1;
936
struct option options[] = {
937
- OPT__QUIET(&opts.quiet, "suppress progress reporting"),
938
- OPT_STRING('b', NULL, &opts.new_branch, "branch",
939
- "create and checkout a new branch"),
940
- OPT_STRING('B', NULL, &opts.new_branch_force, "branch",
941
- "create/reset and checkout a branch"),
942
- OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "create reflog for new branch"),
943
- OPT_BOOLEAN(0, "detach", &opts.force_detach, "detach the HEAD at named commit"),
944
- OPT_SET_INT('t', "track", &opts.track, "set upstream info for new branch",
937
+ OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
938
+ OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
939
+ N_("create and checkout a new branch")),
940
+ OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
941
+ N_("create/reset and checkout a branch")),
942
+ OPT_BOOLEAN('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),
943
+ OPT_BOOLEAN(0, "detach", &opts.force_detach, N_("detach the HEAD at named commit")),
944
+ OPT_SET_INT('t', "track", &opts.track, N_("set upstream info for new branch"),
945
BRANCH_TRACK_EXPLICIT),
946
- OPT_STRING(0, "orphan", &opts.new_orphan_branch, "new branch", "new unparented branch"),
947
- OPT_SET_INT('2', "ours", &opts.writeout_stage, "checkout our version for unmerged files",
946
+ OPT_STRING(0, "orphan", &opts.new_orphan_branch, N_("new branch"), N_("new unparented branch")),
947
+ OPT_SET_INT('2', "ours", &opts.writeout_stage, N_("checkout our version for unmerged files"),
948
2),
949
- OPT_SET_INT('3', "theirs", &opts.writeout_stage, "checkout their version for unmerged files",
949
+ OPT_SET_INT('3', "theirs", &opts.writeout_stage, N_("checkout their version for unmerged files"),
950
3),
951
- OPT__FORCE(&opts.force, "force checkout (throw away local modifications)"),
952
- OPT_BOOLEAN('m', "merge", &opts.merge, "perform a 3-way merge with the new branch"),
953
- OPT_BOOLEAN(0, "overwrite-ignore", &opts.overwrite_ignore, "update ignored files (default)"),
954
- OPT_STRING(0, "conflict", &conflict_style, "style",
955
- "conflict style (merge or diff3)"),
956
- OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"),
951
+ OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)")),
952
+ OPT_BOOLEAN('m', "merge", &opts.merge, N_("perform a 3-way merge with the new branch")),
953
+ OPT_BOOLEAN(0, "overwrite-ignore", &opts.overwrite_ignore, N_("update ignored files (default)")),
954
+ OPT_STRING(0, "conflict", &conflict_style, N_("style"),
955
+ N_("conflict style (merge or diff3)")),
956
+ OPT_BOOLEAN('p', "patch", &patch_mode, N_("select hunks interactively")),
957
{ OPTION_BOOLEAN, 0, "guess", &dwim_new_local_branch, NULL,
958
- "second guess 'git checkout no-such-branch'",
958
+ N_("second guess 'git checkout no-such-branch'"),
959
PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
960
OPT_END(),
961
};