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

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