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

* commit '825bfb4f7e9b87bf49a76d9fb43623da1df0df19':
  Import translations. DO NOT MERGE