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

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