am 3bcb25fe: (-s ours) am bf572fc2: (-s ours) Import translations. DO NOT MERGE

* commit '3bcb25fe4c7279f09055eb51f1d36771786da8b3':
  Import translations. DO NOT MERGE