am 4cd6aff7: (-s ours) am 0eaaa2d8: (-s ours) Import translations. DO NOT MERGE

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