translation update
Merge remote-tracking branch 'origin/pr/133'

Conflicts:
	lang/fr/settings.php