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

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