Fix translation support

Merged Erick Hitter requested to merge fix/i18n into master

Merge request reports