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

* commit '92756b89c8be90ceb9804f3e77731e233c522a2c':
  Import translations. DO NOT MERGE