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

* commit '4a9fca8041be6254d804c32a24059a613def2404':
  Import translations. DO NOT MERGE