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

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