am 154abe1e: (-s ours) am 2bc2574e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '154abe1e7b66b1a09d62beefe7aab95820f028d1':
  Import translations. DO NOT MERGE