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

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