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

* commit '4516c695b2d8fdbc7dc0427a98841805e47f1e16':
  Import translations. DO NOT MERGE