am f49e905d: (-s ours) am 9fac104a: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal authored
* commit 'f49e905d':
  Import translations. DO NOT MERGE
6bd4a775