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

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