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

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