an better way to implement translate()
Merge remote-tracking branch 'origin/master'

Conflicts:
	root/js/translate.js