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

* commit 'ca78b88eaa4d8b14d2dc1347f65715d2008e2974':
  Import translations. DO NOT MERGE