Merge pull request #3556 from GongMingCai/development

author Dan Brown <redacted>

Wed, 27 Jul 2022 10:18:05 +0000 (11:18 +0100)

committer GitHub <redacted>

Wed, 27 Jul 2022 10:18:05 +0000 (11:18 +0100)
author Dan Brown <redacted>
Wed, 27 Jul 2022 10:18:05 +0000 (11:18 +0100)
committer GitHub <redacted>
Wed, 27 Jul 2022 10:18:05 +0000 (11:18 +0100)
diff --cc resources/lang/zh_CN/entities.php
Simple merge
diff --cc resources/lang/zh_TW/entities.php
Simple merge
author	Dan Brown <redacted>
	Wed, 27 Jul 2022 10:18:05 +0000 (11:18 +0100)
committer	GitHub <redacted>
	Wed, 27 Jul 2022 10:18:05 +0000 (11:18 +0100)
		1	2
resources/lang/zh_CN/entities.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/zh_TW/entities.php	patch \|	diff1 \|	diff2 \|	blob \| history