am 3bb733ba: (-s ours) am 4a4fa0a3: (-s ours) Import translations. DO NOT MERGE

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