am cee36f1c: (-s ours) Import translations. DO NOT MERGE

* commit 'cee36f1cc31c08c11f439cca337a62b2e44c48fc':
  Import translations. DO NOT MERGE