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

* commit '6564aa053e240e8a4eb75191ecf03ab135eedad8':
  Import translations. DO NOT MERGE