]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ja/i18n-similar-messages'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:56 +0000 (11:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:56 +0000 (11:52 -0800)
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"

15 files changed:
1  2 
apply.c
builtin/am.c
builtin/branch.c
builtin/checkout.c
builtin/clone.c
builtin/fast-export.c
builtin/fetch.c
builtin/log.c
builtin/ls-files.c
builtin/merge.c
builtin/repack.c
builtin/rm.c
builtin/stash.c
diff.c
revision.c

diff --cc apply.c
Simple merge
diff --cc builtin/am.c
Simple merge
Simple merge
Simple merge
diff --cc builtin/clone.c
Simple merge
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/log.c
Simple merge
Simple merge
diff --cc builtin/merge.c
Simple merge
Simple merge
diff --cc builtin/rm.c
Simple merge
diff --cc builtin/stash.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc revision.c
Simple merge