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

* commit '0294816692f17f10ec1a76ff780b0e32416e70fc':
  Import translations. DO NOT MERGE