am 4f8b040d: (-s ours) am f222e288: (-s ours) Import translations. DO NOT MERGE

* commit '4f8b040d85d14eaef18967ae11493af1b3bdf41d':
  Import translations. DO NOT MERGE