Merge branch 'master' of git://github.com/UniSharp/laravel-filemanager

Author: streamtw

LICENSE

@@ -1,5 +1,7 @@
 The MIT License (MIT)
 
+Copyright (c) 2015 Trevor Sawler <https://github.com/tsawler>
+Copyright (c) 2015 All contributors from GitHub
 Copyright (c) 2015 UniSharp
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

README.md

@@ -1,16 +1,18 @@
 # laravel-filemanager
 
+PR is welcome.
+
 ## Overview
 
- * Fork from [tsawler/laravel-filemanager](http://packalyst.com/packages/package/tsawler/laravel-filemanager)
- * support public and private folders for multi users
- * customizable views, routes and middlewares
- * supported locales : en, fr, zh-TW, zh-CN
+ * The project was forked from [tsawler/laravel-filemanager](http://packalyst.com/packages/package/tsawler/laravel-filemanager)
+ * Support public and private folders for multi users
+ * Customizable views, routes and middlewares
+ * Supported locales : en, fr, zh-TW, zh-CN
 
 ## Requirements
 
  * php >= 5.5
- * Laravel 5 (working to support Laravel 4)
+ * Laravel 5
  * requires [intervention/image](https://github.com/Intervention/image)(to make thumbs, crop and resize images).
 
 ## Installation
@@ -123,3 +125,11 @@ In `config/lfm.php` :
     ```bash
     cp -rf vendor/unisharp/laravel-filemanager/src/views/ resources/views/vendor/laravel-filemanager/
     ```
+
+## Credits
+ * All contibutors from GitHub. (issues / PR)
+ * Special thanks to
+   * [@taswler](https://github.com/tsawler) the author.
+   * [@welcoMattic](https://github.com/welcoMattic) providing fr locale and lots of bugfixes.
+   * [@olivervogel](https://github.com/olivervogel) for the awesome [image library](https://github.com/Intervention/image)
+   * [@UniSharp members](https://github.com/UniSharp)

src/lang/fr/lfm.php

@@ -33,12 +33,12 @@
     'message-name'      => 'Nom du dossier:',
     'message-rename'    => 'Renommer le dossier:',
 
-    'error-rename'      => 'File name already in use!',
-    'error-file-empty'  => 'You must choose a file!',
-    'error-file-exist'  => 'A file with this name already exists!',
-    'error-delete'      => 'You cannot delete this folder because it is not empty!',
-    'error-folder-name' => 'Folder name cannot be empty!',
-    'error-folder-exist'=> 'A folder with this name already exists!',
+    'error-rename'      => 'Ce nom est déjà pris !',
+    'error-file-empty'  => 'Veuillez choisir un fichier',
+    'error-file-exist'  => 'Un fichier avec ce nom existe déjà !',
+    'error-delete'      => 'Vous ne pouvez pas supprimer ce dossier car il n'est pas vide,
+    'error-folder-name' => 'Le nom du dossier ne peut pas être vide',
+    'error-folder-exist'=> 'Un dossier avec ce nom existe déjà !',
 
     'btn-upload'        => 'Envoyer le fichier',
     'btn-close'         => 'Fermer',