am cfc26fae: (-s ours) am 17e8f437: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'cfc26faeed96a10d9b93fab10cce0e9fc2fb25a1':
  Import translations. DO NOT MERGE