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

* commit '60772a576578436e012e9bda521b872b5a8c7eb5':
  Import translations. DO NOT MERGE