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

* commit '20675fff1b8d0f094a4f5ca3e17772456619f853':
  Import translations. DO NOT MERGE