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

* commit '4beffadcc0a9fd3a265cbdd71b3a1f320888e805':
  Import translations. DO NOT MERGE