merge: mark usage error strings for translation

The nearby error messages are already marked for
translation, but these new ones aren't.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index 668aaffb849d5c9838157f6906b5649f72d9d67b..599d25c4ccb71c9d0c2b246d5c8c35b88dc73a5e 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1164,7 +1164,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                const char *nargv[] = {"reset", "--merge", NULL};
 
                if (orig_argc != 2)
                const char *nargv[] = {"reset", "--merge", NULL};
 
                if (orig_argc != 2)

-                       usage_msg_opt("--abort expects no arguments",
+                       usage_msg_opt(_("--abort expects no arguments"),

                              builtin_merge_usage, builtin_merge_options);
 
                if (!file_exists(git_path_merge_head()))
                              builtin_merge_usage, builtin_merge_options);
 
                if (!file_exists(git_path_merge_head()))


@@ -1180,7 +1180,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                const char *nargv[] = {"commit", NULL};
 
                if (orig_argc != 2)
                const char *nargv[] = {"commit", NULL};
 
                if (orig_argc != 2)

-                       usage_msg_opt("--continue expects no arguments",
+                       usage_msg_opt(_("--continue expects no arguments"),

                              builtin_merge_usage, builtin_merge_options);
 
                if (!file_exists(git_path_merge_head()))
                              builtin_merge_usage, builtin_merge_options);
 
                if (!file_exists(git_path_merge_head()))