Signed-off-by: Nguyễn Thái Ngọc Duy <>
 builtin/checkout.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/builtin/checkout.c b/builtin/checkout.c
index d812219..9f6dbe6 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -22,8 +22,8 @@
 #include "argv-array.h"
 static const char * const checkout_usage[] = {
-       "git checkout [options] <branch>",
-       "git checkout [options] [<branch>] -- <file>...",
+       N_("git checkout [options] <branch>"),
+       N_("git checkout [options] [<branch>] -- <file>..."),
@@ -934,28 +934,28 @@ int cmd_checkout(int argc, const char **argv, const char 
        int patch_mode = 0;
        int dwim_new_local_branch = 1;
        struct option options[] = {
-               OPT__QUIET(&opts.quiet, "suppress progress reporting"),
-               OPT_STRING('b', NULL, &opts.new_branch, "branch",
-                          "create and checkout a new branch"),
-               OPT_STRING('B', NULL, &opts.new_branch_force, "branch",
-                          "create/reset and checkout a branch"),
-               OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "create reflog for 
new branch"),
-               OPT_BOOLEAN(0, "detach", &opts.force_detach, "detach the HEAD 
at named commit"),
-               OPT_SET_INT('t', "track",  &opts.track, "set upstream info for 
new branch",
+               OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
+               OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
+                          N_("create and checkout a new branch")),
+               OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
+                          N_("create/reset and checkout a branch")),
+               OPT_BOOLEAN('l', NULL, &opts.new_branch_log, N_("create reflog 
for new branch")),
+               OPT_BOOLEAN(0, "detach", &opts.force_detach, N_("detach the 
HEAD at named commit")),
+               OPT_SET_INT('t', "track",  &opts.track, N_("set upstream info 
for new branch"),
-               OPT_STRING(0, "orphan", &opts.new_orphan_branch, "new branch", 
"new unparented branch"),
-               OPT_SET_INT('2', "ours", &opts.writeout_stage, "checkout our 
version for unmerged files",
+               OPT_STRING(0, "orphan", &opts.new_orphan_branch, N_("new 
branch"), N_("new unparented branch")),
+               OPT_SET_INT('2', "ours", &opts.writeout_stage, N_("checkout our 
version for unmerged files"),
-               OPT_SET_INT('3', "theirs", &opts.writeout_stage, "checkout 
their version for unmerged files",
+               OPT_SET_INT('3', "theirs", &opts.writeout_stage, N_("checkout 
their version for unmerged files"),
-               OPT__FORCE(&opts.force, "force checkout (throw away local 
-               OPT_BOOLEAN('m', "merge", &opts.merge, "perform a 3-way merge 
with the new branch"),
-               OPT_BOOLEAN(0, "overwrite-ignore", &opts.overwrite_ignore, 
"update ignored files (default)"),
-               OPT_STRING(0, "conflict", &conflict_style, "style",
-                          "conflict style (merge or diff3)"),
-               OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks 
+               OPT__FORCE(&opts.force, N_("force checkout (throw away local 
+               OPT_BOOLEAN('m', "merge", &opts.merge, N_("perform a 3-way 
merge with the new branch")),
+               OPT_BOOLEAN(0, "overwrite-ignore", &opts.overwrite_ignore, 
N_("update ignored files (default)")),
+               OPT_STRING(0, "conflict", &conflict_style, N_("style"),
+                          N_("conflict style (merge or diff3)")),
+               OPT_BOOLEAN('p', "patch", &patch_mode, N_("select hunks 
                { OPTION_BOOLEAN, 0, "guess", &dwim_new_local_branch, NULL,
-                 "second guess 'git checkout no-such-branch'",
+                 N_("second guess 'git checkout no-such-branch'"),
                  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to