am 12b8720e: (-s ours) am e74a4c7c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '12b8720e4f4bc1792bbf97c36e389b18b81583d6':
  Import translations. DO NOT MERGE