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

* commit '839ab5f2596444fb0a2b1b1f23a7b2598ba90ba7':
  Import translations. DO NOT MERGE