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

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