am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import translations. DO NOT MERGE am: e2b5070c10  -s ours
am: 87a98ceb75  -s ours

* commit '87a98ceb75a753796f34854bab3a0b497371f3e3':