re #864 - Improved translations
Merge branch 'feature/864-district' into staging