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

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