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

* commit '9cd24101315392d6b58331a7969696ba873103f6':
  Import translations. DO NOT MERGE