am b8d55913: (-s ours) am 3a9c1a0f: (-s ours) Import translations. DO NOT MERGE

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