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

* commit '04acf38ce281f86bd0f28485405c59e489657dfb':
  Import translations. DO NOT MERGE