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

* commit '049a22bb30f20287674b2acf329cd7bf972379ea':
  Import translations. DO NOT MERGE