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

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