Merge change 1418 into donut

* changes:
  Show locale names in alphabetical order, in their own language.