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

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