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

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