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

* commit '50391871e61e491cf766fc83e261a8345d1cb5b6':
  Import translations. DO NOT MERGE