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

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