Fix errors by merging remote-tracking branch 'weblate/master'