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

* commit '42c0488a4b4db802161dc60a0bd16d2e5bc6afbe':
  Import translations. DO NOT MERGE