Merge branch '821-fix_maps_translation' into 'master'

Makes maps translatable

See merge request !101
1 job for master in 10 minutes and 6 seconds (queued for 3 seconds)