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

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