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

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