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

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