Harmonized standards - english localization improved
Merge branch 'master' into quasar