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

* commit '829b3dfae033084beac9189682f1d191f3eaac16':
  Import translations. DO NOT MERGE