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

* commit '68e70f9b144f474b3d63e1fbb04711a9e6bc9d19':
  Import translations. DO NOT MERGE