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

* commit '537ea90e554946ccb05af321e19df3a3fb377d2a':
  Import translations. DO NOT MERGE