Merge branch 'master' of https://github.com/wesnoth/wesnoth
Messed up the commit message... Revert "Changed blabla"

This reverts commit acad23790b1123403fcdde4b077003b820112837.
Fixed bug #21926: gui dialog gives a more appropriate message