am 1d5af7b7: (-s ours) am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '1d5af7b743fa32ca291d57a0b8b6998f7761c94d': Import translations. DO NOT MERGE
This commit is contained in: