am ce0854cc: (-s ours) am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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