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

* commit '299926e60f4ac8ef3a228ca38ce45d290b69659b':
  Import translations. DO NOT MERGE