Merge branch 'worldtbpro' of https://gitlab.com/roozeec/vdmv into worldtbpro

Conflicts:
	Locale/spa/LC_MESSAGES/default.mo
	Locale/spa/LC_MESSAGES/default.po
