Exclude conf.php file from git
fix some trad
Merge pull request #1181 from grandoc/3.3

fix some trad
Merge remote-tracking branch 'origin/3.3' into 3.4
Fix: Bad translation (to pick to 3.4)

Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
Revert a bad fix.
Merge remote-tracking branch 'origin/3.4' into 3.4_agefodd