Add new .po file
Merge branch 'master' into translations-round-2

Conflicts:
	locale/fra/LC_MESSAGES/django.mo
	locale/fra/LC_MESSAGES/django.po
Merge branch 'master' into translations-round-2

Conflicts:
	locale/fr/LC_MESSAGES/django.mo
	locale/fra/LC_MESSAGES/django.mo
	locale/fra/LC_MESSAGES/django.po
Merge pull request #2818 from dimagi/translations-round-2

Translations round 2