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

* commit '7171bdb422d67744a0847c506b3e9e718a344af5':
  Import translations. DO NOT MERGE