Merge branch 'merge-branch'

d4662621 · wind2009 · e6d895fc · f6e3d892 · d4662621 · d4662621
Commit d4662621 authored Aug 24, 2020 by wind2009
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1062 additions and 913 deletions

locales/ja-JP/cards.cdb locales/ja-JP/cards.cdb +0 -0

locales/ja-JP/strings.conf locales/ja-JP/strings.conf +1062 -913

No files found.
--- a/locales/ja-JP/cards.cdb
+++ b/locales/ja-JP/cards.cdb
--- a/locales/ja-JP/strings.conf
+++ b/locales/ja-JP/strings.conf