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

* commit '611dd7b70a809ac766e4e1675a4ae1a115cf6cdf':
  Import translations. DO NOT MERGE