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

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