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

* commit '8f61cc9b1b38a80067aa31dd04de88089dfccfff':
  Import translations. DO NOT MERGE