am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '84f5bf823972b87be1ee0334f96a2ed3216e81a7':
  Import translations. DO NOT MERGE