localised map type names
Merge branch 'DA-411' into unstable

* DA-411:
  localised map type names