am 216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '216b5c501bb81977407b5977e6ee709b34f3a37d':
  Import translations. DO NOT MERGE