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

* commit '2d91bc23128fc1ab2a958a24c84f75d653886ef1':
  Import translations. DO NOT MERGE