am 861beac4: (-s ours) am 87bcd150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '861beac4f3c04850a8f99fca0bafb002a5ddecdf':
  Import translations. DO NOT MERGE