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

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