fixing translations for french non results page
fixing merge conflicts
Merge branch 'master' of github.com:dubizzle/fuego-locale into weblate

Conflicts:
	fr_DZ/LC_MESSAGES/django.mo
	fr_TN/LC_MESSAGES/django.mo