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

* commit '6ace2bc9264f9d6c2d3ee9ae74e147275e165a18':
  Import translations. DO NOT MERGE