am 282de588: (-s ours) am 5a470175: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '282de588c41341f0a0ba4f7c6e503b417d0b748d':
  Import translations. DO NOT MERGE