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

* commit '41c3cb387aba237a42ace7eb17ee7a926fcfdec7':
  Import translations. DO NOT MERGE