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

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