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

.gitignore

@@ -16,4 +16,5 @@ public/uploads/avatars/*
 /app/storage/logs/*
 /app/storage/debugbar/
 /bin/
-.idea
+.idea
+crowdin.yaml

.travis.yml

@@ -1,3 +1,7 @@
+addons:
+  hosts:
+    - AlisonMBP
+
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php
 
@@ -15,14 +19,16 @@ env:
 before_script:
   - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
   - curl -s http://getcomposer.org/installer | php
-  - cp app/config/production/database.example.php app/config/database.php
-  - cp app/config/production/mail.example.php app/config/mail.php
-  - composer install --prefer-source --no-interaction --no-dev
-  - php artisan key:generate
-  - php artisan migrate:install
-  - php artisan migrate --package cartalyst/sentry
-  - php artisan migrate
-  - php artisan db:seed
+  - cp app/config/testing/app.example.php app/config/testing/app.php
+  - cp app/config/testing/database.example.php app/config/testing/database.php
+  - cp app/config/testing/mail.example.php app/config/testing/mail.php
+  - composer self-update
+  - composer install --prefer-source --no-interaction
+  - php artisan key:generate --env=testing
+  - php artisan migrate:install --env=testing --no-interaction -vvv
+  - php artisan migrate --package cartalyst/sentry --env=testing --no-interaction -vvv
+  - php artisan migrate --env=testing --no-interaction -vvv
+  - php artisan db:seed --env=testing --no-interaction -vvv
 
 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use

CONTRIBUTING.md

@@ -8,18 +8,13 @@ If you don't have a feature in mind, but would like to contribute back to the pr
 
 -----
 
+[![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!
 
-If you're not great at PHP and you still want to help, consider contributing some translation files (assuming, of course, that you are fluent in another language.)
-
-To do so:
-
-* fork the develop branch
-* create a new branch on your new fork (something like `translations/french`)
-* copy the `en` directory and name it according to the [two-letter ISO 639-1 code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
-* translate the strings
-* submit a pull request!
-
-**If you've translated Snipe IT into another language already for your own usage, please consider contributing those translation files back to the project so that everyone can benefit.**
+If you're not a coder but want to give back to the project and you're fluent in other languages, that's okay too. We use [CrowdIn](https://crowdin.com) to manage translations, and it makes it super-simple for you to add translations (or validate proposed translations) to the project without messing with code. __Check out [the Snipe-IT CrowdIn translation project here](https://crowdin.com/project/snipe-it/)__.
 
 Thanks!

README.md

@@ -3,9 +3,11 @@
 
 ## Snipe-IT - Asset Management For the Rest of Us
 
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 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).)
 
@@ -14,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.
 
@@ -63,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")
+

app/config/app.php

@@ -27,6 +27,23 @@ return array(
 
     'locale' => 'en',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Autoloaded Service Providers
+    |--------------------------------------------------------------------------
+    |
+    | This setting may be used to control the default cipher used by the Laravel
+    | encryption facilities.
+    |
+    | Note: In Laravel 4.2, the default cipher is MCRYPT_RIJNDAEL_128 (AES),
+    | which is considered to be the most secure cipher. Changing the cipher
+    | back to MCRYPT_RIJNDAEL_256 is required to decrypt cookies/values that
+    | were encrypted in Laravel <= 4.1
+    |
+    */
+
+    'cipher' => MCRYPT_RIJNDAEL_256,
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers
@@ -99,46 +116,47 @@ return array(
 
     'aliases' => array(
 
-            'App'             => 'Illuminate\Support\Facades\App',
-            'Artisan'         => 'Illuminate\Support\Facades\Artisan',
-            'Auth'            => 'Illuminate\Support\Facades\Auth',
-            'Blade'           => 'Illuminate\Support\Facades\Blade',
-            'Cache'           => 'Illuminate\Support\Facades\Cache',
-            'ClassLoader'     => 'Illuminate\Support\ClassLoader',
-            'Config'          => 'Illuminate\Support\Facades\Config',
-            'Controller'      => 'Illuminate\Routing\Controller',
-            'Cookie'          => 'Illuminate\Support\Facades\Cookie',
-            'Crypt'           => 'Illuminate\Support\Facades\Crypt',
-            'DB'              => 'Illuminate\Support\Facades\DB',
-            'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade',
-            'Eloquent'        => 'Illuminate\Database\Eloquent\Model',
-            'Event'           => 'Illuminate\Support\Facades\Event',
-            'File'            => 'Illuminate\Support\Facades\File',
-            'Form'            => 'Illuminate\Support\Facades\Form',
-            'Hash'            => 'Illuminate\Support\Facades\Hash',
-            'HTML'            => 'Illuminate\Support\Facades\HTML',
-			'Image'           => 'Intervention\Image\ImageManagerStatic',
-            'Input'           => 'Illuminate\Support\Facades\Input',
-            'Lang'            => 'Illuminate\Support\Facades\Lang',
-            'Log'             => 'Illuminate\Support\Facades\Log',
-            'Mail'            => 'Illuminate\Support\Facades\Mail',
-            'Paginator'       => 'Illuminate\Support\Facades\Paginator',
-            'Password'        => 'Illuminate\Support\Facades\Password',
-            'Queue'           => 'Illuminate\Support\Facades\Queue',
-            'Redirect'        => 'Illuminate\Support\Facades\Redirect',
-            'Redis'           => 'Illuminate\Support\Facades\Redis',
-            'Request'         => 'Illuminate\Support\Facades\Request',
-            'Response'        => 'Illuminate\Support\Facades\Response',
-            'Route'           => 'Illuminate\Support\Facades\Route',
-            'Schema'          => 'Illuminate\Support\Facades\Schema',
-            'Seeder'          => 'Illuminate\Database\Seeder',
-            'Sentry'          => 'Cartalyst\Sentry\Facades\Laravel\Sentry',
-            'Session'         => 'Illuminate\Support\Facades\Session',
-            'SSH'             => 'Illuminate\Support\Facades\SSH',
-            'Str'             => 'Illuminate\Support\Str',
-            'URL'             => 'Illuminate\Support\Facades\URL',
-            'Validator'       => 'Illuminate\Support\Facades\Validator',
-            'View'            => 'Illuminate\Support\Facades\View'
+            'App'             		=> 'Illuminate\Support\Facades\App',
+            'Artisan'         		=> 'Illuminate\Support\Facades\Artisan',
+            'Auth'            		=> 'Illuminate\Support\Facades\Auth',
+            'Blade'           		=> 'Illuminate\Support\Facades\Blade',
+            'Cache'           		=> 'Illuminate\Support\Facades\Cache',
+            'ClassLoader'     		=> 'Illuminate\Support\ClassLoader',
+            'Config'          		=> 'Illuminate\Support\Facades\Config',
+            'Controller'      		=> 'Illuminate\Routing\Controller',
+            'Cookie'          		=> 'Illuminate\Support\Facades\Cookie',
+            'Crypt'           		=> 'Illuminate\Support\Facades\Crypt',
+            'DB'              		=> 'Illuminate\Support\Facades\DB',
+            'Datatable' 			=> 'Chumper\Datatable\Facades\DatatableFacade',
+            'Eloquent'        		=> 'Illuminate\Database\Eloquent\Model',
+            'Event'           		=> 'Illuminate\Support\Facades\Event',
+            'File'            		=> 'Illuminate\Support\Facades\File',
+            'Form'            		=> 'Illuminate\Support\Facades\Form',
+            'Hash'            		=> 'Illuminate\Support\Facades\Hash',
+            'HTML'            		=> 'Illuminate\Support\Facades\HTML',
+			'Image'           		=> 'Intervention\Image\ImageManagerStatic',
+            'Input'           		=> 'Illuminate\Support\Facades\Input',
+            'Lang'            		=> 'Illuminate\Support\Facades\Lang',
+            'Log'             		=> 'Illuminate\Support\Facades\Log',
+            'Mail'            		=> 'Illuminate\Support\Facades\Mail',
+            'Paginator'       		=> 'Illuminate\Support\Facades\Paginator',
+            'Password'        		=> 'Illuminate\Support\Facades\Password',
+            'Queue'           		=> 'Illuminate\Support\Facades\Queue',
+            'Redirect'        		=> 'Illuminate\Support\Facades\Redirect',
+            'Redis'           		=> 'Illuminate\Support\Facades\Redis',
+            'Request'         		=> 'Illuminate\Support\Facades\Request',
+            'Response'        		=> 'Illuminate\Support\Facades\Response',
+            'Route'           		=> 'Illuminate\Support\Facades\Route',
+            'Schema'          		=> 'Illuminate\Support\Facades\Schema',
+            'Seeder'          		=> 'Illuminate\Database\Seeder',
+            'Sentry'          		=> 'Cartalyst\Sentry\Facades\Laravel\Sentry',
+            'Session'         		=> 'Illuminate\Support\Facades\Session',
+            'SoftDeletingTrait'     => 'Illuminate\Database\Eloquent\SoftDeletingTrait',
+            'SSH'             		=> 'Illuminate\Support\Facades\SSH',
+            'Str'             		=> 'Illuminate\Support\Str',
+            'URL'             		=> 'Illuminate\Support\Facades\URL',
+            'Validator'       		=> 'Illuminate\Support\Facades\Validator',
+            'View'            		=> 'Illuminate\Support\Facades\View'
 
     ),
 

app/config/local/app.example.php

@@ -37,7 +37,7 @@ return array(
     | to a random, 32 character string, otherwise these encrypted strings
     | will not be safe. Please do this before deploying an application!
     |
-    | Run a php artisan key:generate --env=staging to create a random one
+    | Run a php artisan key:generate to create a random one
     */
 
     'key' => 'Change_this_key_or_snipe_will_get_ya',

app/config/local/database.example.php

@@ -61,6 +61,7 @@ return array(
             'charset'   => 'utf8',
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
+            'strict'    => false,
         ),
 
         'pgsql' => array(

app/config/testing/database.example.php

@@ -26,7 +26,7 @@ return array(
     |
     */
 
-    'default' => 'sqlite',
+    'default' => 'mysql',
 
     /*
     |--------------------------------------------------------------------------
@@ -50,6 +50,18 @@ return array(
             'database' => ':memory:',
             'prefix'   => ''
         ),
+
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_laravel',
+            'username'  => 'travis',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),
+
     ),
 
     /*

app/config/testing/mail.example.php

@@ -119,6 +119,6 @@ return array(
     |
     */
 
-    'pretend' => false,
+    'pretend' => true,
 
 );

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.
      *
@@ -174,7 +157,7 @@ class AssetsController extends AdminController
             }
 
             if (e(Input::get('assigned_to')) == '') {
-                $asset->assigned_to =  0;
+                $asset->assigned_to =  NULL;
             } else {
                 $asset->assigned_to        = e(Input::get('assigned_to'));
             }
@@ -212,6 +195,17 @@ class AssetsController extends AdminController
 
             // Was the asset created?
             if($asset->save()) {
+
+            	if (Input::get('assigned_to')!='') {
+					$logaction = new Actionlog();
+					$logaction->asset_id = $asset->id;
+					$logaction->checkedout_to = $asset->assigned_to;
+					$logaction->asset_type = 'hardware';
+					$logaction->user_id = Sentry::getUser()->id;
+					$logaction->note = e(Input::get('note'));
+					$log = $logaction->logaction('checkout');
+				}
+
                 // Redirect to the asset listing page
                 return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.create.success'));
             }

app/controllers/admin/LicensesController.php

@@ -18,7 +18,7 @@ use Str;
 use Supplier;
 use Validator;
 use View;
-
+use Response;
 
 class LicensesController extends AdminController
 {
@@ -94,6 +94,18 @@ class LicensesController extends AdminController
                 $license->supplier_id = e(Input::get('supplier_id'));
             }
 
+            if ( e(Input::get('maintained')) == '') {
+                $license->maintained = 0;
+            } else {
+                $license->maintained = e(Input::get('maintained'));
+            }
+
+            if ( e(Input::get('purchase_order')) == '') {
+                $license->purchase_order = '';
+            } else {
+                $license->purchase_order = e(Input::get('purchase_order'));
+            }
+
             // Save the license data
             $license->name              = e(Input::get('name'));
             $license->serial            = e(Input::get('serial'));
@@ -252,6 +264,18 @@ class LicensesController extends AdminController
                     //$license->purchase_cost = e(Input::get('purchase_cost'));
             }
 
+            if ( e(Input::get('maintained')) == '') {
+                $license->maintained = 0;
+            } else {
+                $license->maintained = e(Input::get('maintained'));
+            }
+
+            if ( e(Input::get('purchase_order')) == '') {
+                $license->purchase_order = '';
+            } else {
+                $license->purchase_order = e(Input::get('purchase_order'));
+            }
+
 
             //Are we changing the total number of seats?
             if( $license->seats != e(Input::get('seats'))) {
@@ -371,13 +395,15 @@ class LicensesController extends AdminController
         }
 
         // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
+         $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+
 
         // Left join to get a list of assets and some other helpful info
         $asset = DB::table('assets')
             ->leftJoin('users', 'users.id', '=', 'assets.assigned_to')
-            ->select('assets.id', 'name', 'first_name', 'last_name','asset_tag',
-            DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id'))
+            ->leftJoin('models', 'assets.model_id', '=', 'models.id')
+            ->select('assets.id', 'assets.name', 'first_name', 'last_name','asset_tag',
+            DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id, models.name as modelname'))
             ->whereNull('assets.deleted_at')
             ->get();
 
@@ -388,9 +414,9 @@ class LicensesController extends AdminController
             for ($x=0; $x<count($asset_array); $x++) {
 
                 if ($asset_array[$x]['full_name']!='') {
-                    $full_name = ' ('.$asset_array[$x]['full_name'].')';
+                    $full_name = ' ('.$asset_array[$x]['full_name'].') '.$asset_array[$x]['modelname'];
                 } else {
-                    $full_name = ' (Unassigned)';
+                    $full_name = ' (Unassigned) '.$asset_array[$x]['modelname'];
                 }
                 $asset_element[$asset_array[$x]['id']] = $asset_array[$x]['asset_tag'].' - '.$asset_array[$x]['name'].$full_name;
 
@@ -457,7 +483,7 @@ class LicensesController extends AdminController
             // Redirect to the asset management page with error
             return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
         }
-    
+
     if ( e(Input::get('asset_id')) == '') {
             $licenseseat->asset_id = NULL;
         } else {
@@ -599,7 +625,7 @@ class LicensesController extends AdminController
 
           // Show the page
         $license_options = array('0' => 'Top Level') + License::lists('name', 'id');
-
+		$maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
         //clone the orig
         $license = clone $license_to_clone;
         $license->id = null;
@@ -608,7 +634,138 @@ class LicensesController extends AdminController
         // Show the page
         $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
         $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license);
+        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license)->with('maintained_list',$maintained_list);
 
     }
+
+
+    /**
+    *  Upload the file to the server
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function postUpload($licenseId = null)
+    {
+        $license = License::find($licenseId);
+
+		// the license is valid
+		$destinationPath = app_path().'/private_uploads';
+
+        if (isset($license->id)) {
+
+        	if (Input::hasFile('licensefile')) {
+
+				foreach(Input::file('licensefile') as $file) {
+
+				$rules = array(
+				   'licensefile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt|max:2000'
+				);
+				$validator = Validator::make(array('licensefile'=> $file), $rules);
+
+					if($validator->passes()){
+
+						$extension = $file->getClientOriginalExtension();
+						$filename = 'license-'.$license->id.'-'.str_random(8);
+						$filename .= '-'.Str::slug($file->getClientOriginalName()).'.'.$extension;
+						$upload_success = $file->move($destinationPath, $filename);
+
+						//Log the deletion of seats to the log
+						$logaction = new Actionlog();
+						$logaction->asset_id = $license->id;
+						$logaction->asset_type = 'software';
+						$logaction->user_id = Sentry::getUser()->id;
+						$logaction->note = e(Input::get('notes'));
+						$logaction->checkedout_to =  NULL;
+						$logaction->created_at =  date("Y-m-d h:i:s");
+						$logaction->filename =  $filename;
+						$log = $logaction->logaction('uploaded');
+					} else {
+						 return Redirect::back()->with('error', Lang::get('admin/licenses/message.upload.invalidfiles'));
+					}
+
+
+				}
+
+				if ($upload_success) {
+				  	return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.success'));
+				} else {
+				   return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.error'));
+				}
+
+			} else {
+				 return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.nofiles'));
+			}
+
+
+
+
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+
+    /**
+    *  Delete the associated file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getDeleteFile($licenseId = null, $fileId = null)
+    {
+        $license = License::find($licenseId);
+        $destinationPath = app_path().'/private_uploads';
+
+		// the license is valid
+        if (isset($license->id)) {
+
+			$log = Actionlog::find($fileId);
+			$full_filename = $destinationPath.'/'.$log->filename;
+			if (file_exists($full_filename)) {
+				unlink($destinationPath.'/'.$log->filename);
+			}
+			$log->delete();
+			return Redirect::back()->with('success', Lang::get('admin/licenses/message.deletefile.success'));
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+
+
+    /**
+    *  Display/download the uploaded file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function displayFile($licenseId = null, $fileId = null)
+    {
+
+        $license = License::find($licenseId);
+
+		// the license is valid
+        if (isset($license->id)) {
+				$log = Actionlog::find($fileId);
+				$file = $log->get_src();
+				return Response::download($file);
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
 }

app/database/migrations/2015_02_04_155757_increase_user_field_lengths.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class IncreaseUserFieldLengths extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column jobtitle varchar(100) null');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column jobtitle varchar(50) null');
+	}
+
+}

app/database/migrations/2015_02_07_013537_add_soft_deleted_to_log.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSoftDeletedToLog extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column asset_type varchar(100) null');
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column added_on timestamp default "0000-00-00 00:00:00"');
+		Schema::table('asset_logs', function ($table) {
+			$table->renameColumn('added_on', 'created_at');
+			$table->timestamp('updated_at');
+            $table->softDeletes();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('asset_logs', function ($table) {
+			$table->renameColumn('created_at', 'added_on');
+			$table->dropColumn('updated_at');
+			$table->dropSoftDeletes();
+		});
+	}
+
+}

app/database/seeds/ActionlogSeeder.php

@@ -17,7 +17,7 @@ class ActionlogSeeder extends Seeder
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '2',
             'location_id'  		=> '3',
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'hardware',
             'note'				=> NULL,
             'filename'			=> NULL,
@@ -30,7 +30,7 @@ class ActionlogSeeder extends Seeder
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '2',
             'location_id'  		=> NULL,
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'hardware',
             'note'				=> NULL,
             'filename'			=> NULL,
@@ -43,7 +43,7 @@ class ActionlogSeeder extends Seeder
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '1',
             'location_id'  		=> '3',
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'software',
             'note'				=> NULL,
             'filename'			=> NULL,
@@ -56,7 +56,7 @@ class ActionlogSeeder extends Seeder
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '2',
             'location_id'  		=> NULL,
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'software',
             'note'				=> NULL,
             'filename'			=> NULL,

app/database/seeds/LicensesSeeder.php

@@ -16,6 +16,8 @@ class LicensesSeeder extends Seeder
             'serial'      		=> 'ZOMG-WtF-BBQ-SRSLY',
             'purchase_date' 	=> '2013-10-02',
             'purchase_cost' 	=> '2435.99',
+            'purchase_order' 	=> '1',
+            'maintained' 		=> '0',
             'order_number'  	=> '987698576946',
             'created_at' 		=> $date->modify('-10 day'),
             'updated_at' 		=> $date->modify('-3 day'),
@@ -35,6 +37,8 @@ class LicensesSeeder extends Seeder
             'serial'      		=> '98049890394-340485934',
             'purchase_date' 	=> '2013-10-02',
             'purchase_cost' 	=> '2435.99',
+            'purchase_order' 	=> '1',
+            'maintained' 	=> '1',
             'order_number'  	=> '987698576946',
             'created_at' 		=> $date->modify('-10 day'),
             'updated_at' 		=> $date->modify('-3 day'),

app/filters.php

@@ -85,7 +85,7 @@ Route::filter('admin-auth', function () {
     // Check if the user has access to the admin pages
     if ( ! Sentry::getUser()->hasAccess('admin')) {
         // Show the insufficient permissions page
-        return Redirect::route('profile');
+        return Redirect::route('view-assets');
     }
 });
 

app/lang/ar/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

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.'

app/lang/ar/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

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',
 
 );

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',

app/lang/cs/admin/categories/general.php

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-    'about_asset_categories' 			=> 'About Asset Categories',
-    'about_categories'  				=> 'Asset categories help you organize your assets. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use asset categories any way that makes sense for you. ',
-    'asset_categories' 					=> 'Asset Categories',
-    'category_name'  					=> 'Category Name',
-    'create'  							=> 'Create Category',
-    'update'  							=> 'Update Category',
+    'about_asset_categories' 			=> 'O kategoriích majetku',
+    'about_categories'  				=> 'Kategorie pomáhají organizovat majetek. Takovou kategorii může být např. &quot;Desktopy&quot;, &quot;Notebooky&quot;, &quot;Mobilní telefony&quot;, &quot;Tablety&quot;, apod., kategorie můžete ale používat jakkoliv Vám to bude dávat smysl. ',
+    'asset_categories' 					=> 'Kategorie majetku',
+    'category_name'  					=> 'Jméno kategorie',
+    'create'  							=> 'Vytvořit kategorii',
+    'update'  							=> 'Upravit kategorii',
 
 );

app/lang/cs/admin/categories/message.php

@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'Category does not exist.',
+    'does_not_exist' => 'Kategorie neexistuje.',
     'assoc_users'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
 
     'create' => array(

app/lang/cs/admin/categories/table.php

@@ -3,7 +3,7 @@
 return array(
 
     'id'      => 'ID',
-    'parent'   => 'Parent',
-    'title'      => 'Asset Category Name',
+    'parent'   => 'Nadřazená složka',
+    'title'      => 'Jméno kategorie majetku',
 
 );

app/lang/cs/admin/depreciations/general.php

@@ -1,12 +1,12 @@
 <?php
 
 return array(
-    'about_asset_depreciations'  			=> 'About Asset Depreciations',
-    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
-    'asset_depreciations'  					=> 'Asset Depreciations',
-    'create_depreciation'  					=> 'Create Depreciation',
-    'depreciation_name'  					=> 'Depreciation Name',
-    'number_of_months'  					=> 'Number of Months',
-    'update_depreciation'  					=> 'Update Depreciation',
+    'about_asset_depreciations'  			=> 'O amortizaci majetku',
+    'about_depreciations'  					=> 'Můžete nastavit amortizaci majetku pro jeho rovnoměrné odepisování.',
+    'asset_depreciations'  					=> 'Amortizace majetku',
+    'create_depreciation'  					=> 'Vytvořit amortizaci',
+    'depreciation_name'  					=> 'Jméno amortizace',
+    'number_of_months'  					=> 'Počet měsíců',
+    'update_depreciation'  					=> 'Upravit amortizaci',
 
 );

app/lang/cs/admin/depreciations/message.php

@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'Depreciation class does not exist.',
+    'does_not_exist' => 'Amortizační skupina neexistuje.',
     '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. ',
 
 

app/lang/cs/admin/depreciations/table.php

@@ -3,8 +3,8 @@
 return array(
 
     'id'      => 'ID',
-    'months'   => 'Months',
-    'term'   => 'Term',
-    'title'      => 'Name ',
+    'months'   => 'Měsíců',
+    'term'   => 'Podmínka',
+    'title'      => 'Název ',
 
 );

app/lang/cs/admin/groups/message.php

@@ -2,18 +2,18 @@
 
 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'        => 'Skupina již existuje!',
+    'group_not_found'     => 'Skupina [:id] neexistuje.',
+    'group_name_required' => 'Název je vyžadován',
 
     'success' => array(
-        'create' => 'Group was successfully created.',
-        'update' => 'Group was successfully updated.',
-        'delete' => 'Group was successfully deleted.',
+        'create' => 'Skupina byla úspěšně vytvořena.',
+        'update' => 'Skupina byla úspěšně upravena.',
+        'delete' => 'Skupina byla úspěšně odstraněna.',
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this group?',
+        'confirm'   => 'Určitě chcete odstranit tuto skupinu?',
         '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.',

app/lang/cs/admin/groups/table.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'id'         => 'Id',
-    'name'       => 'Name',
-    'users'      => '# of Users',
+    'id'         => 'ID',
+    'name'       => 'Název',
+    'users'      => '# z uživatelů',
 
 );

app/lang/cs/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' 	 	=> 'Správa skupin',
+    'create_group' 	 		=> 'Vytvořit novou skupinu',
+    'edit_group' 	 		=> 'Upravit skupinu',
+    'group_name' 	 		=> 'Název skupiny',
+    'group_admin' 	 		=> 'Správce skupiny',
+    'allow' 	 			=> 'Povolit',
+    'deny' 	 				=> 'Zakázat',
 
 );

app/lang/cs/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',
-    'depreciates_on'	=> 'Depreciates On',
-    'depreciation'		=> 'Depreciation',
-    'default_location'	=> 'Default Location',
-    'eol_date'			=> 'EOL Date',
-    'eol_rate'			=> 'EOL Rate',
-    'expires'			=> 'Expires',
-    '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',
+    'checkedout_to'		=> 'Vydané komu',
+    'checkout_to'		=> 'Vydat někomu',
+    'cost'				=> 'Pořizovací cena',
+    'create'			=> 'Vytvořit záznam majetku',
+    'date'				=> 'Datum pořízení',
+    'depreciates_on'	=> 'Odepisuje se',
+    'depreciation'		=> 'Amortizace',
+    'default_location'	=> 'Výchozí umístění',
+    'eol_date'			=> 'Konec životnosti',
+    'eol_rate'			=> 'Míra ukončení životnosti',
+    'expires'			=> 'Expiruje',
+    'fully_depreciated'	=> 'Plně odepsané',
+    'help_checkout'		=> 'Pokud si přejete přiřadit majetek okamžitě, měli by jste ze seznamu stavů zvolit "Připraveno k přiděleni", nebo se může něco pokazit. ',
+    'manufacturer'		=> 'Výrobce',
     'model'				=> 'Model',
-    'months'			=> 'months',
-    'name'				=> 'Asset Name',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order Number',
-    'qr'				=> 'QR Code',
-    'requestable'		=> 'Users may request this asset',
-    'serial'			=> 'Serial',
-    'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
-    'tag'				=> 'Asset Tag',
-    'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
-    'years'				=> 'years',
+    'months'			=> 'měsíce',
+    'name'				=> 'Název majetku',
+    'notes'				=> 'Poznámky',
+    'order'				=> 'Č. objednávky',
+    'qr'				=> 'QR kód',
+    'requestable'		=> 'Uživatelé můžou požádat o tento majetek',
+    'serial'			=> 'Sériové číslo',
+    'status'			=> 'Stav',
+    'supplier'			=> 'Dodavatel',
+    'tag'				=> 'Označení majetku',
+    'update'			=> 'Úprava majetku',
+    'warranty'			=> 'Záruka',
+    'years'				=> 'roky',
 )
 ;

app/lang/cs/admin/hardware/general.php

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-    'asset'  					=> 'Asset',
-    'checkin'  					=> 'Checkin Asset',
-    'checkout'  				=> 'Checkout Asset to User',
-    'clone'  					=> 'Clone Asset',
-    'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
-    'view'  					=> 'View Asset',
+    'asset'  					=> 'Majetek',
+    'checkin'  					=> 'Převzít majetek',
+    'checkout'  				=> 'Předat majetek uživateli',
+    'clone'  					=> 'Klonovat majetek',
+    'edit'  					=> 'Upravit majetek',
+    'pending'  					=> 'Nevyřízený majetek',
+    'view'  					=> 'Zobrazit majetek',
 );

app/lang/cs/admin/hardware/table.php

@@ -2,21 +2,21 @@
 
 return array(
 
-    'asset_tag'   	=> 'Asset Tag',
+    'asset_tag'   	=> 'Označení majetku',
     'asset_model'       => 'Model',
-    'book_value'  	=> 'Value',
-    'change' 		=> 'In/Out',
-    'checkout_date' => 'Checkout Date',
-    'checkoutto' 	=> 'Checked Out',
-    'diff' 			=> 'Diff',
-    'dl_csv' 		=> 'Download CSV',
-    'eol' 			=> 'EOL',
+    'book_value'  	=> 'Hodnota',
+    'change' 		=> 'Příjem/Výdej',
+    'checkout_date' => 'Datum vydání',
+    'checkoutto' 	=> 'Vydané',
+    'diff' 			=> 'Rozdíl',
+    'dl_csv' 		=> 'Stáhnout CSV',
+    'eol' 			=> 'Konec životnosti',
     'id'      		=> 'ID',
-    'location' 		=> 'Location',
-    'purchase_cost'	=> 'Cost',
-    'purchase_date'	=> 'Purchased',
-    'serial'   		=> 'Serial',
-    'status'   		=> 'Status',
-    'title'      	=> 'Asset ',
+    'location' 		=> 'Umístění',
+    'purchase_cost'	=> 'Cena',
+    'purchase_date'	=> 'Zakoupeno',
+    'serial'   		=> 'Sériové číslo',
+    'status'   		=> 'Stav',
+    'title'      	=> 'Majetek ',
 
 );

app/lang/cs/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

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.'

app/lang/cs/admin/locations/table.php

@@ -3,13 +3,13 @@
 return array(
 
     'id'      		=> 'ID',
-    'city'   		=> 'City',
-    'state'   		=> 'State',
-    'country'   	=> 'Country',
-    'create'		=> 'Create Location',
-    'update'		=> 'Update Location',
-    'name'			=> 'Location Name',
-    'address'		=> 'Address',
-    'zip'			=> 'Postal Code',
-    'locations'		=> 'Locations',
+    'city'   		=> 'Město',
+    'state'   		=> 'Stát',
+    'country'   	=> 'Země',
+    'create'		=> 'Vytvořit umístění',
+    'update'		=> 'Upravit umístění',
+    'name'			=> 'Název umístění',
+    'address'		=> 'Adresa',
+    'zip'			=> 'PSČ',
+    'locations'		=> 'Umístění',
 );

app/lang/cs/admin/manufacturers/table.php

@@ -2,10 +2,10 @@
 
 return array(
 
-    'asset_manufacturers'	=> 'Asset Manufacturers',
-    'create'				=> 'Create Manufacturer',
+    'asset_manufacturers'	=> 'Výrobci',
+    'create'				=> 'Vytvořit výrobce',
     'id'   					=> 'ID',
-    'name'      			=> 'Manufacturer Name',
-    'update'				=> 'Update Manufacturer',
+    'name'      			=> 'Název Výrobce',
+    'update'				=> 'Upravit Výrobce',
 
 );

app/lang/cs/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

app/lang/cs/admin/statuslabels/table.php

@@ -1,10 +1,10 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
-    'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'name'      	=> 'Název stavu',
+    'title'      	=> 'Označení stavu',
+    'update'      	=> 'Upravit označení stavu',
+    'create'      	=> 'Vytvořit označení stavu',
+    'about'      	=> 'O označení stavu',
+    'info'      	=> 'Označení stavu se používá k popisu různých důvodů proč majetek <strong><em>nemůže</em></strong> být přidělen. Může být pokažený, pryč na opravě, na diagnostice, ztracený nebo ukradený, apod. Označení stavu umožňuje členům týmu zobrazovat postup.',
 );

app/lang/cs/button.php

@@ -2,10 +2,13 @@
 
 return array(
 
-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Akce',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Smazat',
+    'edit'    	=> 'Upravit',
+    'restore' 	=> 'Obnovit',
+    'submit'  	=> 'Odeslat',
+    'upload'    => 'Upload',
 
 );

app/lang/cs/general.php

@@ -2,93 +2,96 @@
 
 return array(
 
-    'address'				=> 'Address',
+
+    'address'				=> 'Adresa',
     'admin'					=> 'Admin',
-    'all_assets'			=> 'All Assets',
-    'all'       			=> 'All',
-    'asset_models'			=> 'Asset Models',
-    'asset'					=> 'Asset',
-    'asset_report'          => 'Asset Report',
-    'asset_tag'				=> 'Asset Tag',
-    'assets_available'		=> 'assets available',
-    'assets'				=> 'Assets',
-    'avatar_delete'         => 'Delete Avatar',
-    'avatar_upload'         => 'Upload Avatar',
-    'back'      			=> 'Back',
-    'cancel'  				=> 'Cancel',
-    'categories'			=> 'Asset Categories',
-    'category'				=> 'Asset Category',
-    'changeemail'  			=> 'Change Email Address',
-    'changepassword'  		=> 'Change Password',
-    'checkin'  				=> 'Checkin',
-    'checkout'  			=> 'Checkout',
-    'city'  				=> 'City',
-    'country'  				=> 'Country',
-    'create'				=> 'Create New',
-    'created_asset'			=> 'created asset',
-    'created_at' 			=> 'Created at',
-    'currency'  			=> '$',
-    'current'  				=> 'Current',
-    'custom_report'         => 'Custom Asset Report',
-    'date'					=> 'Date',
-    'delete'  				=> 'Delete',
-    'deleted'  				=> 'Deleted',
-    'deployed'				=> 'Deployed',
-    'depreciation_report'	=> 'Depreciation Report',
-    'depreciation'			=> 'Depreciation',
-    'editprofile'  			=> 'Edit Your Profile',
-    'eol'					=> 'EOL',
-    'first_name'			=> 'First Name',
-    'generate'				=> 'Generate',
-    'groups'				=> 'Groups',
-    'gravatar_email'        => 'Gravatar Email Address',
-    'history_for'  			=> 'History for',
+    'all_assets'			=> 'Všechna zařízení',
+    'all'       			=> 'Vše',
+    'asset_models'			=> 'Modely majetku',
+    'asset'					=> 'Zařízeni',
+    'asset_report'          => 'Report majetku',
+    'asset_tag'				=> 'Označení majetku',
+    'assets_available'		=> 'dostupných zařízení',
+    'assets'				=> 'Zařízení',
+    'avatar_delete'         => 'Smazat avatara',
+    'avatar_upload'         => 'Nahrát avatara',
+    'back'      			=> 'Zpět',
+    'cancel'  				=> 'Storno',
+    'categories'			=> 'Kategorie majetku',
+    'category'				=> 'Kategorie majetku',
+    'changeemail'  			=> 'Změnit e-mailovou adresu',
+    'changepassword'  		=> 'Změnit heslo',
+    'checkin'  				=> 'Příjem',
+    'checkout'  			=> 'Výdej',
+    'city'  				=> 'Město',
+    'country'  				=> 'Země',
+    'create'				=> 'Vytvořit nové',
+    'created_asset'			=> 'vytvořit majetek',
+    'created_at' 			=> 'Vytvořeno',
+    'currency'  			=> 'Kč',
+    'current'  				=> 'Aktuální',
+    'custom_report'         => 'Vlastní report majetku',
+    'date'					=> 'Datum',
+    'delete'  				=> 'Odstranit',
+    'deleted'  				=> 'Odstraněno',
+    'deployed'				=> 'Vydané',
+    'depreciation_report'	=> 'Report zastarání',
+    'depreciation'			=> 'Amortizace',
+    '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',
+    'history_for'  			=> 'Historie uživatele',
     'id'  					=> 'ID',
-    'image_delete'         => 'Delete Image',
-    'image_upload'         => 'Upload Image',
-    'last_name'				=> 'Last Name',
-    'license'				=> 'License',
-    'license_report'        => 'License Report',
-    'licenses_available'	=> 'licenses available',
-    'licenses'				=> 'Licenses',
-    'list_all'				=> 'List All',
-    'location'              => 'Location',
-    'locations'				=> 'Locations',
-    'logout'				=> 'Logout',
-    'manufacturer'			=> 'Manufacturer',
-    'manufacturers'			=> 'Manufacturers',
-    'model_no'				=> 'Model No.',
-    'months'				=> 'months',
-    'moreinfo'				=> 'More Info',
-    'name'					=> 'Name',
-    'no_depreciation'		=> 'No Depreciation',
-    'no_results'			=> 'No Results.',
-    'no'  					=> 'No',
-    'notes'  				=> 'Notes',
-    'pending'				=> 'Pending',
-    'people'				=> 'People',
-    'per_page'				=> 'Results Per Page',
-    'profile'				=> 'Your profile',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'reports'				=> 'Reports',
-    'save'  				=> 'Save',
-    'settings'				=> 'Settings',
-    'sign_in'				=> 'Sign in',
-    'site_name'				=> 'Site Name',
-    'state'  				=> 'State',
-    'status_labels'			=> 'Status Labels',
-    'status'    			=> 'Status',
-    'suppliers'  			=> 'Suppliers',
-    'total_assets'			=> 'total assets',
-    'total_licenses'		=> 'total licenses',
-    'undeployable'			=> 'Un-deployable',
-    'unknown_admin'			=> 'Unknown Admin',
-    'user'					=> 'User',
-    'viewassets'  			=> 'View Assigned Assets',
-    'website'               => 'Website',
-    'welcome'				=> 'Welcome, :name',
-    'years'					=> 'years',
-    'yes' 					=> 'Yes',
-    'zip'  					=> 'Zip',
+    'image_delete'         => 'Smazat obrázek',
+    'image_upload'         => 'Nahrát obrázek',
+    'last_name'				=> 'Příjmení',
+    'license'				=> 'Licence',
+    'license_report'        => 'Report licencí',
+    'licenses_available'	=> 'dostupných licencí',
+    'licenses'				=> 'Licence',
+    'list_all'				=> 'Vypsat vše',
+    'location'              => 'Lokalita',
+    'locations'				=> 'Umístění',
+    'logout'				=> 'Odhlásit',
+    'manufacturer'			=> 'Výrobce',
+    'manufacturers'			=> 'Výrobci',
+    'model_no'				=> 'Modelové č.',
+    'months'				=> 'měsíce',
+    'moreinfo'				=> 'Další informace',
+    'name'					=> 'Název',
+    'no_depreciation'		=> 'Žádná amortizace',
+    'no_results'			=> 'Žádné výsledky.',
+    'no'  					=> 'Ne',
+    'notes'  				=> 'Poznámky',
+    'pending'				=> 'Čeká na vyřízení',
+    'people'				=> 'Lidé',
+    'per_page'				=> 'Výsledků na stránku',
+    'profile'				=> 'Váš profil',
+    'ready_to_deploy'		=> 'Připraveno k přidělení',
+    'reports'				=> 'Reporty',
+    'save'  				=> 'Uložit',
+    'settings'				=> 'Nastavení',
+    'sign_in'				=> 'Přihlásit se',
+    'site_name'				=> 'Název lokality',
+    'state'  				=> 'Stát',
+    'status_labels'			=> 'Označení stavu',
+    'status'    			=> 'Stav',
+    'suppliers'  			=> 'Dodavatelé',
+    'total_assets'			=> 'celkem zařízení',
+    'total_licenses'		=> 'celkem licencí',
+    'undeployable'			=> 'Ne-přiřaditelné',
+    'unknown_admin'			=> 'Neznámy správce',
+    'user'					=> 'Uživatel',
+    'viewassets'  			=> 'Zobrazit přiřazený majetek',
+    'website'               => 'Webová stránka',
+    'welcome'				=> 'Vítej, :name',
+    'years'					=> 'roky',
+    'yes' 					=> 'Ano',
+    'zip'  					=> 'PSČ',
 
 );

app/lang/cs/pagination.php

@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'previous' => '« Previous',
+    'previous' => '« Předchozí',
 
-    'next'     => 'Next »',
+    'next'     => 'Další »',
 
 );

app/lang/cs/table.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'actions'	 	=> 'Actions',
-    'action' 		=> 'Action',
-    'by'      		=> 'By',
+    'actions'	 	=> 'Akce',
+    'action' 		=> 'Akce',
+    'by'      		=> 'Vytvořil',
 
 );

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.",

app/lang/da/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Købsdato',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Udløbsdato',
+    'maintained'        => 'Maintained',
     'name'              => 'Software navn',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Noter',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serienummer',
     'supplier'          => 'Leverandør',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Opdater licens',

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.'

app/lang/da/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

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',
 
 );

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',

app/lang/de/admin/licenses/form.php

@@ -9,8 +9,9 @@ return array(
     'date'              => 'Kaufdatum',
     'depreciation'      => 'Abschreibung',
     'expiration'        => 'Ablaufdatum',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
-    'no_depreciation'   => 'Do Not Depreciate',
+    'no_depreciation'   => 'Nicht abschreiben',
     'notes'             => 'Notizen',
     'order'             => 'Bestellnr.',
     'purchase_order'    => 'Bestellnummer',
@@ -18,8 +19,9 @@ return array(
     'seats'             => 'Anzahl Aktivierungen',
     'serial'            => 'Seriennummer',
     'supplier'          => 'Lieferant',
+    'termination_date'  => 'Ablaufdatum',
     'to_email'          => 'E-Mail des Lizenzerwerbers',
     'to_name'           => 'Name des Lizenzerwerbers',
     'update'            => 'Lizenz aktualisieren',
-    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+    'checkout_help'     => 'Du musst eine Lizenz an einen Gegenstand oder eine Person herausgeben. Du kannst beides auswählen, allerdings muss der Besitzer des Gegenstands mit der Person übereinstimmen an die du den Gegenstand herausgibst.'
 );

app/lang/de/admin/licenses/general.php

@@ -11,8 +11,8 @@ return array(
     'in_out'  					=> 'Zurücknehmen/Herausgeben',
     'info'  					=> 'Lizenzinfo',
     'license_seats'  			=> 'Lizenzaktivierungen',
-    'seat'  					=> 'Seat',
-    'seats'  					=> 'Seats',
+    'seat'  					=> 'Lizenz',
+    'seats'  					=> 'Verfügbare Lizenzen',
     'software_licenses'  		=> 'Software Lizenzen',
     'user'  					=> 'Nutzer',
     'view'  					=> 'Lizenz ansehen',

app/lang/de/admin/licenses/message.php

@@ -3,9 +3,9 @@
 return array(
 
     'does_not_exist' => 'Die Kategorie existiert nicht.',
-    'user_does_not_exist' => 'User does not exist.',
-    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
-    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
+    'user_does_not_exist' => 'Benutzer existiert nicht.',
+    'asset_does_not_exist' 	=> 'Der Gegenstand den du mit dieser Lizenz verknüpfen willst existiert nicht.',
+    'owner_doesnt_match_asset' => 'Der Gegenstand den du mit dieser Lizenz verknüpfen willst gehört jemand anderem als der im Dropdown-Feld ausgewählten Person.',
     'assoc_users'	 => 'Diese Kategorie ist derzeit mindestens einem Modell zugeordnet und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Modelle, um nicht mehr auf diese Kategorie zu verweisen und versuchen Sie es erneut.',
 
 
@@ -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.'

app/lang/de/admin/licenses/table.php

@@ -5,8 +5,8 @@ return array(
     'assigned_to'   	=> 'Zugewiesen an',
     'checkout'   		=> 'Zurücknehmen/Herausgeben',
     'id'      			=> 'ID',
-    'license_email'   	=> 'License Email',
-    'license_name'   	=> 'Licensed To',
+    'license_email'   	=> 'Lizenziert für Email',
+    'license_name'   	=> 'Lizenziert für',
     'purchase_date'   	=> 'Kaufdatum',
     'purchased'   		=> 'Gekauft',
     'seats'   			=> 'Anzahl Aktivierungen',

app/lang/de/admin/models/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Modell existiert nicht.',
-    'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
+    'assoc_users'	 => 'Dieses Modell ist zur Zeit mit einem oder mehreren Assets verknüpft und kann nicht gelöscht werden. Bitte lösche die Assets und versuche dann erneut das Modell zu löschen. ',
 
 
     'create' => array(

app/lang/de/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Erzeugen von fortlaufenden Asset IDs',
+	'auto_increment_prefix'		=> 'Präfix (optional)',
+	'auti_incrementing_help'    => 'Aktiviere zuerst fortlaufende asset IDs um dies zu setzen',
     'display_asset_name'        => 'Zeige Assetname an',
     'display_checkout_date'     => 'Zeige Herausgabedatum',
     'display_eol'               => 'Zeige EOL in der Tabellenansicht',
@@ -10,8 +13,8 @@ return array(
     'per_page'                  => 'Ergebnisse pro Seite',
     'php'                       => 'PHP Version',
     'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationshinweise.',
-    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
-    'qr_help'                   => 'Enable QR Codes first to set this',
+    'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
+    'qr_help'                   => 'Schalte zuerst QR Codes an um dies zu setzen',
     'qr_text'                   => 'QR Code Text',
     'setting'                   => 'Einstellung',
     'settings'                  => 'Einstellungen',

app/lang/de/admin/statuslabels/message.php

@@ -2,24 +2,24 @@
 
 return array(
 
-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Standort nicht verfügbar.',
+    'assoc_users'	 => 'Dieser Ort ist mit mindestens einem Benutzer verknüpft und kann nicht gelöscht werden. Bitte Benutzer updaten, so dass dieser Standort nicht mehr verknüpft ist und erneut versuchen. ',
 
 
     'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Ort wurde nicht erstellt, bitte versuchen Sie es erneut.',
+        'success' => 'Ort erfolgreich erstellt.'
     ),
 
     'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Ort wurde nicht aktualisiert, bitte erneut versuchen',
+        'success' => 'Ort erfolgreich aktualisiert.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Bist du sicher, dass du diesen Status entfernen möchtest?',
+        'error'   => 'Es gab einen Fehler beim Löschen des Orts. Bitte versuchen Sie es erneut.',
+        'success' => 'Der Ort wurde erfolgreich gelöscht.'
     )
 
 );

app/lang/de/admin/statuslabels/table.php

@@ -1,10 +1,10 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
-    'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'name'      	=> 'Statusname',
+    'title'      	=> 'Statusbezeichnungen',
+    'update'      	=> 'Statusbezeichnung bearbeiten',
+    'create'      	=> 'Statusbezeichnung erstellen',
+    'about'      	=> 'Info Statusbezeichnung',
+    'info'      	=> 'Status Label werden benutzt um die diversen Gründe zu beschreiben warum ein Asset <strong><em>nicht</em></strong> ausgerollt werden kann. Es könnte kaputt sein, in der Diagnose, in der Reparatur, verloren oder gestohlen, etc. Status Label ermöglichen es deinem Team den Fortschritt anzuzeigen.',
 );

app/lang/de/admin/suppliers/message.php

@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'Supplier does not exist.',
-    'assoc_users'	 => 'This supplier is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this supplier and try again. ',
+    'does_not_exist' => 'Lieferant ist nicht vorhanden.',
+    'assoc_users'	 => 'Diese Lieferant ist derzeit mindestens einem Modell zugeordnet und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Modelle, um nicht mehr auf diesen Lieferant zu verweisen und versuchen Sie es erneut. ',
 
     'create' => array(
-        'error'   => 'Supplier was not created, please try again.',
-        'success' => 'Supplier created successfully.'
+        'error'   => 'Lieferant wurde nicht erstellt, bitte versuchen Sie es erneut.',
+        'success' => 'Lieferant wurde erfolgreich erstellt.'
     ),
 
     'update' => array(
-        'error'   => 'Supplier was not updated, please try again',
-        'success' => 'Supplier updated successfully.'
+        'error'   => 'Lieferant wurde nicht bearbeitet, bitte versuchen Sie es erneut',
+        'success' => 'Lieferant wurde erfolgreich bearbeitet.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this supplier?',
-        'error'   => 'There was an issue deleting the supplier. Please try again.',
-        'success' => 'Supplier was deleted successfully.'
+        'confirm'   => 'Sind Sie sicher, dass Sie diesen Lieferanten löschen möchten?',
+        'error'   => 'Beim löschen des Lieferanten ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
+        'success' => 'Lieferant wurde erfolgreich gelöscht.'
     )
 
 );

app/lang/de/admin/suppliers/table.php

@@ -1,25 +1,25 @@
 <?php
 
 return array(
-    'address'               => 'Supplier Address',
+    'address'               => 'Lieferantenadressen',
     'assets'                => 'Assets',
-    'city'                  => 'City',
-    'contact'               => 'Contact Name',
-    'country'               => 'Country',
-    'create'                => 'Create Supplier',
+    'city'                  => 'Stadt',
+    'contact'               => 'Kontakt',
+    'country'               => 'Land',
+    'create'                => 'Lieferanten erstellen',
     'email'                 => 'Email',
     'fax'                   => 'Fax',
     'id'                    => 'ID',
-    'licenses'              => 'Licenses',
-    'name'                  => 'Supplier Name',
-    'notes'                 => 'Notes',
-    'phone'                 => 'Phone',
-    'state'                 => 'State',
-    'suppliers'             => 'Suppliers',
-    'update'                => 'Update Supplier',
+    'licenses'              => 'Lizenzen',
+    'name'                  => 'Lieferantenname',
+    'notes'                 => 'Notizen',
+    'phone'                 => 'Telefonnummer',
+    'state'                 => 'Bundesland',
+    'suppliers'             => 'Lieferanten',
+    'update'                => 'Lieferanten bearbeiten',
     'url'                   => 'URL',
-    'view'                  => 'View Supplier',
-    'view_assets_for'       => 'View Assets for',
-    'zip'                   => 'Postal Code',
+    'view'                  => 'Lieferanten ansehen',
+    'view_assets_for'       => 'Assets anschauen von',
+    'zip'                   => 'Postleitzahl',
 
 );

app/lang/de/admin/users/general.php

@@ -3,12 +3,12 @@
 
 return array(
 
-    'assets_user'  		=> 'Assets assigned to :name',
-    'clone'  			=> 'Clone User',
-    'contact_user'  	=> 'Contact :name',
-    'edit'  			=> 'Edit User',
-    'history_user'  	=> 'History for :name',
-    'last_login'  		=> 'Last Login',
-    'software_user'  	=> 'Software Checked out to :name',
-    'view_user'  		=> 'View User :name',
+    'assets_user'  		=> 'Assets zugewiesen an :name',
+    'clone'  			=> 'Benutzer kopieren',
+    'contact_user'  	=> 'Kontakt :name',
+    'edit'  			=> 'Benutzer bearbeiten',
+    'history_user'  	=> 'Historie von :name',
+    'last_login'  		=> 'Letzte Anmeldung',
+    'software_user'  	=> 'Software herausgegeben an :name',
+    'view_user'  		=> 'Benutze :name ansehen',
     );

app/lang/de/admin/users/message.php

@@ -2,30 +2,30 @@
 
 return array(
 
-    'user_exists'              	=> 'User already exists!',
-    'user_not_found'           	=> 'User [:id] does not exist.',
-    'user_login_required'      	=> 'The login field is required',
-    'user_password_required'   	=> 'The password is required.',
-    'insufficient_permissions' 	=> 'Insufficient Permissions.',
-    'user_deleted_warning' 		=> 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
+    'user_exists'              	=> 'Benutzer existiert bereits!',
+    'user_not_found'           	=> 'Benutzer [:id] existiert nicht.',
+    'user_login_required'      	=> 'Das Loginfeld ist erforderlich',
+    'user_password_required'   	=> 'Das Passswortfeld ist erforderlich.',
+    'insufficient_permissions' 	=> 'Unzureichende Berechtigungen.',
+    'user_deleted_warning' 		=> 'Dieser Benutzer wurde gelöscht. Sie müssen ihn wiederherstellen, um ihn zu bearbeiten oder neue Assets zuzuweisen.',
 
 
     'success' => array(
-        'create'    => 'User was successfully created.',
-        'update'    => 'User was successfully updated.',
-        'delete'    => 'User was successfully deleted.',
-        'ban'       => 'User was successfully banned.',
-        'unban'     => 'User was successfully unbanned.',
-        'suspend'   => 'User was successfully suspended.',
-        'unsuspend' => 'User was successfully unsuspended.',
-        'restored'  => 'User was successfully restored.'
+        'create'    => 'Benutzer wurde erfolgreich erstellt.',
+        'update'    => 'Benutzer wurde erfolgreich bearbeitet.',
+        'delete'    => 'Benutzer wurde erfolgreich gelöscht.',
+        'ban'       => 'Benutzer wurde erfolgreich ausgeschlossen.',
+        'unban'     => 'Benutzer wurde erfolgreich wieder eingeschlossen.',
+        'suspend'   => 'Der Benutzer wurde erfolgreich deaktiviert.',
+        'unsuspend' => 'Der Benutzer wurde erfolgreich reaktiviert.',
+        'restored'  => 'Benutzer wurde erfolgreich wiederhergestellt.'
     ),
 
     'error' => array(
-        'create' => 'There was an issue creating the user. Please try again.',
-        'update' => 'There was an issue updating the user. Please try again.',
-        'delete' => 'There was an issue deleting the user. Please try again.',
-        'unsuspend' => 'There was an issue unsuspending the user. Please try again.'
+        'create' => 'Beim Erstellen des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
+        'update' => 'Beim Aktualisieren des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
+        'delete' => 'Beim Entfernen des Benutzers ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
+        'unsuspend' => 'Es gab ein Problem beim reaktivieren des Benutzers. Bitte versuche es erneut.'
     ),
 
 );

app/lang/de/admin/users/table.php

@@ -3,30 +3,30 @@
 return array(
 
     'activated'  			=> 'Active',
-    'allow'  				=> 'Allow',
+    'allow'  				=> 'Erlauben',
     'checkedout'  			=> 'Assets',
-    'created_at' 			=> 'Created',
-    'createuser' 			=> 'Create User',
-    'deny'  				=> 'Deny',
+    'created_at' 			=> 'Erstellt',
+    'createuser' 			=> 'Benutzer erstellen',
+    'deny'  				=> 'Ablehnen',
     'email'      			=> 'Email',
-    'employee_num'      	=> 'Employee No.',
-    'first_name' 			=> 'First Name',
-    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned.',
+    'employee_num'      	=> 'Mitarbeiternr.',
+    'first_name' 			=> 'Vorname',
+    'groupnotes'			=> 'Wähle eine Gruppe um sie dem Benutzer zuzuweisen, denke daran, dass ein Benutzer die Berechtigungen der zugewiesenen Gruppe übernimmt.',
     'id'         			=> 'Id',
-    'inherit'  				=> 'Inherit',
-    'job' 					=> 'Job Title',
-    'last_login'  			=> 'Last Login',
-    'last_name'  			=> 'Last Name',
-    'location'  			=> 'Location',
+    'inherit'  				=> 'Vererben',
+    'job' 					=> 'Berufsbezeichnung',
+    'last_login'  			=> 'Letzte Anmeldung',
+    'last_name'  			=> 'Familienname',
+    'location'  			=> 'Ort',
     'manager' 				=> 'Manager',
     'name' 					=> 'Name',
-    'password_confirm' 		=> 'Confirm Password',
-    'password' 				=> 'Password',
-    'phone'  				=> 'Phone',
-    'title' 				=> 'Title',
-    'updateuser' 			=> 'Update User',
-    'username' 				=> 'Username',
-    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
-    'cloneuser'                         => 'Clone User',
-    'viewusers' 			=> 'View Users',
+    'password_confirm' 		=> 'Kennwort bestätigen',
+    'password' 				=> 'Passwort',
+    'phone'  				=> 'Telefonnummer',
+    'title' 				=> 'Titel',
+    'updateuser' 			=> 'Benutzer aktualisieren',
+    'username' 				=> 'Benutzernamen',
+    'username_note' 		=> '(Dies wird für den Bind an das Active Directory benutzt, nicht für die Anmeldung.)',
+    'cloneuser'                         => 'Benutzer kopieren',
+    'viewusers' 			=> 'Benutzer anzeigen',
 );

app/lang/de/button.php

@@ -2,10 +2,13 @@
 
 return array(
 
-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Aktionen',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Löschen',
+    'edit'    	=> 'Bearbeiten',
+    'restore' 	=> 'Wiederherstellen',
+    'submit'  	=> 'Abschicken',
+    'upload'    => 'Upload',
 
 );

app/lang/de/general.php

@@ -2,89 +2,92 @@
 
 return array(
 
+
     'address'				=> 'Supplier Address',
     'admin'					=> 'Administrator',
-    'all_assets'			=> 'All Assets',
+    'all_assets'			=> 'Alle Assets',
     'all'       			=> 'Alle',
-    'asset_models'			=> 'Asset Models',
+    'asset_models'			=> 'Asset Modelle',
     'asset'					=> 'Asset',
-    'asset_report'          => 'Asset Report',
+    'asset_report'          => 'Asset Bericht',
     'asset_tag'				=> 'Asset Tag',
-    'assets_available'		=> 'assets available',
+    'assets_available'		=> 'verfügbare Assets',
     'assets'				=> 'Assets',
     'avatar_delete'         => 'Avatar löschen',
     'avatar_upload'         => 'Avatar hochladen',
     'back'      			=> 'Zurück',
     'cancel'  				=> 'Abbrechen',
-    'categories'			=> 'Asset Categories',
-    'category'				=> 'Asset Category',
-    'changeemail'  			=> 'Change Email Address',
+    'categories'			=> 'Asset Kategorien',
+    'category'				=> 'Asset Kategorie',
+    'changeemail'  			=> 'E-Mail Adresse ändern',
     'changepassword'  		=> 'Passwort ändern',
     'checkin'  				=> 'Checkin Asset',
     'checkout'  			=> 'Checkout Asset to User',
     'city'  				=> 'Stadt',
     'country'  				=> 'Land',
     'create'				=> 'Create Location',
-    'created_asset'			=> 'created asset',
+    'created_asset'			=> 'Asset angelegt',
     'created_at' 			=> 'Erstellt am',
-    'currency'  			=> '$',
-    'current'  				=> 'Current',
-    'custom_report'         => 'Custom Asset Report',
+    'currency'  			=> '€',
+    'current'  				=> 'Aktuell',
+    'custom_report'         => 'Spezieller Asset Report',
     'date'					=> 'Purchase Date',
     'delete'  				=> 'Löschen',
     'deleted'  				=> 'Gelöscht',
-    'deployed'				=> 'Deployed',
-    'depreciation_report'	=> 'Depreciation Report',
-    'depreciation'			=> 'Depreciation',
+    'deployed'				=> 'Herausgegeben',
+    'depreciation_report'	=> 'Abschreibunsgreport',
+    'depreciation'			=> 'Abschreibung',
     'editprofile'  			=> 'Profil bearbeiten',
     'eol'					=> 'EOL',
     'first_name'			=> 'Vorname',
-    'generate'				=> 'Generate',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
+    'generate'				=> 'Generieren',
     'groups'				=> 'Gruppen',
-    'gravatar_email'        => 'Gravatar Email Address',
+    'gravatar_email'        => 'Gravatar E-Mail Adresse',
     'history_for'  			=> 'Verlauf für',
     'id'  					=> 'Id',
     'image_delete'         => 'Bild löschen',
     'image_upload'         => 'Bild hinzufügen',
     'last_name'				=> 'Familienname',
     'license'				=> 'Lizenz',
-    'license_report'        => 'License Report',
+    'license_report'        => 'Lizenz Report',
     'licenses_available'	=> 'Verfügbare Lizenzen',
     'licenses'				=> 'Lizenzen',
     'list_all'				=> 'Alle auflisten',
-    'location'              => 'Location',
-    'locations'				=> 'Locations',
+    'location'              => 'Standort',
+    'locations'				=> 'Standorte',
     'logout'				=> 'Abmelden',
     'manufacturer'			=> 'Hersteller',
     'manufacturers'			=> 'Hersteller',
-    'model_no'				=> 'Model No.',
+    'model_no'				=> 'Modellnr.',
     'months'				=> 'Monate',
-    'moreinfo'				=> 'More Info',
+    'moreinfo'				=> 'Mehr Informationen',
     'name'					=> 'Location Name',
     'no_depreciation'		=> 'Do Not Depreciate',
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Notizen',
     'pending'				=> 'Pending Asset',
-    'people'				=> 'People',
+    'people'				=> 'Personen',
     'per_page'				=> 'Ergebnisse pro Seite',
     'profile'				=> 'Ihr Profil',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'reports'				=> 'Reports',
+    'ready_to_deploy'		=> 'Fertig zum herausgeben',
+    'reports'				=> 'Berichte',
     'save'  				=> 'Speichern',
     'settings'				=> 'Einstellungen',
     'sign_in'				=> 'Einloggen',
-    'site_name'				=> 'Site Name',
-    'state'  				=> 'State',
-    'status_labels'			=> 'Status Labels',
+    'site_name'				=> 'Seitenname',
+    'state'  				=> 'Zustand',
+    'status_labels'			=> 'Statusbezeichnungen',
     'status'    			=> 'Status',
-    'suppliers'  			=> 'Suppliers',
-    'total_assets'			=> 'total assets',
-    'total_licenses'		=> 'total licenses',
-    'undeployable'			=> 'Un-deployable',
+    'suppliers'  			=> 'Lieferanten',
+    'total_assets'			=> 'Gesamte Assets',
+    'total_licenses'		=> 'Lizenzen insgesamt',
+    'undeployable'			=> 'Nicht herausgebbar',
     'unknown_admin'			=> 'Unbekannter Administrator',
     'user'					=> 'Nutzer',
-    'viewassets'  			=> 'View Assigned Assets',
+    'viewassets'  			=> 'Zugeordnete Assets anzeigen',
     'website'               => 'Webseite',
     'welcome'				=> 'Wilkommen, :name',
     'years'					=> 'Jahre',

app/lang/de/pagination.php

@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'previous' => '« Previous',
+    'previous' => '« Zurück',
 
-    'next'     => 'Next »',
+    'next'     => 'Vor »',
 
 );

app/lang/de/reminders.php

@@ -13,12 +13,12 @@ return array(
     |
     */
 
-    "password" => "Passwords must be six characters and match the confirmation.",
+    "password" => "Das Passwort muss Sechs Zeichen haben und übereinstimmen.",
 
-    "user"     => "Username or email address is incorrect",
+    "user"     => "Benutzername oder Email-Adresse sind falsch",
 
-    "token"    => "This password reset token is invalid.",
+    "token"    => "Das Token um das Passwort zurückzusetzen ist ungültig.",
 
-    "sent" => "If a matching email address was found, a password reminder has been sent!",
+    "sent" => "Wenn eine passende Email-Adresse gefunden wurde, wurde eine Passworterinnerung verschickt!",
 
 );

app/lang/de/table.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'actions'	 	=> 'Actions',
-    'action' 		=> 'Action',
-    'by'      		=> 'By',
+    'actions'	 	=> 'Aktionen',
+    'action' 		=> 'Aktion',
+    'by'      		=> 'Von',
 
 );

app/lang/de/validation.php

@@ -13,56 +13,56 @@ 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"         => ":attribute muss akzeptiert werden.",
+    "active_url"       => ":attribute ist keine gültige URL.",
+    "after"            => ":attribute muss ein Datum nach dem :date sein.",
+    "alpha"            => ":attribute darf nur aus Buchstaben bestehen.",
+    "alpha_dash"       => ":attribute darf nur aus Buchstaben, Zahlen und Gedankenstrichen bestehen.",
+    "alpha_num"        => ":attribute darf nur aus Buchstaben und Zahlen bestehen.",
+    "before"           => ":attribute muss ein Datum vor dem :date sein.",
     "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 muss zwischen :min und :max liegen.",
+        "file"    => ":attribute darf nur zwischen :min und :max kilobytes groß sein.",
+        "string"  => ":attribute muss mindestens :min und maximal :max Zeichen enthalten.",
     ),
-    "confirmed"        => "The :attribute confirmation does not match.",
-    "date"             => "The :attribute is not a valid date.",
-    "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.",
-    "digits_between"   => "The :attribute must be between :min and :max digits.",
-    "email"            => "The :attribute format is invalid.",
-    "exists"           => "The selected :attribute is invalid.",
-    "image"            => "The :attribute must be an image.",
-    "in"               => "The selected :attribute is invalid.",
-    "integer"          => "The :attribute must be an integer.",
-    "ip"               => "The :attribute must be a valid IP address.",
+    "confirmed"        => ":attribute Bestätigung stimmt nicht überein.",
+    "date"             => ":attribute ist kein gültiges Datum.",
+    "date_format"      => ":attribute passt nicht zur :format Formatierung.",
+    "different"        => ":attribute und :other müssen sich unterscheiden.",
+    "digits"           => ":attribute muss :digits Stellen haben.",
+    "digits_between"   => ":attribute soll mindestens :min und darf maximal :max Stellen haben.",
+    "email"            => "Das Format von :attribute ist ungültig.",
+    "exists"           => "Das ausgewählte :attribute ist ungültig.",
+    "image"            => ":attribute muss ein Bild sein.",
+    "in"               => "Auswahl :attribute ist ungültig.",
+    "integer"          => ":attribute muss eine ganze Zahl sein.",
+    "ip"               => ":attribute muss eine gültige IP Adresse sein.",
     "max"              => array(
-        "numeric" => "The :attribute may not be greater than :max.",
-        "file"    => "The :attribute may not be greater than :max kilobytes.",
-        "string"  => "The :attribute may not be greater than :max characters.",
+        "numeric" => ":attribute darf nicht größer als :max sein.",
+        "file"    => ":attribute darf nicht größer als :max Kilobyte sein.",
+        "string"  => ":attribute darf nicht mehr als :max Zeichen sein.",
     ),
-    "mimes"            => "The :attribute must be a file of type: :values.",
+    "mimes"            => ":attribute muss eine Datei des Typs :values sein.",
     "min"              => array(
-        "numeric" => "The :attribute must be at least :min.",
-        "file"    => "The :attribute must be at least :min kilobytes.",
-        "string"  => "The :attribute must be at least :min characters.",
+        "numeric" => ":attribute muss kleiner als :min sein.",
+        "file"    => ":attribute muss mindestens :min Kilobyte groß sein.",
+        "string"  => ":attribute benötigt mindestens :min Zeichen.",
     ),
-    "not_in"           => "The selected :attribute is invalid.",
-    "numeric"          => "The :attribute must be a number.",
-    "regex"            => "The :attribute format is invalid.",
-    "required"         => "The :attribute field is required.",
-    "required_if"      => "The :attribute field is required when :other is :value.",
-    "required_with"    => "The :attribute field is required when :values is present.",
-    "required_without" => "The :attribute field is required when :values is not present.",
-    "same"             => "The :attribute and :other must match.",
+    "not_in"           => "Auswahl :attribute ist ungültig.",
+    "numeric"          => ":attribute muss eine Zahl sein.",
+    "regex"            => ":attribute Format ungültig.",
+    "required"         => ":attribute Feld muss ausgefüllt sein.",
+    "required_if"      => ":attribute wird benötigt wenn :other :value entspricht.",
+    "required_with"    => ":attribute wird benötigt wenn :value ausgewählt ist.",
+    "required_without" => ":attribute wird benötigt wenn :value nicht ausgewählt ist.",
+    "same"             => ":attribute und :other müssen übereinstimmen.",
     "size"             => array(
-        "numeric" => "The :attribute must be :size.",
-        "file"    => "The :attribute must be :size kilobytes.",
-        "string"  => "The :attribute must be :size characters.",
+        "numeric" => ":attribute muss :size groß sein.",
+        "file"    => ":attribute muss :size Kilobyte groß sein.",
+        "string"  => ":attribute muss :size Zeichen haben.",
     ),
-    "unique"           => "The :attribute has already been taken.",
-    "url"              => "The :attribute format is invalid.",
+    "unique"           => ":attribute schon benutzt.",
+    "url"              => ":attribute Format ist ungültig.",
 
 
     /*
@@ -77,7 +77,7 @@ return array(
     */
 
     'custom' => array(),
-    'alpha_space' => "The :attribute field may only contain letters, commas, spaces and dashes.",
+    'alpha_space' => ":attribute Feld darf nur Buchstaben, Kommas, Leerzeichen und Gedankenstriche enthalten.",
 
     /*
     |--------------------------------------------------------------------------

app/lang/en-GB/admin/categories/general.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+    'about_asset_categories' 			=> 'About Asset Categories',
+    'about_categories'  				=> 'Asset categories help you organize your assets. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use asset categories any way that makes sense for you. ',
+    'asset_categories' 					=> 'Asset Categories',
+    'category_name'  					=> 'Category Name',
+    'create'  							=> 'Create Category',
+    'update'  							=> 'Update Category',
+
+);

app/lang/en-GB/admin/categories/message.php

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Category does not exist.',
+    'assoc_users'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
+
+    'create' => array(
+        'error'   => 'Category was not created, please try again.',
+        'success' => 'Category created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Category was not updated, please try again',
+        'success' => 'Category updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this category?',
+        'error'   => 'There was an issue deleting the category. Please try again.',
+        'success' => 'The category was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/categories/table.php

@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'      => 'ID',
+    'parent'   => 'Parent',
+    'title'      => 'Asset Category Name',
+
+);

app/lang/en-GB/admin/depreciations/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'about_asset_depreciations'  			=> 'About Asset Depreciations',
+    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    'asset_depreciations'  					=> 'Asset Depreciations',
+    'create_depreciation'  					=> 'Create Depreciation',
+    'depreciation_name'  					=> 'Depreciation Name',
+    'number_of_months'  					=> 'Number of Months',
+    'update_depreciation'  					=> 'Update Depreciation',
+
+);

app/lang/en-GB/admin/depreciations/message.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Depreciation class does not exist.',
+    '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. ',
+
+
+    'create' => array(
+        'error'   => 'Depreciation class was not created, please try again. :(',
+        'success' => 'Depreciation class created successfully. :)'
+    ),
+
+    'update' => array(
+        'error'   => 'Depreciation class was not updated, please try again',
+        'success' => 'Depreciation class updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this depreciation class?',
+        'error'   => 'There was an issue deleting the depreciation class. Please try again.',
+        'success' => 'The depreciation class was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/depreciations/table.php

@@ -0,0 +1,10 @@
+<?php
+
+return array(
+
+    'id'      => 'ID',
+    'months'   => 'Months',
+    'term'   => 'Term',
+    'title'      => 'Name ',
+
+);

app/lang/en-GB/admin/groups/message.php

@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'group_exists'        => 'Group already exists!',
+    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_name_required' => 'The name field is required',
+
+    'success' => array(
+        'create' => 'Group was successfully created.',
+        'update' => 'Group was successfully updated.',
+        'delete' => 'Group was successfully deleted.',
+    ),
+
+    '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.',
+    ),
+
+);

app/lang/en-GB/admin/groups/table.php

@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'         => 'Id',
+    'name'       => 'Name',
+    'users'      => '# of Users',
+
+);

app/lang/en-GB/admin/groups/titles.php

@@ -0,0 +1,13 @@
+<?php
+
+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',
+
+);

app/lang/en-GB/admin/hardware/form.php

@@ -0,0 +1,34 @@
+<?php
+
+return array(
+
+    'checkedout_to'		=> 'Checked Out To',
+    'checkout_to'		=> 'Checkout to',
+    'cost'				=> 'Purchase Cost',
+    'create'			=> 'Create Asset',
+    'date'				=> 'Purchase Date',
+    'depreciates_on'	=> 'Depreciates On',
+    'depreciation'		=> 'Depreciation',
+    'default_location'	=> 'Default Location',
+    'eol_date'			=> 'EOL Date',
+    'eol_rate'			=> 'EOL Rate',
+    'expires'			=> 'Expires',
+    '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',
+    'model'				=> 'Model',
+    'months'			=> 'months',
+    'name'				=> 'Asset Name',
+    'notes'				=> 'Notes',
+    'order'				=> 'Order Number',
+    'qr'				=> 'QR Code',
+    'requestable'		=> 'Users may request this asset',
+    'serial'			=> 'Serial',
+    'status'			=> 'Status',
+    'supplier'			=> 'Supplier',
+    'tag'				=> 'Asset Tag',
+    'update'			=> 'Asset Update',
+    'warranty'			=> 'Warranty',
+    'years'				=> 'years',
+)
+;

app/lang/en-GB/admin/hardware/general.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+    'asset'  					=> 'Asset',
+    'checkin'  					=> 'Checkin Asset',
+    'checkout'  				=> 'Checkout Asset to User',
+    'clone'  					=> 'Clone Asset',
+    'edit'  					=> 'Edit Asset',
+    'pending'  					=> 'Pending Asset',
+    'view'  					=> 'View Asset',
+);

app/lang/en-GB/admin/hardware/message.php

@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
+    'does_not_exist' 	=> 'Asset does not exist.',
+    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+
+    'create' => array(
+        'error'   		=> 'Asset was not created, please try again. :(',
+        'success' 		=> 'Asset created successfully. :)'
+    ),
+
+    'update' => array(
+        'error'   		=> 'Asset was not updated, please try again',
+        'success' 		=> 'Asset updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this asset?',
+        'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'success' 		=> 'The asset was deleted successfully.'
+    ),
+
+    'checkout' => array(
+        'error'   		=> 'Asset was not checked out, please try again',
+        'success' 		=> 'Asset checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Asset was not checked in, please try again',
+        'success' 		=> 'Asset checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+);

app/lang/en-GB/admin/hardware/table.php

@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'asset_tag'   	=> 'Asset Tag',
+    'asset_model'       => 'Model',
+    'book_value'  	=> 'Value',
+    'change' 		=> 'In/Out',
+    'checkout_date' => 'Checkout Date',
+    'checkoutto' 	=> 'Checked Out',
+    'diff' 			=> 'Diff',
+    'dl_csv' 		=> 'Download CSV',
+    'eol' 			=> 'EOL',
+    'id'      		=> 'ID',
+    'location' 		=> 'Location',
+    'purchase_cost'	=> 'Cost',
+    'purchase_date'	=> 'Purchased',
+    'serial'   		=> 'Serial',
+    'status'   		=> 'Status',
+    'title'      	=> 'Asset ',
+
+);

app/lang/en-GB/admin/licenses/form.php

@@ -0,0 +1,27 @@
+<?php
+
+return array(
+
+    'asset'             => 'Asset',
+    'checkin'           => 'Checkin',
+    'cost'              => 'Purchase Cost',
+    'create'            => 'Create License',
+    'date'              => 'Purchase Date',
+    'depreciation'      => 'Depreciation',
+    'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
+    'name'              => 'Software Name',
+    'no_depreciation'   => 'Do Not Depreciate',
+    'notes'             => 'Notes',
+    'order'             => 'Order No.',
+    'purchase_order'    => 'Purchase Order Number',
+    'remaining_seats'   => 'Remaining Seats',
+    'seats'             => 'Seats',
+    'serial'            => 'Serial',
+    'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
+    'to_email'          => 'Licensed to Email',
+    'to_name'           => 'Licensed to Name',
+    'update'            => 'Update License',
+    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+);

app/lang/en-GB/admin/licenses/general.php

@@ -0,0 +1,19 @@
+<?php
+
+return array(
+
+    'checkin'  					=> 'Checkin License Seat',
+    'checkout_history'  		=> 'Checkout History',
+    'checkout'  				=> 'Checkout License Seat',
+    'edit'  					=> 'Edit License',
+    'clone'  					=> 'Clone License',
+    'history_for'  				=> 'History for ',
+    'in_out'  					=> 'In/Out',
+    'info'  					=> 'License Info',
+    'license_seats'  			=> 'License Seats',
+    'seat'  					=> 'Seat',
+    'seats'  					=> 'Seats',
+    'software_licenses'  		=> 'Software Licenses',
+    'user'  					=> 'User',
+    'view'  					=> 'View License',
+);

app/lang/en-GB/admin/licenses/message.php

@@ -0,0 +1,50 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'License does not exist.',
+    'user_does_not_exist' => 'User does not exist.',
+    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
+    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
+    'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'License was not created, please try again.',
+        '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.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this license?',
+        'error'   => 'There was an issue deleting the license. Please try again.',
+        'success' => 'The license was deleted successfully.'
+    ),
+
+    'checkout' => array(
+        'error'   => 'There was an issue checking out the license. Please try again.',
+        'success' => 'The license was checked out successfully'
+    ),
+
+    'checkin' => array(
+        'error'   => 'There was an issue checking in the license. Please try again.',
+        'success' => 'The license was checked in successfully'
+    ),
+
+);

app/lang/en-GB/admin/licenses/table.php

@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'assigned_to'   	=> 'Assigned To',
+    'checkout'   		=> 'In/Out',
+    'id'      			=> 'ID',
+    'license_email'   	=> 'License Email',
+    'license_name'   	=> 'Licensed To',
+    'purchase_date'   	=> 'Purchase Date',
+    'purchased'   		=> 'Purchased',
+    'seats'   			=> 'Seats',
+    'hardware'   		=> 'Hardware',
+    'serial'   			=> 'Serial',
+    'title'      		=> 'License',
+
+);

app/lang/en-GB/admin/locations/message.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Location does not exist.',
+    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+
+
+    'create' => array(
+        'error'   => 'Location was not created, please try again.',
+        'success' => 'Location created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Location was not updated, please try again',
+        'success' => 'Location updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this location?',
+        'error'   => 'There was an issue deleting the location. Please try again.',
+        'success' => 'The location was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/locations/table.php

@@ -0,0 +1,15 @@
+<?php
+
+return array(
+
+    'id'      		=> 'ID',
+    'city'   		=> 'City',
+    'state'   		=> 'State',
+    'country'   	=> 'Country',
+    'create'		=> 'Create Location',
+    'update'		=> 'Update Location',
+    'name'			=> 'Location Name',
+    'address'		=> 'Address',
+    'zip'			=> 'Postal Code',
+    'locations'		=> 'Locations',
+);

app/lang/en-GB/admin/manufacturers/message.php

@@ -0,0 +1,24 @@
+<?php
+
+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. ',
+
+    'create' => array(
+        'error'   => 'Manufacturer was not created, please try again.',
+        'success' => 'Manufacturer created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Manufacturer was not updated, please try again',
+        'success' => 'Manufacturer updated successfully.'
+    ),
+
+    '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.'
+    )
+
+);

app/lang/en-GB/admin/manufacturers/table.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'asset_manufacturers'	=> 'Asset Manufacturers',
+    'create'				=> 'Create Manufacturer',
+    'id'   					=> 'ID',
+    'name'      			=> 'Manufacturer Name',
+    'update'				=> 'Update Manufacturer',
+
+);

app/lang/en-GB/admin/models/message.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Model does not exist.',
+    'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'Model was not created, please try again.',
+        'success' => 'Model created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Model was not updated, please try again',
+        'success' => 'Model updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this asset model?',
+        'error'   => 'There was an issue deleting the model. Please try again.',
+        'success' => 'The model was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/models/table.php

@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'create'				=> 'Create Asset Model',
+    'created_at' 			=> 'Created at',
+    'eol'	 				=> 'EOL',
+    'modelnumber'   		=> 'Model No.',
+    'name'      			=> 'Asset Model Name',
+    'numassets' 			=> 'Assets',
+    'title'					=> 'Asset Models',
+    'update'				=> 'Update Asset Model',
+    'view'					=> 'View Asset Model',
+    'update'				=> 'Update Asset Model',
+    'clone'				=> 'Clone Model',
+    'edit'				=> 'Edit Model',
+);

app/lang/en-GB/admin/reports/general.php

@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'info'   => 'Select the options you want for your asset report.'
+);

app/lang/en-GB/admin/reports/message.php

@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'error'   => 'You must select at least ONE option.'
+);

app/lang/en-GB/admin/settings/general.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
+    'display_asset_name'        => 'Display Asset Name',
+    'display_checkout_date'     => 'Display Checkout Date',
+    'display_eol'               => 'Display EOL in table view',
+    'display_qr'                => 'Display QR Codes',
+    'info'                      => 'These settings let you customize certain aspects of your installation.',
+    'laravel'                   => 'Laravel Version',
+    'per_page'                  => 'Results Per Page',
+    'php'                       => 'PHP Version',
+    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
+    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'qr_help'                   => 'Enable QR Codes first to set this',
+    'qr_text'                   => 'QR Code Text',
+    'setting'                   => 'Setting',
+    'settings'                  => 'Settings',
+    'site_name'                 => 'Site Name',
+    'system'                    => 'System Information',
+    'update'                    => 'Update Settings',
+    'value'                     => 'Value',
+);

app/lang/en-GB/admin/settings/message.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+
+    'update' => array(
+        'error'   => 'An error has occurred while updating. ',
+        'success' => 'Settings updated successfully.'
+    ),
+
+);

app/lang/en-GB/admin/statuslabels/message.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Location does not exist.',
+    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+
+
+    'create' => array(
+        'error'   => 'Location was not created, please try again.',
+        'success' => 'Location created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Location was not updated, please try again',
+        'success' => 'Location updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this status label?',
+        'error'   => 'There was an issue deleting the location. Please try again.',
+        'success' => 'The location was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/statuslabels/table.php

@@ -0,0 +1,10 @@
+<?php
+
+return array(
+    'name'      	=> 'Status Name',
+    'title'      	=> 'Status Labels',
+    'update'      	=> 'Update Status Label',
+    'create'      	=> 'Create Status Label',
+    'about'      	=> 'About Status Labels',
+    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+);

app/lang/en-GB/admin/suppliers/message.php

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Supplier does not exist.',
+    'assoc_users'	 => 'This supplier is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this supplier and try again. ',
+
+    'create' => array(
+        'error'   => 'Supplier was not created, please try again.',
+        'success' => 'Supplier created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Supplier was not updated, please try again',
+        'success' => 'Supplier updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this supplier?',
+        'error'   => 'There was an issue deleting the supplier. Please try again.',
+        'success' => 'Supplier was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/suppliers/table.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+    'address'               => 'Supplier Address',
+    'assets'                => 'Assets',
+    'city'                  => 'City',
+    'contact'               => 'Contact Name',
+    'country'               => 'Country',
+    'create'                => 'Create Supplier',
+    'email'                 => 'Email',
+    'fax'                   => 'Fax',
+    'id'                    => 'ID',
+    'licenses'              => 'Licenses',
+    'name'                  => 'Supplier Name',
+    'notes'                 => 'Notes',
+    'phone'                 => 'Phone',
+    'state'                 => 'State',
+    'suppliers'             => 'Suppliers',
+    'update'                => 'Update Supplier',
+    'url'                   => 'URL',
+    'view'                  => 'View Supplier',
+    'view_assets_for'       => 'View Assets for',
+    'zip'                   => 'Postal Code',
+
+);

app/lang/en-GB/admin/users/general.php

@@ -0,0 +1,14 @@
+<?php
+
+
+return array(
+
+    'assets_user'  		=> 'Assets assigned to :name',
+    'clone'  			=> 'Clone User',
+    'contact_user'  	=> 'Contact :name',
+    'edit'  			=> 'Edit User',
+    'history_user'  	=> 'History for :name',
+    'last_login'  		=> 'Last Login',
+    'software_user'  	=> 'Software Checked out to :name',
+    'view_user'  		=> 'View User :name',
+    );