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

* commit '3f4c6bb5ab254c5f5cbca0e3439b157f117e00b4':
  Import translations. DO NOT MERGE