am 2b8858a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '2b8858a901e45119c78e239c2c34b3e2486ee692':
  Import translations. DO NOT MERGE