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

* commit '79cfdb20be13e424089849a92c49516bfe785c90':
  Import translations. DO NOT MERGE