update locale content
Merge branch 'master' of github.com:5xRuby/5xruby.tw

Conflicts:
	config/locales/views.zh-TW.yml