Merge branch 'master' into weblate-master-fix

# Conflicts:
#	src/lang/ga.json
#	src/lang/it-IT.json
#	src/lang/pt-BR.json
#	src/lang/sk.json