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

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