New translations
Merge branch 'master' and resolve conflict

Conflicts:
	src/language/fr-FR/admin.po
Finish merge
-
Merge