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

* commit '97b1f619588f5def6bd0b78ba5b60d57e8d95d23':
  Import translations. DO NOT MERGE