From: Jeff King Date: Thu, 15 Dec 2016 17:43:46 +0000 (-0500) Subject: merge: mark usage error strings for translation X-Git-Tag: v2.12.0-rc0~105^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7d227df5bf7fe9d5df98a55cd637bfaf38685ea;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/merge.c b/builtin/merge.c index 668aaffb84..599d25c4cc 100644 --- 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) - 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())) @@ -1180,7 +1180,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) 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()))