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

* commit 'cba397dd248ed6c6cd43ee0b1065ec80c2b7710c':
  Import translations. DO NOT MERGE