localization
clean up
update code
Merge branch 'i18n-each'