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

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