am 3ca90d33: (-s ours) am 424df443: Import translations. DO NOT MERGE

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