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

* commit '840587b309d52d31f9b4f3dc6e709145a9c96d6d':
  Import translations. DO NOT MERGE