am 28b49694: (-s ours) am e3da3502: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal authored
* commit '28b49694':
  Import translations. DO NOT MERGE
714dc4e6