am 821db737: (-s ours) am 93d67f65: (-s ours) am 6949eb15: (-s ours) am 815b31f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '821db73793e5b6f779cada48a51a9740eb885fff':
  Import translations. DO NOT MERGE