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

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