diff options
| author | René Scharfe <l.s.r@web.de> | 2023-11-26 12:57:43 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-27 10:01:45 +0900 |
| commit | 7854bf49604484a7276b96d312b9daf7d15c7b34 (patch) | |
| tree | f43a43e0e1a3d45951af84c20e5111041ac3b24e /parse-options.c | |
| parent | 564d0252ca632e0264ed670534a51d18a689ef5d (diff) | |
| download | git-7854bf49604484a7276b96d312b9daf7d15c7b34.tar.gz | |
i18n: factorize even more 'incompatible options' messages
Continue the work of 12909b6b8a (i18n: turn "options are incompatible"
into "cannot be used together", 2022-01-05) and a699367bb8 (i18n:
factorize more 'incompatible options' messages, 2022-01-31) to use the
same parameterized error message for reporting incompatible command line
options. This reduces the number of strings to translate and makes the
UI slightly more consistent.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c index e0c94b0546..c3955847f4 100644 --- a/parse-options.c +++ b/parse-options.c @@ -279,7 +279,8 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p, opt_name = optnamearg(opt, arg, flags); other_opt_name = optnamearg(elem->opt, elem->arg, elem->flags); - error(_("%s is incompatible with %s"), opt_name, other_opt_name); + error(_("options '%s' and '%s' cannot be used together"), + opt_name, other_opt_name); free(opt_name); free(other_opt_name); return -1; |