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

* commit '1bfd35410db22b1f4aabe4ad3f471bedb088584d':
  Import translations. DO NOT MERGE