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

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