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

* commit '48f89343d9abdaa81dcdbebd7a15b2b313d67aa7':
  Import translations. DO NOT MERGE