treewide: fix weblate merge conflicts
authorJo-Philipp Wich <jo@mein.io>
Sat, 23 Nov 2019 23:11:48 +0000 (00:11 +0100)
committerJo-Philipp Wich <jo@mein.io>
Sat, 23 Nov 2019 23:11:48 +0000 (00:11 +0100)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Trivial merge