diff options
| author | Jeff King <peff@peff.net> | 2016-12-15 17:43:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 00:14:34 (GMT) |
| commit | c7d227df5bf7fe9d5df98a55cd637bfaf38685ea (patch) | |
| tree | 3963fa22a71ea0d2e9d90a719e71eb0410e322a4 | |
| parent | 042e290da6aee0a9f21cd5890ccf231c266e177e (diff) | |
| download | git-c7d227df5bf7fe9d5df98a55cd637bfaf38685ea.zip git-c7d227df5bf7fe9d5df98a55cd637bfaf38685ea.tar.gz git-c7d227df5bf7fe9d5df98a55cd637bfaf38685ea.tar.bz2 | |
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>
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 668aaff..599d25c 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())) |