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

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