am 90840e27: (-s ours) am b3c967ae: (-s ours) Import translations. DO NOT MERGE

* commit '90840e271c57531a88e15697e8c3fcd83b466836':
  Import translations. DO NOT MERGE