am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '852750b321c8f23c0b776a193a65d8f78afcf22b':
  Import translations. DO NOT MERGE