delete trans
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_ja_jp.properties
	test_zh_cn.properties