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

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