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

* commit '17e8f4377cac0f168deabf5ea1dfb435394ac571':
  Import translations. DO NOT MERGE