diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-26 02:47:35 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-26 02:47:35 +0300 |
| commit | d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde (patch) | |
| tree | 3b0761ff79a4e4a5c50263a8d324b6c6a9268e35 /builtin/blame.c | |
| parent | a47fcfe8712e3258d1c565cd654c9bd5312a5168 (diff) | |
| parent | 9164d97a63b31614a52571d708f1ef151b97db71 (diff) | |
Merge branch 'ja/i18n-common-messages'
Unify more messages to help l10n.
* ja/i18n-common-messages:
i18n: fix some misformated placeholders in command synopsis
i18n: remove from i18n strings that do not hold translatable parts
i18n: factorize "invalid value" messages
i18n: factorize more 'incompatible options' messages
Diffstat (limited to 'builtin/blame.c')
| -rw-r--r-- | builtin/blame.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index ef831de5ac..8d15b68afc 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -721,8 +721,8 @@ static int git_blame_config(const char *var, const char *value, void *cb) } if (!strcmp(var, "color.blame.repeatedlines")) { if (color_parse_mem(value, strlen(value), repeated_meta_color)) - warning(_("invalid color '%s' in color.blame.repeatedLines"), - value); + warning(_("invalid value for '%s': '%s'"), + "color.blame.repeatedLines", value); return 0; } if (!strcmp(var, "color.blame.highlightrecent")) { @@ -739,7 +739,8 @@ static int git_blame_config(const char *var, const char *value, void *cb) coloring_mode &= ~(OUTPUT_COLOR_LINE | OUTPUT_SHOW_AGE_WITH_COLOR); } else { - warning(_("invalid value for blame.coloring")); + warning(_("invalid value for '%s': '%s'"), + "blame.coloring", value); return 0; } } |