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

* commit '4f4ef946adf06aa89f4738de9b60832938c70012':
  Import translations. DO NOT MERGE