pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}

diff --git a/builtin/column.c b/builtin/column.c
index 5ea798a7ca6a3a3969c7f911b07a01490f689f98..e125a55fc9de2b8f6d82fd5574f109b3d245934c 100644 (file)
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -6,7 +6,7 @@
 #include "column.h"
 
 static const char * const builtin_column_usage[] = {
-       "git column [options]",
+       N_("git column [options]"),
        NULL
 };
 static unsigned int colopts;
@@ -23,13 +23,13 @@ int cmd_column(int argc, const char **argv, const char *prefix)
        struct column_options copts;
        const char *command = NULL, *real_command = NULL;
        struct option options[] = {
-               OPT_STRING(0, "command", &real_command, "name", "lookup config vars"),
-               OPT_COLUMN(0, "mode", &colopts, "layout to use"),
-               OPT_INTEGER(0, "raw-mode", &colopts, "layout to use"),
-               OPT_INTEGER(0, "width", &copts.width, "Maximum width"),
-               OPT_STRING(0, "indent", &copts.indent, "string", "Padding space on left border"),
-               OPT_INTEGER(0, "nl", &copts.nl, "Padding space on right border"),
-               OPT_INTEGER(0, "padding", &copts.padding, "Padding space between columns"),
+               OPT_STRING(0, "command", &real_command, N_("name"), N_("lookup config vars")),
+               OPT_COLUMN(0, "mode", &colopts, N_("layout to use")),
+               OPT_INTEGER(0, "raw-mode", &colopts, N_("layout to use")),
+               OPT_INTEGER(0, "width", &copts.width, N_("Maximum width")),
+               OPT_STRING(0, "indent", &copts.indent, N_("string"), N_("Padding space on left border")),
+               OPT_INTEGER(0, "nl", &copts.nl, N_("Padding space on right border")),
+               OPT_INTEGER(0, "padding", &copts.padding, N_("Padding space between columns")),
                OPT_END()
        };