diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:56 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:56 -0800 |
commit | c17de5a505a2da23fcbfefdc8b0aad3f045a510f (patch) | |
tree | ffe4bd8ace908793b99ee45fb8e1b17be5fb7e2d /t/chainlint/multi-line-string.expect | |
parent | Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix' (diff) | |
parent | i18n: turn even more messages into "cannot be used together" ones (diff) | |
download | tgif-c17de5a505a2da23fcbfefdc8b0aad3f045a510f.tar.xz |
Merge branch 'ja/i18n-similar-messages'
Similar message templates have been consolidated so that
translators need to work on fewer number of messages.
* ja/i18n-similar-messages:
i18n: turn even more messages into "cannot be used together" ones
i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"
i18n: factorize "--foo outside a repository"
i18n: refactor "unrecognized %(foo) argument" strings
i18n: factorize "no directory given for --foo"
i18n: factorize "--foo requires --bar" and the like
i18n: tag.c factorize i18n strings
i18n: standardize "cannot open" and "cannot read"
i18n: turn "options are incompatible" into "cannot be used together"
i18n: refactor "%s, %s and %s are mutually exclusive"
i18n: refactor "foo and bar are mutually exclusive"
Diffstat (limited to 't/chainlint/multi-line-string.expect')
0 files changed, 0 insertions, 0 deletions