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

* commit '25f9f364f58a1338f16c3a3e87a8810a65e87302':
  Import translations. DO NOT MERGE