Fix duplicate Chinese Pokemon names

Meowstic and Meowstic-F have the same Chinese names
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bin/trans/zh-cn/db/pokes/pokemons.txt
Add Chinese translations of new Mega and forms
Merge pull request #1293 from KalaShayminS/master

Add Chinese translations of new Mega and forms