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

* commit '9fd72934d3a41f6a82463d4a20802bf639c89fcc':
  Import translations. DO NOT MERGE