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

* commit '3163d3c629d7c1db10ae1f74d1c3092ac9fddeeb':
  Import translations. DO NOT MERGE