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

* commit '89ed56fa6c5951e4ce7ea555ae8f90c65b2daa2d':
  Import translations. DO NOT MERGE