am 1ffa6b17: (-s ours) am b0b153f5: (-s ours) Import translations. DO NOT MERGE

* commit '1ffa6b17ece33ba00d32344f850f0488caaf250f':
  Import translations. DO NOT MERGE