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

* commit '170735d46001659e64522f451681a0618685efc6':
  Import translations. DO NOT MERGE