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

* commit '54a973981115c8af2c96fab24e6520c39b9972ab':
  Import translations. DO NOT MERGE