am ad141bd7: (-s ours) am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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