am ae7ac25f: (-s ours) am ad7bb081: (-s ours) Import translations. DO NOT MERGE

* commit 'ae7ac25ffbbe5d855a7cbc8b940916a24c777027':