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

* commit '4e4ef211382d05c17c93b68fe0ab347a64951a9c':
  Import translations. DO NOT MERGE