treewide: Fix conflicts with 'weblate/master'