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

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