treewide: fix weblate merge conflicts