From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jan 2022 19:52:56 +0000 (-0800)
Subject: Merge branch 'ja/i18n-similar-messages'
X-Git-Tag: v2.35.0-rc0~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c17de5a505a2da23fcbfefdc8b0aad3f045a510f;p=thirdparty%2Fgit.git

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"
---

c17de5a505a2da23fcbfefdc8b0aad3f045a510f