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)
commit5e1253f4f7032e7bdbb106222f2bc2f0760bcb6d
treeb952e42636ca3e23dddd6dc6585e367faad739e4
parent23b03caaa011c9b3481a62a7af0a087ac1521e78
parent758e13625af83039b48309f32625cc62a867cf56
treewide: fix weblate merge conflicts

Signed-off-by: Jo-Philipp Wich <jo@mein.io>