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

* commit '2a22627e179cdb767c709dc68d78b4903d9239f9':
  Import translations. DO NOT MERGE