Merge branch 'cr/doc-checkout-branch'

diff --git a/parse-options.h b/parse-options.h
index 77a4a8b2e6d2f6bc08be74b39ee6dd4964828763..71a39c60d942601a1cf30e218df56777742d5580 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -238,6 +238,6 @@ extern int parse_opt_noop_cb(const struct option *, const char *, int);
 #define OPT__COLOR(var, h) \
        OPT_COLOR_FLAG(0, "color", (var), (h))
 #define OPT_COLUMN(s, l, v, h) \
-       { OPTION_CALLBACK, (s), (l), (v), "style", (h), PARSE_OPT_OPTARG, parseopt_column_callback }
+       { OPTION_CALLBACK, (s), (l), (v), N_("style"), (h), PARSE_OPT_OPTARG, parseopt_column_callback }
 
 #endif