am 5318a0d3: (-s ours) am 249100c1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '5318a0d3059c65f51464c7110e34d4f5a33de7be':
  Import translations. DO NOT MERGE