Squashed commit of the following:

commit 95ae26eb2a Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:21:33 2015 -0800 Updated docs location commit cfebe11755 Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:20:36 2015 -0800 Updated docs for 4.2 commit d86b5aa613 Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:20:24 2015 -0800 Bumped version
Merge remote-tracking branch 'origin/develop'
2015-02-08 16:22:12 -08:00 · 2015-02-08 16:18:09 -08:00 · 2015-02-08 16:17:45 -08:00 · 2015-02-08 16:13:25 -08:00 · 2015-02-08 16:13:10 -08:00 · 2015-02-08 16:02:35 -08:00
105 changed files with 852 additions and 252 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,13 +6,12 @@ Please submit all issues and pull requests to the [snipe/snipe-it](http://github

 If you don't have a feature in mind, but would like to contribute back to the project, check out the [open issues](https://github.com/snipe/snipe-it/issues?state=open) and see if there are any you can tackle.

-We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
+-----

 [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)

 The labels we use in GitHub Issues and Waffle.io indicate whether we've confirmed an issue as a bug, whether we're considering the issue as a potential feature, and whether it's ready for someone to work on it. We also provide labels such as "n00b", "intermediate" and "advanced" for the experience level we think it requires for contributors who want to help.

-----

 ## Translations!

--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@

 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.

-It is built on [Laravel 4.1](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
+It is built on [Laravel 4.2](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.

 This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo.php).)

@@ -16,7 +16,7 @@ __This is web-based software__. This means there there is no executable file (ak
 -----
 ### Documentation & Installation

-__Installation and configuration documentation for this project has been moved to http://docs.snipeitapp.com.__ This provides a more easily navigated, organized view of the documentation, and is based off of the [documentation branch](https://github.com/snipe/snipe-it/tree/documentation) in this repo. Contributions and bugfixes to the documentation are always welcome!
+__Installation and configuration documentation for this project has been moved to http://snipeitapp.com/documentation/.__

 We'll be adding a long-overdue user's manual soon as well.

@@ -65,3 +65,7 @@ Whenever you pull down a new version from master or develop, when you grab the [
 	php artisan migrate

 Forgetting to do this can mean your DB might end up out of sync with the new files you just pulled, or you may have some funky cached autoloader values. It's a good idea to get into the habit of running these every time you pull anything new down. If there are no database changes to migrate, it won't hurt anything to run migrations anyway.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/snipe/snipe-it/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -38,40 +38,21 @@ class AssetsController extends AdminController
    {
        // Grab all the assets

+		$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')->Hardware();
        // Filter results
        if (Input::get('Pending')) {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-        	->whereNull('status_id','and')
-        	->where('assigned_to','=','0')
-        	->where('physical', '=', 1)
-        	->get();
+        	$assets->Pending();
        } elseif (Input::get('RTD')) {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-        	->where('status_id', '=', 0)
-        	->where('assigned_to', '=', '0')
-        	->where('physical', '=', 1)
-        	->orderBy('asset_tag', 'ASC')
-        	->get();
+        	$assets->RTD();
        } elseif (Input::get('Undeployable')) {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-        	->where('status_id', '>', 1)
-        	->where('physical', '=', 1)
-        	->orderBy('asset_tag', 'ASC')
-        	->get();
+        	$assets->Undeployable();
        } elseif (Input::get('Deployed')) {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-        	->where('status_id', '=', 0)
-        	->where('physical', '=', 1)
-        	->where('assigned_to','>','0')
-        	->orderBy('asset_tag', 'ASC')
-        	->get();
-        } else {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc')
-        	->where('physical', '=', 1)
-        	->orderBy('asset_tag', 'ASC')
-        	->get();
+        	$assets->Deployed();
        }

+        $assets = $assets->orderBy('asset_tag', 'ASC')->get();
+
+
        // Paginate the users
        /**$assets = $assets->paginate(Setting::getSettings()->per_page)
            ->appends(array(
@@ -85,6 +66,8 @@ class AssetsController extends AdminController
        return View::make('backend/hardware/index', compact('assets'));
    }

+
+
    /**
     * Asset create.
     *
--- a/app/lang/ar/admin/licenses/message.php
+++ b/app/lang/ar/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/ar/button.php
+++ b/app/lang/ar/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'تعديل',
-    'delete'  => 'حذف',
-    'restore' => 'إستعادة',
-    'actions' => 'الإجراءات',
-    'submit'  => 'إرسال',
+    'actions' 	=> 'الإجراءات',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'حذف',
+    'edit'    	=> 'تعديل',
+    'restore' 	=> 'إستعادة',
+    'submit'  	=> 'إرسال',
+    'upload'    => 'Upload',

 );
--- a/app/lang/ar/general.php
+++ b/app/lang/ar/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'العنوان',
    'admin'					=> 'الإدارة',
    'all_assets'			=> 'كل الأصول',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'تعديل الملف الشخصي',
    'eol'					=> 'الحياة',
    'first_name'			=> 'الإسم الأول',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'المجموعات',
    'gravatar_email'        => 'البريد الإلكتروني لخدمة Gravatar',
--- a/app/lang/cs/admin/licenses/message.php
+++ b/app/lang/cs/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/cs/button.php
+++ b/app/lang/cs/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Upravit',
-    'delete'  => 'Smazat',
-    'restore' => 'Obnovit',
-    'actions' => 'Akce',
-    'submit'  => 'Odeslat',
+    'actions' 	=> 'Akce',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Smazat',
+    'edit'    	=> 'Upravit',
+    'restore' 	=> 'Obnovit',
+    'submit'  	=> 'Odeslat',
+    'upload'    => 'Upload',

 );
--- a/app/lang/cs/general.php
+++ b/app/lang/cs/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Adresa',
    'admin'					=> 'Admin',
    'all_assets'			=> 'Všechna zařízení',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Upravit profil',
    'eol'					=> 'Konec životnosti',
    'first_name'			=> 'Jméno',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Vytvořit',
    'groups'				=> 'Skupiny',
    'gravatar_email'        => 'Emailová adresa Gravatar',
--- a/app/lang/cs/validation.php
+++ b/app/lang/cs/validation.php
@@ -13,20 +13,20 @@ return array(
    |
    */

-    "accepted"         => "The :attribute must be accepted.",
-    "active_url"       => "The :attribute is not a valid URL.",
-    "after"            => "The :attribute must be a date after :date.",
-    "alpha"            => "The :attribute may only contain letters.",
-    "alpha_dash"       => "The :attribute may only contain letters, numbers, and dashes.",
-    "alpha_num"        => "The :attribute may only contain letters and numbers.",
-    "before"           => "The :attribute must be a date before :date.",
+    "accepted"         => "Je potřeba potvrdit :attribute.",
+    "active_url"       => ":attribute není platnou URL.",
+    "after"            => ":attribute nemůže být dříve než :date.",
+    "alpha"            => ":attribute může obsahovat pouze písmena.",
+    "alpha_dash"       => ":attribute může obsahovat pouze písmena, čísla, a pomlčky.",
+    "alpha_num"        => ":attribute může obsahovat pouze písmena čísla.",
+    "before"           => ":attribute nemůže být později než :date.",
    "between"          => array(
-        "numeric" => "The :attribute must be between :min - :max.",
-        "file"    => "The :attribute must be between :min - :max kilobytes.",
-        "string"  => "The :attribute must be between :min - :max characters.",
+        "numeric" => ":attribute musí být mezi :min - :max.",
+        "file"    => ":attribute musí být mezi :min - :max kilobajtů.",
+        "string"  => ":attribute smí obsahovat pouze :min - :max znaků.",
    ),
-    "confirmed"        => "The :attribute confirmation does not match.",
-    "date"             => "The :attribute is not a valid date.",
+    "confirmed"        => "Potvrzení :attribute se neshoduje.",
+    "date"             => ":attribute není platným datem.",
    "date_format"      => "The :attribute does not match the format :format.",
    "different"        => "The :attribute and :other must be different.",
    "digits"           => "The :attribute must be :digits digits.",
--- a/app/lang/da/admin/licenses/message.php
+++ b/app/lang/da/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/da/button.php
+++ b/app/lang/da/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Rediger',
-    'delete'  => 'Slet',
-    'restore' => 'Gendan',
-    'actions' => 'Handlinger',
-    'submit'  => 'Send',
+    'actions' 	=> 'Handlinger',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Slet',
+    'edit'    	=> 'Rediger',
+    'restore' 	=> 'Gendan',
+    'submit'  	=> 'Send',
+    'upload'    => 'Upload',

 );
--- a/app/lang/da/general.php
+++ b/app/lang/da/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Addresse',
    'admin'					=> 'Admin',
    'all_assets'			=> 'Alle aktiver',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'Fornavn',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Grupper',
    'gravatar_email'        => 'Gravatar email addresse',
--- a/app/lang/de/admin/licenses/form.php
+++ b/app/lang/de/admin/licenses/form.php
@@ -19,7 +19,7 @@ return array(
    'seats'             => 'Anzahl Aktivierungen',
    'serial'            => 'Seriennummer',
    'supplier'          => 'Lieferant',
-    'termination_date'  => 'Termination Date',
+    'termination_date'  => 'Ablaufdatum',
    'to_email'          => 'E-Mail des Lizenzerwerbers',
    'to_name'           => 'Name des Lizenzerwerbers',
    'update'            => 'Lizenz aktualisieren',
--- a/app/lang/de/admin/licenses/message.php
+++ b/app/lang/de/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'Die Kategorie wurde erfolgreich erstellt.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'Die Kategorie wurde nicht aktualisiert, bitte versuchen Sie es erneut.',
        'success' => 'Die Kategorie wurde erfolgreich aktualisiert.'
--- a/app/lang/de/admin/licenses/table.php
+++ b/app/lang/de/admin/licenses/table.php
@@ -5,7 +5,7 @@ return array(
    'assigned_to'   	=> 'Zugewiesen an',
    'checkout'   		=> 'Zurücknehmen/Herausgeben',
    'id'      			=> 'ID',
-    'license_email'   	=> 'License Email',
+    'license_email'   	=> 'Lizenziert für Email',
    'license_name'   	=> 'Lizenziert für',
    'purchase_date'   	=> 'Kaufdatum',
    'purchased'   		=> 'Gekauft',
--- a/app/lang/de/button.php
+++ b/app/lang/de/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Bearbeiten',
-    'delete'  => 'Löschen',
-    'restore' => 'Wiederherstellen',
-    'actions' => 'Aktionen',
-    'submit'  => 'Abschicken',
+    'actions' 	=> 'Aktionen',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Löschen',
+    'edit'    	=> 'Bearbeiten',
+    'restore' 	=> 'Wiederherstellen',
+    'submit'  	=> 'Abschicken',
+    'upload'    => 'Upload',

 );
--- a/app/lang/de/general.php
+++ b/app/lang/de/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Supplier Address',
    'admin'					=> 'Administrator',
    'all_assets'			=> 'Alle Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Profil bearbeiten',
    'eol'					=> 'EOL',
    'first_name'			=> 'Vorname',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generieren',
    'groups'				=> 'Gruppen',
    'gravatar_email'        => 'Gravatar E-Mail Adresse',
--- a/app/lang/en-GB/admin/licenses/message.php
+++ b/app/lang/en-GB/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/en-GB/button.php
+++ b/app/lang/en-GB/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/en-GB/general.php
+++ b/app/lang/en-GB/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/en-PT/admin/licenses/message.php
+++ b/app/lang/en-PT/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/en-PT/button.php
+++ b/app/lang/en-PT/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/en-PT/general.php
+++ b/app/lang/en-PT/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/es-ES/admin/licenses/message.php
+++ b/app/lang/es-ES/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'Categoría creada correctamente.'
    ),

+    'deletefile' => array(
+        'error'   => 'Archivo no eliminado. Por favor, vuelva a intentarlo.',
+        'success' => 'Archivo eliminado correctamente.',
+    ),
+
+    'upload' => array(
+        'error'   => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.',
+        'success' => 'Archivo(s) cargado correctamente.',
+        'nofiles' => 'No ha seleccionado ningún archivo subir',
+        'invalidfiles' => 'Uno o más suss archivos es demasiado grande o es un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
+    ),
+
    'update' => array(
        'error'   => 'La categoría no se ha actualizado, intentalo de nuevo.',
        'success' => 'Categoría actualizada correctamente.'
--- a/app/lang/es-ES/button.php
+++ b/app/lang/es-ES/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Editar',
-    'delete'  => 'Borrar',
-    'restore' => 'Restaurar',
-    'actions' => 'Acciones',
-    'submit'  => 'Enviar',
+    'actions' 	=> 'Acciones',
+    'add'    	=> 'Agregar nuevo',
+    'cancel'    => 'Cancelar',
+    'delete'  	=> 'Borrar',
+    'edit'    	=> 'Editar',
+    'restore' 	=> 'Restaurar',
+    'submit'  	=> 'Enviar',
+    'upload'    => 'Subir',

 );
--- a/app/lang/es-ES/general.php
+++ b/app/lang/es-ES/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Dirección',
    'admin'					=> 'Admin',
    'all_assets'			=> 'Todos los Equipos',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Editar Perfil',
    'eol'					=> 'EOL',
    'first_name'			=> 'Nombre',
+    'file_name'				=> 'Archivo',
+    'file_uploads'			=> 'Carga de Archivos',
    'generate'				=> 'Generar',
    'groups'				=> 'Grupos',
    'gravatar_email'        => 'Gravatar Email',
--- a/app/lang/fi/admin/licenses/message.php
+++ b/app/lang/fi/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'Lisenssi luotiin onnistuneesti.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'Lisenssiä ei päivitetty, yritä uudelleen',
        'success' => 'Lisenssi päivitettiin onnistuneesti.'
--- a/app/lang/fi/button.php
+++ b/app/lang/fi/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Muokkaa',
-    'delete'  => 'Poista',
-    'restore' => 'Palauta',
-    'actions' => 'Toiminnot',
-    'submit'  => 'Lähetä',
+    'actions' 	=> 'Toiminnot',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Poista',
+    'edit'    	=> 'Muokkaa',
+    'restore' 	=> 'Palauta',
+    'submit'  	=> 'Lähetä',
+    'upload'    => 'Upload',

 );
--- a/app/lang/fi/general.php
+++ b/app/lang/fi/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Osoite',
    'admin'					=> 'Ylläpitäjä',
    'all_assets'			=> 'Kaikki Laitteet',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Muokkaa Profiilia',
    'eol'					=> 'Elinikä',
    'first_name'			=> 'Etunimi',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Luo',
    'groups'				=> 'Ryhmät',
    'gravatar_email'        => 'Gravatarin Email-osoite',
--- a/app/lang/fr/admin/licenses/message.php
+++ b/app/lang/fr/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'Catégorie créée correctement.'
    ),

+    'deletefile' => array(
+        'error'   => 'Le fichier n\'a pas pu être supprimé. Merci de réessayer.',
+        'success' => 'Le fichier a bien été supprimé.',
+    ),
+
+    'upload' => array(
+        'error'   => 'Le(s) fichier(s) n\'a pas pu être uploadé. Merci de réessayer.',
+        'success' => 'Le(s) fichier(s) a bien été uploadé.',
+        'nofiles' => 'Vous n\'avez pas sélectionné de fichier pour l\'upload',
+        'invalidfiles' => 'Un ou plusieurs de vos fichiers sont trop lourds, ou sont d\'un type non autorisé. Les types de fichiers autorisés sont png, gif, jpg, doc, docx, pdf et txt.',
+    ),
+
    'update' => array(
        'error'   => 'Cette catégorie n\'a pas été actualisée, veuillez réessayer.',
        'success' => 'Catégorie actualisée correctement.'
--- a/app/lang/fr/button.php
+++ b/app/lang/fr/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Éditer',
-    'delete'  => 'Supprimer',
-    'restore' => 'Restaurer',
-    'actions' => 'Actions',
-    'submit'  => 'Soumettre',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Ajouter',
+    'cancel'    => 'Annuler',
+    'delete'  	=> 'Supprimer',
+    'edit'    	=> 'Éditer',
+    'restore' 	=> 'Restaurer',
+    'submit'  	=> 'Soumettre',
+    'upload'    => 'Uploader',

 );
--- a/app/lang/fr/general.php
+++ b/app/lang/fr/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Adresse',
    'admin'					=> 'Admin',
    'all_assets'			=> 'Tous les actifs',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Éditer votre profile',
    'eol'					=> 'Fin de vie',
    'first_name'			=> 'Prénom',
+    'file_name'				=> 'Fichier',
+    'file_uploads'			=> 'Uploads de fichiers',
    'generate'				=> 'Générer',
    'groups'				=> 'Groupes',
    'gravatar_email'        => 'E-mail adresse Gravatar',
--- a/app/lang/hu/admin/licenses/message.php
+++ b/app/lang/hu/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/hu/button.php
+++ b/app/lang/hu/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Szerkesztés',
-    'delete'  => 'Törlés',
-    'restore' => 'Visszaállítás',
-    'actions' => 'Műveletek',
-    'submit'  => 'Küldés',
+    'actions' 	=> 'Műveletek',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Törlés',
+    'edit'    	=> 'Szerkesztés',
+    'restore' 	=> 'Visszaállítás',
+    'submit'  	=> 'Küldés',
+    'upload'    => 'Upload',

 );
--- a/app/lang/hu/general.php
+++ b/app/lang/hu/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Cím',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Profil szerkeztése',
    'eol'					=> 'EOL',
    'first_name'			=> 'Keresztnév',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/it/admin/licenses/message.php
+++ b/app/lang/it/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/it/button.php
+++ b/app/lang/it/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/it/general.php
+++ b/app/lang/it/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/ja/admin/licenses/message.php
+++ b/app/lang/ja/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/ja/button.php
+++ b/app/lang/ja/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/ja/general.php
+++ b/app/lang/ja/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/ko/admin/licenses/message.php
+++ b/app/lang/ko/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/ko/button.php
+++ b/app/lang/ko/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/ko/general.php
+++ b/app/lang/ko/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/lol/admin/licenses/message.php
+++ b/app/lang/lol/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/lol/button.php
+++ b/app/lang/lol/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/lol/general.php
+++ b/app/lang/lol/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/ms/admin/licenses/message.php
+++ b/app/lang/ms/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'Lesen berjaya dicipta.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'Lesen gagal dikemaskini, sila cuba lagi',
        'success' => 'Lesen berjaya dikemaskini.'
--- a/app/lang/ms/button.php
+++ b/app/lang/ms/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Kemaskini',
-    'delete'  => 'Hapuskan',
-    'restore' => 'Masukkan Semula',
-    'actions' => 'Tindakan',
-    'submit'  => 'Hantar',
+    'actions' 	=> 'Tindakan',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Hapuskan',
+    'edit'    	=> 'Kemaskini',
+    'restore' 	=> 'Masukkan Semula',
+    'submit'  	=> 'Hantar',
+    'upload'    => 'Upload',

 );
--- a/app/lang/ms/general.php
+++ b/app/lang/ms/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Alamat',
    'admin'					=> 'Pentadbir',
    'all_assets'			=> 'Semua Harta',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Kemaskini Profail Anda',
    'eol'					=> 'EOL',
    'first_name'			=> 'Nama pertama',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Laksanakan',
    'groups'				=> 'Kumpulan',
    'gravatar_email'        => 'Alam e-mel gravatar',
--- a/app/lang/nl/admin/licenses/message.php
+++ b/app/lang/nl/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/nl/button.php
+++ b/app/lang/nl/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Bewerk',
-    'delete'  => 'Verwijder',
-    'restore' => 'Herstel',
-    'actions' => 'Acties',
-    'submit'  => 'Verzenden',
+    'actions' 	=> 'Acties',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Verwijder',
+    'edit'    	=> 'Bewerk',
+    'restore' 	=> 'Herstel',
+    'submit'  	=> 'Verzenden',
+    'upload'    => 'Upload',

 );
--- a/app/lang/nl/general.php
+++ b/app/lang/nl/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Adres',
    'admin'					=> 'Beheerder',
    'all_assets'			=> 'Alle materialen',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Bewerk jouw profiel',
    'eol'					=> 'EOL',
    'first_name'			=> 'Voornaam',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Genereer',
    'groups'				=> 'Groepen',
    'gravatar_email'        => 'Gravatar E-mailadres',
--- a/app/lang/no/admin/licenses/message.php
+++ b/app/lang/no/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'Vellykket opprettelse av lisens.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'Lisens ble ikke oppdatert, prøv igjen',
        'success' => 'Vellykket oppdatering av lisens.'
--- a/app/lang/no/button.php
+++ b/app/lang/no/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Rediger',
-    'delete'  => 'Slett',
-    'restore' => 'Gjenopprett',
-    'actions' => 'Handlinger',
-    'submit'  => 'Send',
+    'actions' 	=> 'Handlinger',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Slett',
+    'edit'    	=> 'Rediger',
+    'restore' 	=> 'Gjenopprett',
+    'submit'  	=> 'Send',
+    'upload'    => 'Upload',

 );
--- a/app/lang/no/general.php
+++ b/app/lang/no/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Adresse',
    'admin'					=> 'Admin',
    'all_assets'			=> 'Alle eiendeler',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Rediger din profil',
    'eol'					=> 'Livstid',
    'first_name'			=> 'Fornavn',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generer',
    'groups'				=> 'Grupper',
    'gravatar_email'        => 'Gravatar e-postadresse',
--- a/app/lang/pl/admin/groups/message.php
+++ b/app/lang/pl/admin/groups/message.php
@@ -2,21 +2,21 @@

 return array(

-    'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
-    'group_name_required' => 'The name field is required',
+    'group_exists'        => 'Taka grupa już istnieje!',
+    'group_not_found'     => 'Grupa [:id] nie istnieje.',
+    'group_name_required' => 'Nazwa jest polem obowiązkowym',

    'success' => array(
-        'create' => 'Group was successfully created.',
-        'update' => 'Group was successfully updated.',
-        'delete' => 'Group was successfully deleted.',
+        'create' => 'Grupa została poprawnie utworzona.',
+        'update' => 'Grupa została poprawnie zaktualizowana.',
+        'delete' => 'Grupa została usunięta.',
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this group?',
-        'create' => 'There was an issue creating the group. Please try again.',
-        'update' => 'There was an issue updating the group. Please try again.',
-        'delete' => 'There was an issue deleting the group. Please try again.',
+        'confirm'   => 'Czy na pewno chcesz usunąć tą grupę ?',
+        'create' => 'Wystąpił problem podczas tworzenia grupy. Proszę spróbować ponownie.',
+        'update' => 'Wystąpił problem podczas aktualizacji grupy. Proszę spróbować ponownie.',
+        'delete' => 'Wystąpił problem podczas usuwania grupy. Proszę spróbować ponownie.',
    ),

 );
--- a/app/lang/pl/admin/groups/table.php
+++ b/app/lang/pl/admin/groups/table.php
@@ -3,7 +3,7 @@
 return array(

    'id'         => 'Id',
-    'name'       => 'Name',
-    'users'      => '# of Users',
+    'name'       => 'Nazwa',
+    'users'      => '# z użytkowników',

 );
--- a/app/lang/pl/admin/groups/titles.php
+++ b/app/lang/pl/admin/groups/titles.php
@@ -2,12 +2,12 @@

 return array(

-    'group_management' 	 	=> 'Group Management',
-    'create_group' 	 		=> 'Create New Group',
-    'edit_group' 	 		=> 'Edit Group',
-    'group_name' 	 		=> 'Group Name',
-    'group_admin' 	 		=> 'Group Admin',
-    'allow' 	 			=> 'Allow',
-    'deny' 	 				=> 'Deny',
+    'group_management' 	 	=> 'Zarządzanie grupą',
+    'create_group' 	 		=> 'Utwórz nową grupę',
+    'edit_group' 	 		=> 'Edytuj grupę',
+    'group_name' 	 		=> 'Nazwa grupy',
+    'group_admin' 	 		=> 'Admin grupy',
+    'allow' 	 			=> 'Zezwól',
+    'deny' 	 				=> 'Odmów',

 );
--- a/app/lang/pl/admin/hardware/form.php
+++ b/app/lang/pl/admin/hardware/form.php
@@ -2,33 +2,33 @@

 return array(

-    'checkedout_to'		=> 'Checked Out To',
-    'checkout_to'		=> 'Checkout to',
-    'cost'				=> 'Purchase Cost',
-    'create'			=> 'Create Asset',
-    'date'				=> 'Purchase Date',
+    'checkedout_to'		=> 'Wypożyczony do',
+    'checkout_to'		=> 'Przypisane do',
+    'cost'				=> 'Koszt zakupu',
+    'create'			=> 'Nowy nabytek',
+    'date'				=> 'Data zakupu',
    'depreciates_on'	=> 'Depreciates On',
    'depreciation'		=> 'Depreciation',
-    'default_location'	=> 'Default Location',
+    'default_location'	=> 'Domyślna lokalizacja',
    'eol_date'			=> 'EOL Date',
    'eol_rate'			=> 'EOL Rate',
-    'expires'			=> 'Expires',
+    'expires'			=> 'Wygasa',
    'fully_depreciated'	=> 'Fully Depreciated',
    'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
-    'manufacturer'		=> 'Manufacturer',
+    'manufacturer'		=> 'Producent',
    'model'				=> 'Model',
-    'months'			=> 'months',
-    'name'				=> 'Asset Name',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order Number',
-    'qr'				=> 'QR Code',
-    'requestable'		=> 'Users may request this asset',
-    'serial'			=> 'Serial',
+    'months'			=> 'miesiąc',
+    'name'				=> 'Nazwa nabytku',
+    'notes'				=> 'Notatki',
+    'order'				=> 'Numer zamówienia',
+    'qr'				=> 'Kod QR',
+    'requestable'		=> 'Użytkownicy mogą wymagać tego zasobu',
+    'serial'			=> 'Numer seryjny',
    'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
-    'tag'				=> 'Asset Tag',
-    'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
-    'years'				=> 'years',
+    'supplier'			=> 'Sprzedawca',
+    'tag'				=> 'Tag-i zasobu/nabytku',
+    'update'			=> 'Aktualizacja zasobu/nabytku',
+    'warranty'			=> 'Gwarancja',
+    'years'				=> 'rok',
 )
 ;
--- a/app/lang/pl/admin/licenses/message.php
+++ b/app/lang/pl/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/pl/button.php
+++ b/app/lang/pl/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edycja',
-    'delete'  => 'Kasuj',
-    'restore' => 'Przywróć',
-    'actions' => 'Akcje',
-    'submit'  => 'Zatwierdź',
+    'actions' 	=> 'Akcje',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Kasuj',
+    'edit'    	=> 'Edycja',
+    'restore' 	=> 'Przywróć',
+    'submit'  	=> 'Zatwierdź',
+    'upload'    => 'Upload',

 );
--- a/app/lang/pl/general.php
+++ b/app/lang/pl/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Adres',
    'admin'					=> 'Admin',
    'all_assets'			=> 'Wszystkie aktywa',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edytuj Swój Profil',
    'eol'					=> 'EOL',
    'first_name'			=> 'Imię',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generuj',
    'groups'				=> 'Grupy',
    'gravatar_email'        => 'adres Email Gravatara',
--- a/app/lang/pt-BR/admin/licenses/message.php
+++ b/app/lang/pt-BR/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'Licença criada com sucesso.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'A licença não foi atualizada, por favor, tente novamente',
        'success' => 'Licença atualizada com sucesso.'
--- a/app/lang/pt-BR/button.php
+++ b/app/lang/pt-BR/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Editar',
-    'delete'  => 'Deletar',
-    'restore' => 'Restaurar',
-    'actions' => 'Ações',
-    'submit'  => 'Enviar',
+    'actions' 	=> 'Ações',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Deletar',
+    'edit'    	=> 'Editar',
+    'restore' 	=> 'Restaurar',
+    'submit'  	=> 'Enviar',
+    'upload'    => 'Upload',

 );
--- a/app/lang/pt-BR/general.php
+++ b/app/lang/pt-BR/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Endereço',
    'admin'					=> 'Administrador',
    'all_assets'			=> 'Todos os Bens',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Editar Seu Perfil',
    'eol'					=> 'EOL',
    'first_name'			=> 'Primeiro Nome',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Gerar',
    'groups'				=> 'Grupos',
    'gravatar_email'        => 'Endereço de E-mail do Gravatar',
--- a/app/lang/pt-PT/admin/licenses/message.php
+++ b/app/lang/pt-PT/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/pt-PT/button.php
+++ b/app/lang/pt-PT/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/pt-PT/general.php
+++ b/app/lang/pt-PT/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/ro/admin/licenses/message.php
+++ b/app/lang/ro/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'Licenta a fost creata.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'Licenta nu a fost actualizata, va rugam incercati iar',
        'success' => 'Licenta a fost actualizata.'
--- a/app/lang/ro/button.php
+++ b/app/lang/ro/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Editeaza',
-    'delete'  => 'Sterge',
-    'restore' => 'Restaureaza',
-    'actions' => 'Actiuni',
-    'submit'  => 'Trimiteti',
+    'actions' 	=> 'Actiuni',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Sterge',
+    'edit'    	=> 'Editeaza',
+    'restore' 	=> 'Restaureaza',
+    'submit'  	=> 'Trimiteti',
+    'upload'    => 'Upload',

 );
--- a/app/lang/ro/general.php
+++ b/app/lang/ro/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Adresa',
    'admin'					=> 'Admin',
    'all_assets'			=> 'Toate activele',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Editeaza propriul profil',
    'eol'					=> 'EOL',
    'first_name'			=> 'Prenume',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Genereaza',
    'groups'				=> 'Grupuri',
    'gravatar_email'        => 'Adresa E-mail Gravatar',
--- a/app/lang/ru/admin/licenses/message.php
+++ b/app/lang/ru/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/ru/button.php
+++ b/app/lang/ru/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Редактировать',
-    'delete'  => 'Удалить',
-    'restore' => 'Восстановить',
-    'actions' => 'Действия',
-    'submit'  => 'Принять',
+    'actions' 	=> 'Действия',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Удалить',
+    'edit'    	=> 'Редактировать',
+    'restore' 	=> 'Восстановить',
+    'submit'  	=> 'Принять',
+    'upload'    => 'Upload',

 );
--- a/app/lang/ru/general.php
+++ b/app/lang/ru/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Адрес',
    'admin'					=> 'Администратор',
    'all_assets'			=> 'Все активы',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Редактировать свой профиль',
    'eol'					=> 'EOL',
    'first_name'			=> 'Имя',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Сгенерировать',
    'groups'				=> 'Группы',
    'gravatar_email'        => 'Адрес электронной почты Gravatar',
--- a/app/lang/sr/admin/licenses/message.php
+++ b/app/lang/sr/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/sr/button.php
+++ b/app/lang/sr/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/sr/general.php
+++ b/app/lang/sr/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/sv-SE/admin/depreciations/message.php
+++ b/app/lang/sv-SE/admin/depreciations/message.php
@@ -2,7 +2,7 @@

 return array(

-    'does_not_exist' => 'Depreciation class does not exist.',
+    'does_not_exist' => 'Denna avskrivningskategori existerar inte.',
    'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',


--- a/app/lang/sv-SE/admin/groups/titles.php
+++ b/app/lang/sv-SE/admin/groups/titles.php
@@ -2,12 +2,12 @@

 return array(

-    'group_management' 	 	=> 'Group Management',
-    'create_group' 	 		=> 'Create New Group',
-    'edit_group' 	 		=> 'Edit Group',
-    'group_name' 	 		=> 'Group Name',
-    'group_admin' 	 		=> 'Group Admin',
-    'allow' 	 			=> 'Allow',
-    'deny' 	 				=> 'Deny',
+    'group_management' 	 	=> 'Grupphantering',
+    'create_group' 	 		=> 'Skapa ny grupp',
+    'edit_group' 	 		=> 'Redigera grupp',
+    'group_name' 	 		=> 'Gruppnamn',
+    'group_admin' 	 		=> 'Gruppadministratör',
+    'allow' 	 			=> 'Tillåt',
+    'deny' 	 				=> 'Neka',

 );
--- a/app/lang/sv-SE/admin/licenses/message.php
+++ b/app/lang/sv-SE/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/sv-SE/admin/manufacturers/message.php
+++ b/app/lang/sv-SE/admin/manufacturers/message.php
@@ -2,23 +2,23 @@

 return array(

-    'does_not_exist' => 'Manufacturer does not exist.',
-    'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
+    'does_not_exist' => 'Tillverkaren existerar inte.',
+    'assoc_users'	 => 'Tillverkaren är för tillfället associerad med en modell och kan inte tas bort. Vänligen uppdatera dina modeller till att inte vara associerade med denna tillverkare och försök igen. ',

    'create' => array(
-        'error'   => 'Manufacturer was not created, please try again.',
-        'success' => 'Manufacturer created successfully.'
+        'error'   => 'Tillverkaren kunde inte skapas. Vänligen försök igen.',
+        'success' => 'Tillverkaren skapades utan problem.'
    ),

    'update' => array(
-        'error'   => 'Manufacturer was not updated, please try again',
-        'success' => 'Manufacturer updated successfully.'
+        'error'   => 'Tillverkaren kunde inte uppdateras, vänligen försök igen',
+        'success' => 'Tillverkaren uppdaterades utan problem.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
-        'error'   => 'There was an issue deleting the manufacturer. Please try again.',
-        'success' => 'The Manufacturer was deleted successfully.'
+        'confirm'   => 'Är du säker på att du vill ta bort?',
+        'error'   => 'Det gick inte att ta bort tillverkaren. Vänligen försök igen.',
+        'success' => 'Tillverkaren har tagits bort.'
    )

 );
--- a/app/lang/sv-SE/button.php
+++ b/app/lang/sv-SE/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Ändra',
-    'delete'  => 'Radera',
-    'restore' => 'Återställ',
-    'actions' => 'Åtgärder',
-    'submit'  => 'Skicka',
+    'actions' 	=> 'Åtgärder',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Radera',
+    'edit'    	=> 'Ändra',
+    'restore' 	=> 'Återställ',
+    'submit'  	=> 'Skicka',
+    'upload'    => 'Upload',

 );
--- a/app/lang/sv-SE/general.php
+++ b/app/lang/sv-SE/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Adress',
    'admin'					=> 'Administratör',
    'all_assets'			=> 'Alla Tillgångar',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Ändra Din Profil',
    'eol'					=> 'EOL',
    'first_name'			=> 'Förnamn',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Grupper',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/tlh-AA/admin/licenses/message.php
+++ b/app/lang/tlh-AA/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/tlh-AA/button.php
+++ b/app/lang/tlh-AA/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/tlh-AA/general.php
+++ b/app/lang/tlh-AA/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/tr/admin/licenses/message.php
+++ b/app/lang/tr/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/tr/button.php
+++ b/app/lang/tr/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/tr/general.php
+++ b/app/lang/tr/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/uk/admin/licenses/message.php
+++ b/app/lang/uk/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/uk/button.php
+++ b/app/lang/uk/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/uk/general.php
+++ b/app/lang/uk/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/vi/admin/licenses/message.php
+++ b/app/lang/vi/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => 'License created successfully.'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => 'License was not updated, please try again',
        'success' => 'License updated successfully.'
--- a/app/lang/vi/button.php
+++ b/app/lang/vi/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',

 );
--- a/app/lang/vi/general.php
+++ b/app/lang/vi/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> 'Address',
    'admin'					=> 'Admin',
    'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> 'Generate',
    'groups'				=> 'Groups',
    'gravatar_email'        => 'Gravatar Email Address',
--- a/app/lang/zh-CN/admin/licenses/message.php
+++ b/app/lang/zh-CN/admin/licenses/message.php
@@ -14,6 +14,18 @@ return array(
        'success' => '许可证创建成功'
    ),

+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
    'update' => array(
        'error'   => '许可证更新失败，请重试。',
        'success' => '许可证更新成功。'
--- a/app/lang/zh-CN/button.php
+++ b/app/lang/zh-CN/button.php
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => '编辑',
-    'delete'  => '刪除',
-    'restore' => '恢复',
-    'actions' => '操作',
-    'submit'  => '提交',
+    'actions' 	=> '操作',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> '刪除',
+    'edit'    	=> '编辑',
+    'restore' 	=> '恢复',
+    'submit'  	=> '提交',
+    'upload'    => 'Upload',

 );
--- a/app/lang/zh-CN/general.php
+++ b/app/lang/zh-CN/general.php
@@ -2,6 +2,7 @@

 return array(

+
    'address'				=> '地址',
    'admin'					=> '管理员',
    'all_assets'			=> '所有资产',
@@ -39,6 +40,8 @@ return array(
    'editprofile'  			=> '修改简介',
    'eol'					=> '寿命',
    'first_name'			=> '名字',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
    'generate'				=> '生成',
    'groups'				=> '分组',
    'gravatar_email'        => 'Gravatar头像邮件地址',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	a61e913824	Squashed commit of the following: commit `95ae26eb2a` Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:21:33 2015 -0800 Updated docs location commit `cfebe11755` Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:20:36 2015 -0800 Updated docs for 4.2 commit `d86b5aa613` Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:20:24 2015 -0800 Bumped version	2015-02-08 16:22:12 -08:00
snipe	c255de7fc0	Merge remote-tracking branch 'origin/develop'	2015-02-08 16:18:09 -08:00
snipe	42d5d8db80	Updated language files	2015-02-08 16:17:45 -08:00
snipe	91bf9763d2	Merge remote-tracking branch 'origin/develop'	2015-02-08 16:13:25 -08:00
snipe	9c66dd5431	Added gitignore	2015-02-08 16:13:10 -08:00
snipe	614396a15b	Utilize query scopes for cleaner controllers	2015-02-08 16:02:35 -08:00
snipe	cfe0472ea2	New language strings for file uploads	2015-02-06 22:18:57 -08:00
snipe	dede09e9c5	Merge remote-tracking branch 'origin/develop'	2015-01-22 15:41:36 -08:00
snipe	f39922f51f	Merge remote-tracking branch 'origin/develop' Conflicts: CONTRIBUTING.md	2015-01-22 13:31:19 -08:00
snipe	5268c579e2	Update CONTRIBUTING.md	2015-01-08 17:34:23 -08:00
snipe	21448ea8e6	Update CONTRIBUTING.md	2015-01-08 17:33:49 -08:00
snipe	5c98dae57d	Merge branch 'develop'	2015-01-08 11:34:19 -08:00
snipe	5a6139fb64	Merge pull request #391 from bitdeli-chef/master Add a Bitdeli Badge to README	2014-11-22 22:57:29 -05:00
Bitdeli Chef	0fb2728e3f	Add a Bitdeli badge to README	2014-11-23 04:06:26 +00:00