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

* commit '3e9fac9037523826464c9a6e5ae4d18e9e955f09':
  Import translations. DO NOT MERGE