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

* commit '90b69615706cee73363c3420e2d81a184f9acc07':
  Import translations. DO NOT MERGE