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

* commit '082c7dbc02962b321d6d6efddd683d056579b29d':
  Import translations. DO NOT MERGE