am 03c248aa: (-s ours) am 51ad6520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '03c248aadece8459d2568dd8721d46cf748c7a56':
  Import translations. DO NOT MERGE