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

* commit '5cc3ddf16fee6d6aa8439e6ebcb3f3feeec98608':
  Import translations. DO NOT MERGE