[1.6.x] Fixed #21650 -- Corrected bad advice for plural translation.
[1.6.x] Fixed #21650 -- Corrected bad advice for plural translation.

Thanks nedbatchelder and claudep.

Backport of 85270ef3f5 from master

redhat-openstack/django,dex4er/django,django-nonrel/django,felixjimenez/django,dex4er/django,felixjimenez/django,felixjimenez/django,redhat-openstack/django,redhat-openstack/django,redhat-openstack/django,felixjimenez/django,django-nonrel/django,dex4er/django,django-nonrel/django,django-nonrel/django