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

* commit '2ace394cf3645138c61e60b8450b8e5d80ea0c32':
  Import translations. DO NOT MERGE