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

* commit '04631ba71e6ddacab0d4f0e0cbc5e6b8f914a522':
  Import translations. DO NOT MERGE