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

* commit '48557d6db32c9b489d8c3f165976bf7a92fee5c1':
  Import translations. DO NOT MERGE