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

* commit '8027100fdb13c046838f9af12ef7bf2bc3ad511f':
  Import translations. DO NOT MERGE