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

* commit '2d6e077d1db0da9a008ff6014ebbb555c30a7c47':
  Import translations. DO NOT MERGE