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

* commit '0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
  Import translations. DO NOT MERGE