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

* commit '39a12d163a9dcadff3f9c00f2c582851ef4301b8':
  Import translations. DO NOT MERGE