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

* commit '71b82aedca5c8d38bed8f3f75d3c71f82cedcd3b':
  Import translations. DO NOT MERGE