i18n improved
Merge branch 'master' of github.com:ITDSystems/alvex