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

* commit '7eff23eeb2e76d9f434bef7a954ea0d5ade5e28d':
  Import translations. DO NOT MERGE