Merge branch 'oliviercrouzet-french_translation'

system/Controllers/SettingsController.php

@@ -751,12 +751,13 @@ class SettingsController extends Controller
 		
 	private function getLanguages()
 	{
-		return array(
-			'en' => 'English',
-			'ru' => 'Russian',
-			'nl' => 'Dutch, Flemish',
-			'de' => 'German',
-			'it' => 'Italian',
-		);
-	}
-}
+		return array(
+			'en' => 'English',
+			'ru' => 'Russian',
+			'nl' => 'Dutch, Flemish',
+			'de' => 'German',
+			'it' => 'Italian',
+			'fr' => 'French',
+		);
+	}
+}