diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:31 -0800 |
| commit | 3813a89faee3ecb111aa206f68b46618ec853e4e (patch) | |
| tree | 488acb52008ebfe2fa525cf535e6f2df66977e29 /ref-filter.c | |
| parent | b21ebb671bb7dea8d342225f0d66c41f4e54d5ca (diff) | |
| parent | 674ba34038568e36090c6c4c616a3266c8b6459e (diff) | |
| download | git-3813a89faee3ecb111aa206f68b46618ec853e4e.tar.gz | |
Merge branch 'nd/i18n'
More _("i18n") markings.
* nd/i18n:
fsck: mark strings for translation
fsck: reduce word legos to help i18n
parse-options.c: mark more strings for translation
parse-options.c: turn some die() to BUG()
parse-options: replace opterror() with optname()
repack: mark more strings for translation
remote.c: mark messages for translation
remote.c: turn some error() or die() to BUG()
reflog: mark strings for translation
read-cache.c: add missing colon separators
read-cache.c: mark more strings for translation
read-cache.c: turn die("internal error") to BUG()
attr.c: mark more string for translation
archive.c: mark more strings for translation
alias.c: mark split_cmdline_strerror() strings for translation
git.c: mark more strings for translation
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ref-filter.c b/ref-filter.c index 5de616befe..75281c73f2 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -2324,9 +2324,11 @@ int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset) if (rf->merge) { if (no_merged) { - return opterror(opt, "is incompatible with --merged", 0); + return error(_("option `%s' is incompatible with --merged"), + opt->long_name); } else { - return opterror(opt, "is incompatible with --no-merged", 0); + return error(_("option `%s' is incompatible with --no-merged"), + opt->long_name); } } @@ -2340,7 +2342,7 @@ int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset) rf->merge_commit = lookup_commit_reference_gently(the_repository, &oid, 0); if (!rf->merge_commit) - return opterror(opt, "must point to a commit", 0); + return error(_("option `%s' must point to a commit"), opt->long_name); return 0; } |