Apply patch from Marek Černocký with fix for dealing with plurals in text