Update French translation of the usermanual after git reset --hard upstream/master
Merge remote-tracking branch 'origin'

Conflicts:
	doc/usermanual/po/fr.po (solved)