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

* commit '01031911fe83414f045f63bc87cfab32d2f22e37':
  Import translations. DO NOT MERGE