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

* commit '971ca440abad05e96df96e8f30c8a262f5be6f31':
  Import translations. DO NOT MERGE