am 374b6837: (-s ours) am f69a3ab7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '374b68371bf0c51de8871f4fe22d3d37f75daf52':
  Import translations. DO NOT MERGE