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

* commit 'd6c7fd28d0295dca2ed0bc92301a059a57386bd4':
  Import translations. DO NOT MERGE