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

* commit '694980e075f05e7c0038c2c0c06153a13fb84149':
  Import translations. DO NOT MERGE