French Update
Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.mo
	zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.po