am 3d84b383: (-s ours) am 3305a02d: (-s ours) Import translations. DO NOT MERGE

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