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

* commit '24081d3cb7c9c7742bf457a3be42fc58f5bbfda0':
  Import translations. DO NOT MERGE