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

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