am e35594f9: (-s ours) am 3c8bbd2f: (-s ours) am 40823338: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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