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

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