am 3342bbc2: (-s ours) Import translations. DO NOT MERGE

* commit '3342bbc2b87d0b8cd35edb34ac5e5b8b906c6a08':
  Import translations. DO NOT MERGE