CC-4734: French - UI breaks in several places

-fixed
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo