Import translations. DO NOT MERGE am: dde05a2  -s ours
am: bff58f2  -s ours

* commit 'bff58f23960f9874b46e5f479ca26c922c05791f':