Improved internationalization
Merge branch 'master' of https://github.com/fireflystorm/Antox into fireflystorm-master
Merge branch 'fireflystorm-master'