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

* commit '548622a26ac758f72eb0dbb16cd83aa5d51f2b2b':
  Import translations. DO NOT MERGE