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

* commit 'aed314e8f3e53627518222777c2fe89666bfd643':
  Import translations. DO NOT MERGE