am ba3b6a37: (-s ours) am 40705a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'ba3b6a376658313e76b76e0989222fe0884e7247':
  Import translations. DO NOT MERGE