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

* commit 'baa228619eaa813f15c07988511aba924b96b7a1':
  Import translations. DO NOT MERGE