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

* commit '079fe0fba31b0781eca73db934dfe2290fea3891':
  Import translations. DO NOT MERGE