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

* commit 'c184ed7683f3d56ca545ac91c15c747f5460addc':
  Import translations. DO NOT MERGE