Adding i18n from develper branch

Adds i18n and updates the files.