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

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