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

* commit '35fb6cdf14549dac07585ae791b27e2c069bf176':
  Import translations. DO NOT MERGE