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

* commit '006f4664abd04c079db2ad793f79feb820ccade5':
  Import translations. DO NOT MERGE