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

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