Encode Chinese better?
Merge pull request #1292 from Fuzzysqurl/trans

Encode Chinese better...?
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bin/trans/zh-cn/db/pokes/pokemons.txt