Merge branch 'ja/i18n-common-messages'
commitd21d5ddfe675f9dbcdbb94ab01776115a2d1fdde
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Feb 2022 23:47:35 +0000 (25 15:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Feb 2022 23:47:35 +0000 (25 15:47 -0800)
tree3b0761ff79a4e4a5c50263a8d324b6c6a9268e35
parenta47fcfe8712e3258d1c565cd654c9bd5312a5168
parent9164d97a63b31614a52571d708f1ef151b97db71
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
17 files changed:
builtin/am.c
builtin/blame.c
builtin/fetch.c
builtin/hash-object.c
builtin/log.c
builtin/pack-objects.c
builtin/pull.c
builtin/rebase.c
builtin/reflog.c
builtin/sparse-checkout.c
builtin/submodule--helper.c
diff-merges.c
gpg-interface.c
parse-options.c
parse-options.h
sequencer.c
submodule-config.c