diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-25 23:47:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-25 23:47:35 (GMT) |
| commit | d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde (patch) | |
| tree | 3b0761ff79a4e4a5c50263a8d324b6c6a9268e35 /builtin/am.c | |
| parent | a47fcfe8712e3258d1c565cd654c9bd5312a5168 (diff) | |
| parent | 9164d97a63b31614a52571d708f1ef151b97db71 (diff) | |
| download | git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.zip git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.tar.gz git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.tar.bz2 | |
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/am.c')
| -rw-r--r-- | builtin/am.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/builtin/am.c b/builtin/am.c index 7de2c89..c0a3ff7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -199,7 +199,7 @@ static int am_option_parse_empty(const struct option *opt, else if (!strcmp(arg, "keep")) *opt_value = KEEP_EMPTY_COMMIT; else - return error(_("Invalid value for --empty: %s"), arg); + return error(_("invalid value for '%s': '%s'"), "--empty", arg); return 0; } @@ -2239,7 +2239,8 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int * when you add new options */ else - return error(_("Invalid value for --patch-format: %s"), arg); + return error(_("invalid value for '%s': '%s'"), + "--patch-format", arg); return 0; } @@ -2282,7 +2283,8 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar break; } if (new_value >= ARRAY_SIZE(valid_modes)) - return error(_("Invalid value for --show-current-patch: %s"), arg); + return error(_("invalid value for '%s': '%s'"), + "--show-current-patch", arg); } if (resume->mode == RESUME_SHOW_PATCH && new_value != resume->sub_mode) |