Fix/i18n translations

Fixes #530 (translation fix)
Please see commit messages for further info.