Updated Chinese language with Traditional/Simplified
Merge conflict

Conflicts:
	lib/country.rb