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

* commit '16f4db1704506a9c305a6bffd6a46c7d60a58154':
  Import translations. DO NOT MERGE