am 8ff7fa48: (-s ours) am bf99468a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '8ff7fa4836ee27a7d64961b2ff9e7b690ab48371':
  Import translations. DO NOT MERGE