fixing translations for french non results page
fixing merge conflicts