Resolve "Improve Localization"

Merged Dominik Hebeler requested to merge 1216-improve-localization into development

Merge request reports