am 675b4871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '675b48712ecd0de46d6d3828890b8ca25f1df2bf':
  Import translations. DO NOT MERGE