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

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