From 9be50152b36bc3aa8164ff6f922cb794ad9cdbe1 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Thu, 2 Apr 2015 11:21:32 +1030
Subject: [PATCH 01/22] per_page Select drop-down

---
 app/views/backend/settings/edit.blade.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
index 57c0bc06cd..edafdf2ca2 100755
--- a/app/views/backend/settings/edit.blade.php
+++ b/app/views/backend/settings/edit.blade.php
@@ -114,11 +114,13 @@ padding: 0px 20px;
 											{{ Form::label('per_page', Lang::get('admin/settings/general.per_page')) }}
 										</div>
 	                                    <div class="col-md-9">
-										{{ Form::text('per_page', Input::old('per_page', $setting->per_page), array('class' => 'form-control', 'style'=>'width: 100px;')) }}
+										{{ Form::select('per_page', array('10'=>'10','25'=>'25','50'=>'50','75'=>'75','100'=>'100','125'=>'125','150'=>'150'), Input::old('per_page', $setting->per_page), array('class' => 'form-control', 'style'=>'width: 100px;')) }}
 										{{ $errors->first('per_page', '<br><span class="alert-msg">:message</span>') }}
 										</div>
                                     </div>
 
+                                    </div>
+
                                    <div class="checkbox col-md-offset-3">
 										<label>
 											{{ Form::checkbox('load_remote', '1', Input::old('load_remote', $setting->load_remote)) }}

From 1edd6d3542b1d89d14e9dababb7bf39982608c3b Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Thu, 2 Apr 2015 11:22:33 +1030
Subject: [PATCH 02/22] Get default page length and new Length menu

---
 app/config/packages/chumper/datatable/config.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/config/packages/chumper/datatable/config.php b/app/config/packages/chumper/datatable/config.php
index 34777b1dc9..0643de54b0 100644
--- a/app/config/packages/chumper/datatable/config.php
+++ b/app/config/packages/chumper/datatable/config.php
@@ -58,6 +58,8 @@ return array(
             'deferRender'=> true,
             'stateSave'=> true,
             'paging'=>true,
+            'pageLength'=> Setting::getSettings()->per_page,
+            'lengthMenu'=>array(array(10,25,50,75,100,125,150,-1), array(10,25,50,75,100,125,150,'All')),
             'tableTools' => array(
                 'sSwfPath'=> Config::get('app.url').'/assets/swf/copy_csv_xls_pdf.swf',
                 'aButtons'=>array(

From 33e7ce67616e8153785516ceca7423257bca9718 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Apr 2015 14:28:11 -0700
Subject: [PATCH 03/22] Fixes for #722 localization

---
 app/controllers/admin/AssetsController.php | 27 +++++++++++-----------
 app/lang/en/general.php                    | 11 +++++++++
 app/views/backend/dashboard.blade.php      | 18 ++++++++-------
 app/views/backend/hardware/edit.blade.php  |  2 +-
 4 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 25ef1ab105..655f69d77f 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -56,16 +56,16 @@ class AssetsController extends AdminController
         // Grab the dropdown list of models
         //$model_list = array('' => 'Select a Model') + Model::orderBy('name', 'asc')->lists('name'.' '. 'modelno', 'id');
 
-        $model_list = array('' => 'Select a Model') + DB::table('models')
+        $model_list = array('' => Lang::get('general.select_model')) + DB::table('models')
         ->select(DB::raw('concat(name," / ",modelno) as name, id'))->orderBy('name', 'asc')
         ->orderBy('modelno', 'asc')
         ->whereNull('deleted_at')
         ->lists('name', 'id');
 
 
-        $supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        $assigned_to = 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');
-        $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id');
+        $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+        $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
+        $location_list = array('' => Lang::get('general.select_location')) + Location::orderBy('name', 'asc')->lists('name', 'id');
 
 
         // Grab the dropdown list of status
@@ -211,12 +211,12 @@ class AssetsController extends AdminController
 
 
         // Grab the dropdown list of models
-		$model_list = array('' => '') + DB::table('models')
+		$model_list = array('' => Lang::get('general.select_model')) + DB::table('models')
 		->select(DB::raw('concat(name," / ",modelno) as name, id'))->orderBy('name', 'asc')
 		->orderBy('modelno', 'asc')
 		->lists('name', 'id');
-        $supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id');
+        $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+        $location_list = array('' => Lang::get('general.select_location')) + Location::orderBy('name', 'asc')->lists('name', 'id');
 
         // Grab the dropdown list of status
         $statuslabel_list = Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
@@ -369,7 +369,7 @@ class AssetsController 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(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+        $users_list = array('' => Lang::get('general.select_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');
 
         return View::make('backend/hardware/checkout', compact('asset'))->with('users_list',$users_list);
 
@@ -603,7 +603,7 @@ class AssetsController extends AdminController
     }
 
     /**
-     * Asset update.
+     * Asset clone.
      *
      * @param  int  $assetId
      * @return View
@@ -617,17 +617,16 @@ class AssetsController extends AdminController
         }
 
         // Grab the dropdown list of models
-        $model_list = array('' => '') + Model::lists('name', 'id');
+        $model_list = array('' => Lang::get('general.select_model')) + Model::lists('name', 'id');
 
         // Grab the dropdown list of status
         $statuslabel_list = Statuslabel::lists('name', 'id');
 
-        $location_list = array('' => '') + Location::lists('name', 'id');
+        $location_list = array('' => Lang::get('general.select_location')) + Location::lists('name', 'id');
 
         // get depreciation list
-        $depreciation_list = array('' => '') + Depreciation::lists('name', 'id');
-        $supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        $assigned_to = 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');
+        $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+        $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
 
         $asset = clone $asset_to_clone;
         $asset->id = null;
diff --git a/app/lang/en/general.php b/app/lang/en/general.php
index 96ff475f39..ab60504b5d 100755
--- a/app/lang/en/general.php
+++ b/app/lang/en/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Change Email Address',
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Checkout',
     'city'  				=> 'City',
     'country'  				=> 'Country',
@@ -78,8 +79,17 @@ return array(
     'per_page'				=> 'Results Per Page',
     'profile'				=> 'Your profile',
     'ready_to_deploy'		=> 'Ready to Deploy',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Settings',
     'sign_in'				=> 'Sign in',
     'site_name'				=> 'Site Name',
@@ -92,6 +102,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'users'                 => 'Users',
     'viewassets'  			=> 'View Assigned Assets',
diff --git a/app/views/backend/dashboard.blade.php b/app/views/backend/dashboard.blade.php
index 356d4e369d..cd23da078d 100755
--- a/app/views/backend/dashboard.blade.php
+++ b/app/views/backend/dashboard.blade.php
@@ -28,7 +28,7 @@
         <br>
     </div>
     <div class="col-md-9 chart">
-        <h5>Recent Activity</h5>
+        <h5>@lang('general.recent_activity')</h5>
         
         <table class="table table-hover table-fixed break-word">
 			<thead>
@@ -59,7 +59,9 @@
 			           	@endif
 			           	
 			           	</td> 
-			       <td>{{{ $activity->action_type }}}</td> 
+			       <td>  
+				       {{ strtolower(Lang::get('general.'.str_replace(' ','_',$activity->action_type))) }}
+			       </td> 
 			       <td>
 			           @if ($activity->userlog) 
 			           		{{{ $activity->userlog->fullName() }}}
@@ -77,7 +79,7 @@
 
     </div>
     <div class="col-md-3 chart">
-        <h5>Asset Status</h5>
+        <h5>@lang('general.asset') @lang('general.status')</h5>
         <div id="hero-assets" style="height: 250px;"></div>    
     </div>
 
@@ -95,11 +97,11 @@
         Morris.Donut({
             element: 'hero-assets',
             data: [
-	            {label: 'Ready to Deploy', value: {{ $asset_stats['rtd']['percent'] }} },
-                {label: 'Deployed', value: {{ $asset_stats['deployed']['percent'] }} },              
-                {label: 'Pending', value: {{ $asset_stats['pending']['percent'] }} },
-                {label: 'Undeployable', value: {{ $asset_stats['undeployable']['percent'] }} },
-                {label: 'Archived', value: {{ $asset_stats['archived']['percent'] }} },
+	            {label: '@lang('general.ready_to_deploy')', value: {{ $asset_stats['rtd']['percent'] }} },
+                {label: '@lang('general.deployed')', value: {{ $asset_stats['deployed']['percent'] }} },              
+                {label: '@lang('general.pending')', value: {{ $asset_stats['pending']['percent'] }} },
+                {label: '@lang('general.undeployable')', value: {{ $asset_stats['undeployable']['percent'] }} },
+                {label: '@lang('general.archived')', value: {{ $asset_stats['archived']['percent'] }} },
             ],
             colors: ["#30a1ec", "#76bdee", "#c4dafe"],
             formatter: function (y) { return y + "%" }
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
index dee143bb86..bb60035196 100755
--- a/app/views/backend/hardware/edit.blade.php
+++ b/app/views/backend/hardware/edit.blade.php
@@ -103,7 +103,7 @@
             <div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
                 <label for="purchase_date" class="col-md-2 control-label">@lang('admin/hardware/form.date')</label>
                 <div class="input-group col-md-3">
-                    <input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{{ Input::old('purchase_date', $asset->purchase_date) }}}">
+                    <input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="@lang('general.select_date')" name="purchase_date" id="purchase_date" value="{{{ Input::old('purchase_date', $asset->purchase_date) }}}">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 {{ $errors->first('purchase_date', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') }}
                 </div>

From c88ce0d14d605d74b297f18bf55533218ed445bf Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Apr 2015 14:55:36 -0700
Subject: [PATCH 04/22] Fixes for #722 datatables

---
 app/config/version.php                        |  4 ++--
 app/lang/en/general.php                       |  7 +++++++
 app/views/backend/accessories/index.blade.php | 14 ++++++++++++++
 app/views/backend/categories/index.blade.php  | 14 ++++++++++++++
 app/views/backend/hardware/index.blade.php    | 14 ++++++++++++++
 app/views/backend/licenses/index.blade.php    | 14 ++++++++++++++
 app/views/backend/models/index.blade.php      | 14 ++++++++++++++
 7 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 87d12b4a82..93c17821d8 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-179',
-  'hash_version' => 'v1.2.6.1-179-gb53847c',
+  'app_version' => 'v1.2.6.1-184',
+  'hash_version' => 'v1.2.6.1-184-g766afde',
 );
\ No newline at end of file
diff --git a/app/lang/en/general.php b/app/lang/en/general.php
index ab60504b5d..fe30d64df0 100755
--- a/app/lang/en/general.php
+++ b/app/lang/en/general.php
@@ -45,6 +45,7 @@ return array(
     'depreciation'			=> 'Depreciation',
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'First Name',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -55,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
@@ -70,13 +72,18 @@ return array(
     'months'				=> 'months',
     'moreinfo'				=> 'More Info',
     'name'					=> 'Name',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'No Depreciation',
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pending',
     'people'				=> 'People',
     'per_page'				=> 'Results Per Page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Your profile',
     'ready_to_deploy'		=> 'Ready to Deploy',
     'recent_activity'		=> 'Recent Activity',
diff --git a/app/views/backend/accessories/index.blade.php b/app/views/backend/accessories/index.blade.php
index 5773b2234e..edfe31a4fc 100755
--- a/app/views/backend/accessories/index.blade.php
+++ b/app/views/backend/accessories/index.blade.php
@@ -26,6 +26,20 @@
                             Lang::get('table.actions'))
                 ->setOptions(
                         array(
+	                        'language' => array(
+			            	'search' => Lang::get('general.search'),
+			            	'lengthMenu' => Lang::get('general.page_menu'),
+			            	'loadingRecords' => Lang::get('general.loading'),
+			            	'zeroRecords' => Lang::get('general.no_results'),
+			            	'info' => Lang::get('general.pagination_info'), 
+			            	'processing' => Lang::get('general.processing'),
+			            	'paginate'=> array(
+			            		'first'=>Lang::get('general.first'),
+			            		'previous'=>Lang::get('general.previous'),
+			            		'next'=>Lang::get('general.next'),
+			            		'last'=>Lang::get('general.last'),
+			            		),
+			            	),
                             'sAjaxSource'=>route('api.accessories.list'),
                             'dom' =>'T<"clear">lfrtip',
                             'tableTools' => array(
diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php
index 47342f9651..8f2a7ccd6b 100755
--- a/app/views/backend/categories/index.blade.php
+++ b/app/views/backend/categories/index.blade.php
@@ -28,6 +28,20 @@
                     			Lang::get('table.actions'))
         			->setOptions(
 	                        	array(
+		                        	'language' => array(
+					            	'search' => Lang::get('general.search'),
+					            	'lengthMenu' => Lang::get('general.page_menu'),
+					            	'loadingRecords' => Lang::get('general.loading'),
+					            	'zeroRecords' => Lang::get('general.no_results'),
+					            	'info' => Lang::get('general.pagination_info'), 
+					            	'processing' => Lang::get('general.processing'),
+					            	'paginate'=> array(
+					            		'first'=>Lang::get('general.first'),
+					            		'previous'=>Lang::get('general.previous'),
+					            		'next'=>Lang::get('general.next'),
+					            		'last'=>Lang::get('general.last'),
+					            		),
+					            	),
 	                            		'sAjaxSource'=> route('api.categories.list'),
 	                            		'dom' =>'CT<"clear">lfrtip',
 	                            		'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','exclude'=>array(5),'activate'=>'mouseover'),
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index 82e3563261..4be4f6a11c 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -70,6 +70,20 @@
     	Lang::get('table.actions'))
     ->setOptions(
             array(
+	            'language' => array(
+	            	'search' => Lang::get('general.search'),
+	            	'lengthMenu' => Lang::get('general.page_menu'),
+	            	'loadingRecords' => Lang::get('general.loading'),
+	            	'zeroRecords' => Lang::get('general.no_results'),
+	            	'info' => Lang::get('general.pagination_info'), 
+	            	'processing' => Lang::get('general.processing'),
+	            	'paginate'=> array(
+	            		'first'=>Lang::get('general.first'),
+	            		'previous'=>Lang::get('general.previous'),
+	            		'next'=>Lang::get('general.next'),
+	            		'last'=>Lang::get('general.last'),
+	            		),
+	            	),
             	'sAjaxSource'=> route('api.hardware.list', Input::get('status')),
                 'dom' =>'CT<"clear">lfrtip',
                 'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','exclude'=>array(0,10,11),'activate'=>'mouseover'),
diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php
index 6721f94253..f49bfe3969 100755
--- a/app/views/backend/licenses/index.blade.php
+++ b/app/views/backend/licenses/index.blade.php
@@ -26,6 +26,20 @@
                             Lang::get('table.actions'))
                 ->setOptions(
                         array(
+	                        'language' => array(
+			            	'search' => Lang::get('general.search'),
+			            	'lengthMenu' => Lang::get('general.page_menu'),
+			            	'loadingRecords' => Lang::get('general.loading'),
+			            	'zeroRecords' => Lang::get('general.no_results'),
+			            	'info' => Lang::get('general.pagination_info'), 
+			            	'processing' => Lang::get('general.processing'),
+			            	'paginate'=> array(
+			            		'first'=>Lang::get('general.first'),
+			            		'previous'=>Lang::get('general.previous'),
+			            		'next'=>Lang::get('general.next'),
+			            		'last'=>Lang::get('general.last'),
+			            		),
+			            	),
                             'sAjaxSource'=>route('api.licenses.list'),
                             'dom' =>'CT<"clear">lfrtip',
                             'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','exclude'=>array(5),'activate'=>'mouseover'),
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php
index 2d02153d00..749e86ab31 100755
--- a/app/views/backend/models/index.blade.php
+++ b/app/views/backend/models/index.blade.php
@@ -32,6 +32,20 @@
         Lang::get('table.actions'))
     ->setOptions(
             array(
+	             'language' => array(
+	            	'search' => Lang::get('general.search'),
+	            	'lengthMenu' => Lang::get('general.page_menu'),
+	            	'loadingRecords' => Lang::get('general.loading'),
+	            	'zeroRecords' => Lang::get('general.no_results'),
+	            	'info' => Lang::get('general.pagination_info'), 
+	            	'processing' => Lang::get('general.processing'),
+	            	'paginate'=> array(
+	            		'first'=>Lang::get('general.first'),
+	            		'previous'=>Lang::get('general.previous'),
+	            		'next'=>Lang::get('general.next'),
+	            		'last'=>Lang::get('general.last'),
+	            		),
+	            ),
                 'sAjaxSource'=> route('api.models.list', Input::get('status')),
                 'dom' =>'CT<"clear">lfrtip',
                'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','exclude'=>array(6),'activate'=>'mouseover'),

From e88a81141fd1d8929412e0e32a17cdfa8d53acd1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Apr 2015 15:40:41 -0700
Subject: [PATCH 05/22] Added view link to asset tag, since some assets won't
 have names

---
 app/config/version.php                     | 4 ++--
 app/controllers/admin/AssetsController.php | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 93c17821d8..b2503ccce8 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-184',
-  'hash_version' => 'v1.2.6.1-184-g766afde',
+  'app_version' => 'v1.2.6.1-185',
+  'hash_version' => 'v1.2.6.1-185-g33e7ce6',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 655f69d77f..fe2e40cf68 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -979,8 +979,12 @@ class AssetsController extends AdminController
 	        {
 		        return '<a title="'.$assets->name.'" href="hardware/'.$assets->id.'/view">'.$assets->name.'</a>';
 	        })	
+	    ->addColumn('asset_tag',function($assets)
+	        {
+		        return '<a title="'.$assets->asset_tag.'" href="hardware/'.$assets->id.'/view">'.$assets->asset_tag.'</a>';
+	        })	
 	        
-        ->showColumns('asset_tag', 'serial')
+        ->showColumns('serial')
         
 		->addColumn('model',function($assets)
 			{

From 0cff78d127c801003dc82edd230768827ef3573c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Apr 2015 15:42:58 -0700
Subject: [PATCH 06/22] Updated language strings

---
 app/config/version.php                       |  4 +-
 app/lang/ar/general.php                      | 18 +++++++
 app/lang/cs/general.php                      | 18 +++++++
 app/lang/da/general.php                      | 18 +++++++
 app/lang/de/general.php                      | 20 +++++++-
 app/lang/en-GB/general.php                   | 18 +++++++
 app/lang/es-ES/general.php                   | 18 +++++++
 app/lang/fi/general.php                      | 18 +++++++
 app/lang/fr/general.php                      | 18 +++++++
 app/lang/hu/general.php                      | 18 +++++++
 app/lang/it/admin/users/message.php          | 42 +++++++--------
 app/lang/it/admin/users/table.php            | 54 ++++++++++----------
 app/lang/it/general.php                      | 18 +++++++
 app/lang/it/validation.php                   |  4 +-
 app/lang/ja/general.php                      | 18 +++++++
 app/lang/ms/general.php                      | 18 +++++++
 app/lang/nl/general.php                      | 18 +++++++
 app/lang/no/general.php                      | 18 +++++++
 app/lang/pl/general.php                      | 18 +++++++
 app/lang/pt-BR/admin/accessories/general.php |  6 +--
 app/lang/pt-BR/admin/accessories/table.php   |  2 +-
 app/lang/pt-BR/admin/categories/general.php  |  6 +--
 app/lang/pt-BR/general.php                   | 18 +++++++
 app/lang/pt-PT/general.php                   | 18 +++++++
 app/lang/ro/general.php                      | 18 +++++++
 app/lang/ru/general.php                      | 18 +++++++
 app/lang/sv-SE/general.php                   | 18 +++++++
 app/lang/th/general.php                      | 18 +++++++
 app/lang/vi/general.php                      | 18 +++++++
 app/lang/zh-CN/general.php                   | 18 +++++++
 30 files changed, 474 insertions(+), 60 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index b2503ccce8..5cef0e27f8 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-185',
-  'hash_version' => 'v1.2.6.1-185-g33e7ce6',
+  'app_version' => 'v1.2.6.1-186',
+  'hash_version' => 'v1.2.6.1-186-gc88ce0d',
 );
\ No newline at end of file
diff --git a/app/lang/ar/general.php b/app/lang/ar/general.php
index bbd3d23d16..f65bc3bec4 100755
--- a/app/lang/ar/general.php
+++ b/app/lang/ar/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'تغيير عنوان البريد الإلكتروني',
     'changepassword'  		=> 'تغيير كلمة المرور',
     'checkin'  				=> 'تسجيل',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'ترجيع',
     'city'  				=> 'المدينة',
     'country'  				=> 'الدولة',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'الإستهلاك',
     'editprofile'  			=> 'تعديل الملف الشخصي',
     'eol'					=> 'الحياة',
+    'first'					=> 'First',
     'first_name'			=> 'الإسم الأول',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'الرقم',
     'image_delete'         	=> 'حذف الصورة',
     'image_upload'         	=> 'رفع صورة',
+    'last'					=> 'Last',
     'last_name'				=> 'الإسم الأخير',
     'license'				=> 'الرخص',
     'license_report'        => 'License Report',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'أشهر',
     'moreinfo'				=> 'المزيد من المعلومات',
     'name'					=> 'الإسم',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'لا يوجد إستهلاك',
     'no_results'			=> 'لا يوجد نتائج.',
     'no'  					=> 'لا',
     'notes'  				=> 'مُلاحظات',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'في انتظار المراجعة',
     'people'				=> 'الأشخاص',
     'per_page'				=> 'عدد النتائج في كل صفحة',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'ملفك الشخصي',
     'ready_to_deploy'		=> 'جاهزة للتوزيع',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'التقارير',
     'save'  				=> 'حفظ',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'الإعدادات',
     'sign_in'				=> 'تسجيل الدخول',
     'site_name'				=> 'إسم الموقع',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'غير قابلة للتوزيع',
     'unknown_admin'			=> 'إداري غير معروف',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'المستخدم',
     'users'                 => 'Users',
     'viewassets'  			=> 'عرض الأصول المسجلة',
diff --git a/app/lang/cs/general.php b/app/lang/cs/general.php
index 5cd3572849..9c6547b991 100755
--- a/app/lang/cs/general.php
+++ b/app/lang/cs/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Změnit e-mailovou adresu',
     'changepassword'  		=> 'Změnit heslo',
     'checkin'  				=> 'Příjem',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Výdej',
     'city'  				=> 'Město',
     'country'  				=> 'Země',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Amortizace',
     'editprofile'  			=> 'Upravit profil',
     'eol'					=> 'Konec životnosti',
+    'first'					=> 'First',
     'first_name'			=> 'Jméno',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Smazat obrázek',
     'image_upload'         	=> 'Nahrát obrázek',
+    'last'					=> 'Last',
     'last_name'				=> 'Příjmení',
     'license'				=> 'Licence',
     'license_report'        => 'Report licencí',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'měsíce',
     'moreinfo'				=> 'Další informace',
     'name'					=> 'Název',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Žádná amortizace',
     'no_results'			=> 'Žádné výsledky.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Poznámky',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Čeká na vyřízení',
     'people'				=> 'Lidé',
     'per_page'				=> 'Výsledků na stránku',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Váš profil',
     'ready_to_deploy'		=> 'Připraveno k přidělení',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Reporty',
     'save'  				=> 'Uložit',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Nastavení',
     'sign_in'				=> 'Přihlásit se',
     'site_name'				=> 'Název lokality',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Ne-přiřaditelné',
     'unknown_admin'			=> 'Neznámy správce',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Uživatel',
     'users'                 => 'Users',
     'viewassets'  			=> 'Zobrazit přiřazený majetek',
diff --git a/app/lang/da/general.php b/app/lang/da/general.php
index 39f0673e15..abbc986f19 100755
--- a/app/lang/da/general.php
+++ b/app/lang/da/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Skift email adresse',
     'changepassword'  		=> 'Skift adgangskode',
     'checkin'  				=> 'Tjek Ind',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Tjek Ud',
     'city'  				=> 'By',
     'country'  				=> 'Land',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Afskrivning',
     'editprofile'  			=> 'Ret Din Profil',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Fornavn',
     'file_name'				=> 'Fil',
     'file_uploads'			=> 'Filoverførsel',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Slet billede',
     'image_upload'         	=> 'Upload billede',
+    'last'					=> 'Last',
     'last_name'				=> 'Efternavn',
     'license'				=> 'Licens',
     'license_report'        => 'Licensrapport',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'måneder',
     'moreinfo'				=> 'Mere Info',
     'name'					=> 'Navn',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Ingen Afskrivning',
     'no_results'			=> 'Ingen Resultater.',
     'no'  					=> 'Nej',
     'notes'  				=> 'Noter',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Afventer',
     'people'				=> 'Personer',
     'per_page'				=> 'Resultater Per Side',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Din profil',
     'ready_to_deploy'		=> 'Klar til Implementering',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Rapporter',
     'save'  				=> 'Gem',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Instillinger',
     'sign_in'				=> 'Log ind',
     'site_name'				=> 'Site Navn',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Ikke implementerbar',
     'unknown_admin'			=> 'Ukendt Admin',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Bruger',
     'users'                 => 'Brugere',
     'viewassets'  			=> 'Se Tildelte Aktiver',
diff --git a/app/lang/de/general.php b/app/lang/de/general.php
index 0e646c9628..26baf43053 100755
--- a/app/lang/de/general.php
+++ b/app/lang/de/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'E-Mail Adresse ändern',
     'changepassword'  		=> 'Passwort ändern',
     'checkin'  				=> 'Checkin Asset',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Checkout Asset to User',
     'city'  				=> 'Stadt',
     'country'  				=> 'Land',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Abschreibung',
     'editprofile'  			=> 'Profil bearbeiten',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Vorname',
     'file_name'				=> 'Datei',
     'file_uploads'			=> 'Datei-Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'Id',
     'image_delete'         	=> 'Bild löschen',
     'image_upload'         	=> 'Bild hinzufügen',
+    'last'					=> 'Last',
     'last_name'				=> 'Familienname',
     'license'				=> 'Lizenz',
     'license_report'        => 'Lizenz Report',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'Monate',
     'moreinfo'				=> 'Mehr Informationen',
     'name'					=> 'Location Name',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Do Not Depreciate',
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Notizen',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pending Asset',
     'people'				=> 'Personen',
     'per_page'				=> 'Ergebnisse pro Seite',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Ihr Profil',
     'ready_to_deploy'		=> 'Fertig zum herausgeben',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Berichte',
     'save'  				=> 'Speichern',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Einstellungen',
     'sign_in'				=> 'Einloggen',
     'site_name'				=> 'Seitenname',
@@ -92,8 +109,9 @@ return array(
     'type'  				=> 'Typ',
     'undeployable'			=> 'Nicht herausgebbar',
     'unknown_admin'			=> 'Unbekannter Administrator',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Nutzer',
-    'users'                 => 'Users',
+    'users'                 => 'Benutzer',
     'viewassets'  			=> 'Zugeordnete Assets anzeigen',
     'website'               => 'Webseite',
     'welcome'				=> 'Wilkommen, :name',
diff --git a/app/lang/en-GB/general.php b/app/lang/en-GB/general.php
index 0b4fa67713..d9f6eb07cb 100755
--- a/app/lang/en-GB/general.php
+++ b/app/lang/en-GB/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Change Email Address',
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Checkout',
     'city'  				=> 'City',
     'country'  				=> 'Country',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Depreciation',
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'First Name',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'months',
     'moreinfo'				=> 'More Info',
     'name'					=> 'Name',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'No Depreciation',
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pending',
     'people'				=> 'People',
     'per_page'				=> 'Results Per Page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Your profile',
     'ready_to_deploy'		=> 'Ready to Deploy',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Settings',
     'sign_in'				=> 'Sign in',
     'site_name'				=> 'Site Name',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'users'                 => 'Users',
     'viewassets'  			=> 'View Assigned Assets',
diff --git a/app/lang/es-ES/general.php b/app/lang/es-ES/general.php
index 2261c24539..9aaaebe894 100755
--- a/app/lang/es-ES/general.php
+++ b/app/lang/es-ES/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Cambiar Email',
     'changepassword'  		=> 'Cambiar Password',
     'checkin'  				=> 'Quitar Equipo',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Asignar a un usuario',
     'city'  				=> 'Ciudad',
     'country'  				=> 'Pais',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Amortización',
     'editprofile'  			=> 'Editar Perfil',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Nombre',
     'file_name'				=> 'Archivo',
     'file_uploads'			=> 'Carga de Archivos',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'Id',
     'image_delete'         	=> 'Borrar imagen',
     'image_upload'         	=> 'Enviar imagen',
+    'last'					=> 'Last',
     'last_name'				=> 'Apellidos',
     'license'				=> 'Licencia',
     'license_report'        => 'Reporte de Licencias',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'Meses',
     'moreinfo'				=> 'Más Info',
     'name'					=> 'Nombre Localización',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'No Amortizar',
     'no_results'			=> 'Sin Resultados.',
     'no'  					=> 'No',
     'notes'  				=> 'Notas',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Equipo Pendiente',
     'people'				=> 'Usuarios',
     'per_page'				=> 'Resultados Por Pag',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Perfil',
     'ready_to_deploy'		=> 'Disponibles',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Informes',
     'save'  				=> 'Guardar',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Opciones',
     'sign_in'				=> 'Entrar',
     'site_name'				=> 'Sitio',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Tipo',
     'undeployable'			=> 'No Instalable',
     'unknown_admin'			=> 'Admin Desconocido',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Usuario',
     'users'                 => 'Users',
     'viewassets'  			=> 'Ver Equipos Asignados',
diff --git a/app/lang/fi/general.php b/app/lang/fi/general.php
index 3505534bbb..97bf3968cb 100755
--- a/app/lang/fi/general.php
+++ b/app/lang/fi/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Muuta Email-osoite',
     'changepassword'  		=> 'Muuta Salasana',
     'checkin'  				=> 'Palauta',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Luovuta',
     'city'  				=> 'Kaupunki',
     'country'  				=> 'Maa',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Poistoluokka',
     'editprofile'  			=> 'Muokkaa Profiilia',
     'eol'					=> 'Elinikä',
+    'first'					=> 'First',
     'first_name'			=> 'Etunimi',
     'file_name'				=> 'Tiedosto',
     'file_uploads'			=> 'Tiedostolataus',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'Tunnus',
     'image_delete'         	=> 'Poista Kuva',
     'image_upload'         	=> 'Lähetä Kuva',
+    'last'					=> 'Last',
     'last_name'				=> 'Sukunimi',
     'license'				=> 'Lisenssi',
     'license_report'        => 'Lisenssiraportti',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'Kuukautta',
     'moreinfo'				=> 'Lisätiedot',
     'name'					=> 'Nimi',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Ei poistoluokkaa',
     'no_results'			=> 'Ei tuloksia.',
     'no'  					=> 'Ei',
     'notes'  				=> 'Muistiinpanot',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Odottaa',
     'people'				=> 'Ihmiset',
     'per_page'				=> 'Tuloksia Per Sivu',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Profiilisi',
     'ready_to_deploy'		=> 'Käyttöönotettavissa',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Raportit',
     'save'  				=> 'Tallenna',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Asetukset',
     'sign_in'				=> 'Kirjaudu sisään',
     'site_name'				=> 'Sivuston Nimi',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Ei-käyttöönotettavissa',
     'unknown_admin'			=> 'Tuntematon Ylläpitäjä',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Käyttäjä',
     'users'                 => 'Users',
     'viewassets'  			=> 'Näytä Käyttöönotetut Laitteet',
diff --git a/app/lang/fr/general.php b/app/lang/fr/general.php
index 95f647868e..794c983408 100755
--- a/app/lang/fr/general.php
+++ b/app/lang/fr/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Changer l\'adresse e-mail',
     'changepassword'  		=> 'Changer le mot de passe',
     'checkin'  				=> 'Dissocier',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Associer',
     'city'  				=> 'Ville',
     'country'  				=> 'Pays',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Amortissement',
     'editprofile'  			=> 'Éditer votre profile',
     'eol'					=> 'Fin de vie',
+    'first'					=> 'First',
     'first_name'			=> 'Prénom',
     'file_name'				=> 'Fichier',
     'file_uploads'			=> 'Uploads de fichiers',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Supprimer l\'image',
     'image_upload'         	=> 'Charger une image',
+    'last'					=> 'Last',
     'last_name'				=> 'Nom',
     'license'				=> 'Licence',
     'license_report'        => 'Rapport de licence',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'mois',
     'moreinfo'				=> 'Plus d\'info',
     'name'					=> 'Nom',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Pas d\'amortissement',
     'no_results'			=> 'Pas de résultat.',
     'no'  					=> 'Non',
     'notes'  				=> 'Notes',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'En Attente',
     'people'				=> 'Personnes',
     'per_page'				=> 'Résultats par page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Votre profil',
     'ready_to_deploy'		=> 'Prêt à être déployé',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Rapports',
     'save'  				=> 'Sauvegarder',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Préférences',
     'sign_in'				=> 'Connexion',
     'site_name'				=> 'Nom du Site',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Non déployable',
     'unknown_admin'			=> 'Admin inconnu',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Utilisateur',
     'users'                 => 'Users',
     'viewassets'  			=> 'Voir les actifs associés',
diff --git a/app/lang/hu/general.php b/app/lang/hu/general.php
index 69c6cb801a..2ff328afe2 100755
--- a/app/lang/hu/general.php
+++ b/app/lang/hu/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'E-mail cím módosítása',
     'changepassword'  		=> 'Jelszó módosítása',
     'checkin'  				=> 'Checkin',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Checkout',
     'city'  				=> 'Város',
     'country'  				=> 'Ország',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Depreciation',
     'editprofile'  			=> 'Profil szerkeztése',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Keresztnév',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'last'					=> 'Last',
     'last_name'				=> 'Vezetéknév',
     'license'				=> 'License',
     'license_report'        => 'License Report',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'months',
     'moreinfo'				=> 'More Info',
     'name'					=> 'Név',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'No Depreciation',
     'no_results'			=> 'Nincs találat.',
     'no'  					=> 'Nem ',
     'notes'  				=> 'Notes',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pending',
     'people'				=> 'People',
     'per_page'				=> 'Results Per Page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Your profile',
     'ready_to_deploy'		=> 'Ready to Deploy',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Reports',
     'save'  				=> 'Mentés',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Beállítások',
     'sign_in'				=> 'Bejelentkezés',
     'site_name'				=> 'Site Name',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Felhasználó',
     'users'                 => 'Users',
     'viewassets'  			=> 'View Assigned Assets',
diff --git a/app/lang/it/admin/users/message.php b/app/lang/it/admin/users/message.php
index c668179bb0..4ae29ea753 100755
--- a/app/lang/it/admin/users/message.php
+++ b/app/lang/it/admin/users/message.php
@@ -2,33 +2,33 @@
 
 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'              	=> 'Utente già esistente!',
+    'user_not_found'           	=> 'L\'utente [:id] non esite.',
+    'user_login_required'      	=> 'È necessario il campo login',
+    'user_password_required'   	=> 'È richiesta la password.',
+    'insufficient_permissions' 	=> 'Permessi Insufficienti.',
+    'user_deleted_warning' 		=> 'Questo utente è stato eliminato. Si dovrà ripristinare questo utente per modificare o assegnare nuovi beni.',
 
 
     '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.',
-        'import'    => 'Users imported successfully.',
+        'create'    => 'Utente creato con successo.',
+        'update'    => 'Utente aggiornato con successo.',
+        'delete'    => 'Utente eliminato con successo.',
+        'ban'       => 'Utente bloccato con successo.',
+        'unban'     => 'Utente sbloccato con successo.',
+        'suspend'   => 'Utente sospeso con successo.',
+        'unsuspend' => 'Utente riabilitato con successo.',
+        'restored'  => 'Utente ripristinato con successo.',
+        'import'    => 'Utenti importati con successo.',
     ),
 
     '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.',
-        'import'    => 'There was an issue importing users. Please try again.',
-        'asset_already_accepted' => 'This asset has already been accepted.',
+        'create' => 'C\'è stato un problema durante la creazione dell\'utente. Per favore riprova.',
+        'update' => 'C\'è stato un problema durante l\'aggiornamento dell\'utente. Per favore riprova.',
+        'delete' => 'C\'è stato un problema durante la cancellazione dell\'utente. Riprova per favore.',
+        'unsuspend' => 'C\'è stato un problema durante la riabilitazione dell\'utente. Riprova per favore.',
+        'import'    => 'C\'è stato un problema durante l\'importazione degli utenti. Riprova per favore.',
+        'asset_already_accepted' => 'Questo bene è già stato accettato.',
     ),
 
 );
diff --git a/app/lang/it/admin/users/table.php b/app/lang/it/admin/users/table.php
index 8c9b40a454..700ca64e66 100755
--- a/app/lang/it/admin/users/table.php
+++ b/app/lang/it/admin/users/table.php
@@ -2,35 +2,35 @@
 
 return array(
 
-    'activated'  			=> 'Active',
-    'allow'  				=> 'Allow',
-    'checkedout'  			=> 'Assets',
-    'created_at' 			=> 'Created',
-    'createuser' 			=> 'Create User',
-    'deny'  				=> 'Deny',
+    'activated'  			=> 'Attivo',
+    'allow'  				=> 'Consenti',
+    'checkedout'  			=> 'Beni',
+    'created_at' 			=> 'Creato',
+    'createuser' 			=> 'Crea Utente',
+    'deny'  				=> 'Nega',
     '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.',
-    'id'         			=> 'Id',
-    'inherit'  				=> 'Inherit',
-    'job' 					=> 'Job Title',
-    'last_login'  			=> 'Last Login',
-    'last_name'  			=> 'Last Name',
-    'location'  			=> 'Location',
-    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
+    'employee_num'      	=> 'Num. Dipendenti',
+    'first_name' 			=> 'Nome',
+    'groupnotes'			=> 'Selezionare un gruppo a cui assegnare l\'utente, ricorda che un utente assume le autorizzazioni del gruppo a cui appartiene.',
+    'id'         			=> 'ID',
+    'inherit'  				=> 'Eredita',
+    'job' 					=> 'Professione',
+    'last_login'  			=> 'Ultimo accesso',
+    'last_name'  			=> 'Cognome',
+    'location'  			=> 'Posizione',
+    'lock_passwords'		=> 'Dettagli di login non possono essere cambiati in questa installazione.',
     'manager' 				=> 'Manager',
-    'name' 					=> 'Name',
-    'notes'                 => 'Notes',
-    'password_confirm' 		=> 'Confirm Password',
+    'name' 					=> 'Nome',
+    'notes'                 => 'Note',
+    'password_confirm' 		=> 'Conferma password',
     'password' 				=> 'Password',
-    'phone'  				=> 'Phone',
-    'show_current'          => 'Show Current Users',
-    'show_deleted'          => 'Show Deleted Users',
-    'title' 				=> 'Title',
-    'updateuser' 			=> 'Update User',
+    'phone'  				=> 'Telefono',
+    'show_current'          => 'Visualizza utenti attuali',
+    'show_deleted'          => 'Visualizza utenti eliminati',
+    'title' 				=> 'Titolo',
+    'updateuser' 			=> 'Aggiornamento utente',
     'username' 				=> 'Username',
-    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
-    'cloneuser'             => 'Clone User',
-    'viewusers' 			=> 'View Users',
+    'username_note' 		=> '(Questo è usato solo per Active Directory vincolante, non per il login.)',
+    'cloneuser'             => 'Clona Utente',
+    'viewusers' 			=> 'Visualizza utenti',
 );
diff --git a/app/lang/it/general.php b/app/lang/it/general.php
index 6bc6ba481f..762d9e3726 100755
--- a/app/lang/it/general.php
+++ b/app/lang/it/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Modifica indirizzo email',
     'changepassword'  		=> 'Modifica password',
     'checkin'  				=> 'Carica',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Scarica',
     'city'  				=> 'Città',
     'country'  				=> 'Paese',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Obsoleti',
     'editprofile'  			=> 'Edita il tuo profilo',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Nome',
     'file_name'				=> 'File',
     'file_uploads'			=> 'Carica i file',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Cancella l\'Immagine',
     'image_upload'         	=> 'Carica immagine',
+    'last'					=> 'Last',
     'last_name'				=> 'Cognome',
     'license'				=> 'Licenza',
     'license_report'        => 'Report Licenze',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'mesi',
     'moreinfo'				=> 'Altre informazioni',
     'name'					=> 'Nome',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Non Obsololeto',
     'no_results'			=> 'Nessun risultato.',
     'no'  					=> 'No',
     'notes'  				=> 'Note',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'In attesa',
     'people'				=> 'Utenti',
     'per_page'				=> 'Risultati per Pagina',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Il tuo profilo',
     'ready_to_deploy'		=> 'Pronto per il rilascio',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Reports',
     'save'  				=> 'Salva',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Impostazioni',
     'sign_in'				=> 'Accedi',
     'site_name'				=> 'Nome sito',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Tipo',
     'undeployable'			=> 'Non consegnabile',
     'unknown_admin'			=> 'Amministratore sconosciuto',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Utente',
     'users'                 => 'Utenti',
     'viewassets'  			=> 'Visualizza gli Assets assegnati',
diff --git a/app/lang/it/validation.php b/app/lang/it/validation.php
index f9e7bbab0e..6f7200aaa1 100755
--- a/app/lang/it/validation.php
+++ b/app/lang/it/validation.php
@@ -34,8 +34,8 @@ return array(
     "email"            => "il formato del :attribute è invalido.",
     "exists"           => ":attribute selezzionato è invalido.",
     "image"            => "il :attribute deve essere un immagine.",
-    "in"               => "The selected :attribute is invalid.",
-    "integer"          => "The :attribute must be an integer.",
+    "in"               => "Il selezionato :attribute è invalido.",
+    "integer"          => "L' :attribute deve essere un numero intero.",
     "ip"               => "The :attribute must be a valid IP address.",
     "max"              => array(
         "numeric" => "The :attribute may not be greater than :max.",
diff --git a/app/lang/ja/general.php b/app/lang/ja/general.php
index 96ff475f39..fe30d64df0 100755
--- a/app/lang/ja/general.php
+++ b/app/lang/ja/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Change Email Address',
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Checkout',
     'city'  				=> 'City',
     'country'  				=> 'Country',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Depreciation',
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'First Name',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'months',
     'moreinfo'				=> 'More Info',
     'name'					=> 'Name',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'No Depreciation',
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pending',
     'people'				=> 'People',
     'per_page'				=> 'Results Per Page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Your profile',
     'ready_to_deploy'		=> 'Ready to Deploy',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Settings',
     'sign_in'				=> 'Sign in',
     'site_name'				=> 'Site Name',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'users'                 => 'Users',
     'viewassets'  			=> 'View Assigned Assets',
diff --git a/app/lang/ms/general.php b/app/lang/ms/general.php
index edd32eb32b..a320ff50bf 100755
--- a/app/lang/ms/general.php
+++ b/app/lang/ms/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Ubah Alamat E-mail',
     'changepassword'  		=> 'Tukar kata laluan',
     'checkin'  				=> 'Terima',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Agihkan',
     'city'  				=> 'Bandar',
     'country'  				=> 'Negara',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Susut Nilai',
     'editprofile'  			=> 'Kemaskini Profail Anda',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Nama pertama',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Hapuskan imej',
     'image_upload'         	=> 'Muat naik imej',
+    'last'					=> 'Last',
     'last_name'				=> 'Nama Keluarga',
     'license'				=> 'Lesen',
     'license_report'        => 'Laporan Lesen',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'Bulan',
     'moreinfo'				=> 'Maklumat tambahan',
     'name'					=> 'Nama',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Tiada Susut Nilai',
     'no_results'			=> 'Tiada kepututsan.',
     'no'  					=> 'Tidak',
     'notes'  				=> 'Nota',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Belum selesai',
     'people'				=> 'Orang',
     'per_page'				=> 'Senarai Setiap Mukasurat',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Profail Anda',
     'ready_to_deploy'		=> 'Sedia untuk diagihkan',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Laporan',
     'save'  				=> 'Simpan',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Tetapan',
     'sign_in'				=> 'Log masuk',
     'site_name'				=> 'Nama Sesawang',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Tidak Boleh Agih',
     'unknown_admin'			=> 'Pentadbir Tidak Dikenali',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Pengguna',
     'users'                 => 'Users',
     'viewassets'  			=> 'Paparkan Harta yang diserahkan',
diff --git a/app/lang/nl/general.php b/app/lang/nl/general.php
index c65b434394..a7850633c6 100755
--- a/app/lang/nl/general.php
+++ b/app/lang/nl/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'E-mailadres wijzigen',
     'changepassword'  		=> 'Wachtwoord wijzigen',
     'checkin'  				=> 'Check-in',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Afrekenen',
     'city'  				=> 'Plaats',
     'country'  				=> 'Land',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Afschrijving',
     'editprofile'  			=> 'Bewerk jouw profiel',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Voornaam',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Afbeelding verwijderen',
     'image_upload'         	=> 'Afbeelding uploaden',
+    'last'					=> 'Last',
     'last_name'				=> 'Achternaam',
     'license'				=> 'Licentie',
     'license_report'        => 'Licentierapport',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'maanden',
     'moreinfo'				=> 'Meer Info',
     'name'					=> 'Naam',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Geen afschrijving',
     'no_results'			=> 'Geen resultaten.',
     'no'  					=> 'Neen',
     'notes'  				=> 'Notities',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'In afwachting',
     'people'				=> 'Personen',
     'per_page'				=> 'Resultaten per pagina',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Uw profiel',
     'ready_to_deploy'		=> 'Klaar om ingezet te worden',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Rapporten',
     'save'  				=> 'Opslaan',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Instellingen',
     'sign_in'				=> 'Aanmelden',
     'site_name'				=> 'Sitenaam',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Niet-inzetbaar',
     'unknown_admin'			=> 'Onbekende Beheerder',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Gebruiker',
     'users'                 => 'Users',
     'viewassets'  			=> 'Bekijk toegekende materialen',
diff --git a/app/lang/no/general.php b/app/lang/no/general.php
index 205bdb6de1..5169225bb1 100755
--- a/app/lang/no/general.php
+++ b/app/lang/no/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Endre e-postadresse',
     'changepassword'  		=> 'Endre passord',
     'checkin'  				=> 'Sjekk inn',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Sjekk ut',
     'city'  				=> 'By',
     'country'  				=> 'Land',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Avskrivning',
     'editprofile'  			=> 'Rediger din profil',
     'eol'					=> 'Livstid',
+    'first'					=> 'First',
     'first_name'			=> 'Fornavn',
     'file_name'				=> 'Fil',
     'file_uploads'			=> 'Filopplastinger',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Slett bilde',
     'image_upload'         	=> 'Last opp bilde',
+    'last'					=> 'Last',
     'last_name'				=> 'Etternavn',
     'license'				=> 'Lisens',
     'license_report'        => 'Lisensrapport',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'måneder',
     'moreinfo'				=> 'Mer info',
     'name'					=> 'Navn',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Ingen avskrivning',
     'no_results'			=> 'Ingen treff.',
     'no'  					=> 'Nummer',
     'notes'  				=> 'Notater',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Under arbeid',
     'people'				=> 'Folk',
     'per_page'				=> 'Resultater pr side',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Din profil',
     'ready_to_deploy'		=> 'Klar for utlevering',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Rapporter',
     'save'  				=> 'Lagre',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Innstillinger',
     'sign_in'				=> 'Logg inn',
     'site_name'				=> 'Nettstedsnavn',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Ikke utleverbar',
     'unknown_admin'			=> 'Ukjent admin',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Bruker',
     'users'                 => 'Users',
     'viewassets'  			=> 'Vis tildelte eiendeler',
diff --git a/app/lang/pl/general.php b/app/lang/pl/general.php
index 07caad6b30..757427c420 100755
--- a/app/lang/pl/general.php
+++ b/app/lang/pl/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Zmiana adresu email',
     'changepassword'  		=> 'Zmień Hasło',
     'checkin'  				=> 'Odepnij',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Przypisz',
     'city'  				=> 'Miasto',
     'country'  				=> 'Kraj',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Amortyzacja',
     'editprofile'  			=> 'Edytuj Swój Profil',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Imię',
     'file_name'				=> 'Plik',
     'file_uploads'			=> 'Dodaj plik',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Usuń zdjęcie',
     'image_upload'         	=> 'Dodaj zdjęcie',
+    'last'					=> 'Last',
     'last_name'				=> 'Nazwisko',
     'license'				=> 'Licencja',
     'license_report'        => 'Raport Licencji',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'miesięcy',
     'moreinfo'				=> 'Więcej informacji',
     'name'					=> 'Nazwa',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Nie Amortyzowany',
     'no_results'			=> 'Brak wyników.',
     'no'  					=> 'Nie',
     'notes'  				=> 'Notatki',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Oczekujący',
     'people'				=> 'Osoby',
     'per_page'				=> 'Wyników na strone',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Twój profil',
     'ready_to_deploy'		=> 'Gotowe do wdrożenia',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Raporty',
     'save'  				=> 'Zapisz',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Ustawienia',
     'sign_in'				=> 'Zaloguj się',
     'site_name'				=> 'Nazwa Witryny',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Nie przypisane',
     'unknown_admin'			=> 'Nieznany Administrator',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Użytkownik',
     'users'                 => 'Users',
     'viewassets'  			=> 'Zobacz przypisane aktywa',
diff --git a/app/lang/pt-BR/admin/accessories/general.php b/app/lang/pt-BR/admin/accessories/general.php
index d0a1c7eef7..c7849af7d8 100755
--- a/app/lang/pt-BR/admin/accessories/general.php
+++ b/app/lang/pt-BR/admin/accessories/general.php
@@ -2,15 +2,15 @@
 
 return array(
     'about_accessories_title' 			=> 'Sobre os Acessórios',
-    'about_accessories_text'  			=> 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+    'about_accessories_text'  			=> 'Um acessório é qualquer coisa que você emitir aos usuários sem um número de série (ou que você não se preocupar em acompanhá-la unicamente). Por exemplo, mouses ou teclados.',
     'accessory_category' 				=> 'Categoria do Acessório',
     'accessory_name'  					=> 'Nome do Acessório',
     'create'  							=> 'Criar Categoria',
     'eula_text'							=> 'EULA da Categoria',
-    'eula_text_help'					=> 'Este campo lhe permite personalizar seus EULAs para tipos específicos de bens. Se você apenas tem um EULA para todos os seus bens, você pode selecionar a caixa abaixo para usar o padrão primário.',
+    'eula_text_help'					=> 'Este campo lhe permite personalizar seus EULAs para tipos específicos de ativos. Se você apenas tem um EULA para todos os seus ativos, você pode selecionar a caixa abaixo para usar o padrão primário.',
     'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
     'no_default_eula'					=> 'Nenhum EULA padrão primário foi encontrado. Adicione um nas Configurações.',
-    'qty'  								=> 'QTY',
+    'qty'  								=> 'QTD',
     'total'  							=> 'Total',
     'remaining'  						=> 'Avail',
     'update'  							=> 'Atualizar Categoria',
diff --git a/app/lang/pt-BR/admin/accessories/table.php b/app/lang/pt-BR/admin/accessories/table.php
index c86dd8adfa..aefd115b39 100755
--- a/app/lang/pt-BR/admin/accessories/table.php
+++ b/app/lang/pt-BR/admin/accessories/table.php
@@ -4,6 +4,6 @@ return array(
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptance',
-    'title'      				=> 'Accessory Name',
+    'title'      				=> 'Nome do Acessório',
 
 );
diff --git a/app/lang/pt-BR/admin/categories/general.php b/app/lang/pt-BR/admin/categories/general.php
index 0e568181ed..a88df8d996 100755
--- a/app/lang/pt-BR/admin/categories/general.php
+++ b/app/lang/pt-BR/admin/categories/general.php
@@ -1,9 +1,9 @@
 <?php
 
 return array(
-    'about_asset_categories' 			=> 'Sobre as Categorias de Bens',
-    'about_categories'  				=> 'As categorias de bens lhe ajudam a organizar os seus bens. Algumas categorias de exemplo podem ser &quot;Desktops&quot;, &quot;Notebooks&quot;, &quot;Telefones Celulares&quot;, &quot;Tablets&quot;, e outras, mas você pode usar as categorias de bens do jeito que você quiser. ',
-    'asset_categories' 					=> 'Categorias de Bens',
+    'about_asset_categories' 			=> 'Sobre as Categorias de Ativos',
+    'about_categories'  				=> 'As categorias de ativos lhe ajudam a organizar seus ativos. Algumas categorias de exemplo podem ser &quot;Desktops&quot;, &quot;Notebooks&quot;, &quot;Telefones Celulares&quot;, &quot;Tablets&quot;, e outras, mas você pode usar as categorias de ativos do jeito que você quiser.',
+    'asset_categories' 					=> 'Categorias de Ativos',
     'category_name'  					=> 'Nome da Categoria',
     'clone'                             => 'Clonar Categoria',
     'create'  							=> 'Criar Categoria',
diff --git a/app/lang/pt-BR/general.php b/app/lang/pt-BR/general.php
index c04e08090c..f61abacb1b 100755
--- a/app/lang/pt-BR/general.php
+++ b/app/lang/pt-BR/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Alterar Endereço de E-mail',
     'changepassword'  		=> 'Alterar Senha',
     'checkin'  				=> 'Check-in',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Check-out',
     'city'  				=> 'Cidade',
     'country'  				=> 'País',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Depreciação',
     'editprofile'  			=> 'Editar Seu Perfil',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Primeiro Nome',
     'file_name'				=> 'Arquivo',
     'file_uploads'			=> 'Carregamentos de Arquivos',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Deletar Imagem',
     'image_upload'         	=> 'Carregar Imagem',
+    'last'					=> 'Last',
     'last_name'				=> 'Último Nome',
     'license'				=> 'Licença',
     'license_report'        => 'Relatório da Licença',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'meses',
     'moreinfo'				=> 'Mais Informações',
     'name'					=> 'Nome',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Sem Depreciação',
     'no_results'			=> 'Sem Resultados.',
     'no'  					=> 'Não',
     'notes'  				=> 'Notas',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pendente',
     'people'				=> 'Pessoas',
     'per_page'				=> 'Resultados Por Página',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Seu perfil',
     'ready_to_deploy'		=> 'Pronto para Implantar',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Relatórios',
     'save'  				=> 'Salvar',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Configurações',
     'sign_in'				=> 'Entrar',
     'site_name'				=> 'Nome do Site',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Tipo',
     'undeployable'			=> 'Não implantável',
     'unknown_admin'			=> 'Administrador Desconhecido',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Usuário',
     'users'                 => 'Users',
     'viewassets'  			=> 'Ver Bens Atribuídos',
diff --git a/app/lang/pt-PT/general.php b/app/lang/pt-PT/general.php
index 96ff475f39..fe30d64df0 100755
--- a/app/lang/pt-PT/general.php
+++ b/app/lang/pt-PT/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Change Email Address',
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Checkout',
     'city'  				=> 'City',
     'country'  				=> 'Country',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Depreciation',
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'First Name',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'months',
     'moreinfo'				=> 'More Info',
     'name'					=> 'Name',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'No Depreciation',
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pending',
     'people'				=> 'People',
     'per_page'				=> 'Results Per Page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Your profile',
     'ready_to_deploy'		=> 'Ready to Deploy',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Settings',
     'sign_in'				=> 'Sign in',
     'site_name'				=> 'Site Name',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'users'                 => 'Users',
     'viewassets'  			=> 'View Assigned Assets',
diff --git a/app/lang/ro/general.php b/app/lang/ro/general.php
index 14a6232adc..fa61072096 100755
--- a/app/lang/ro/general.php
+++ b/app/lang/ro/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Schimba adresa de E-mail',
     'changepassword'  		=> 'Schimba parola',
     'checkin'  				=> 'Primeste',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Preda',
     'city'  				=> 'Oras',
     'country'  				=> 'Tara',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Depreciere',
     'editprofile'  			=> 'Editeaza propriul profil',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Prenume',
     'file_name'				=> 'Fisier',
     'file_uploads'			=> 'Upload fisier',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Sterge poza',
     'image_upload'         	=> 'Incarca poza',
+    'last'					=> 'Last',
     'last_name'				=> 'Nume',
     'license'				=> 'Licenta',
     'license_report'        => 'Raport licente',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'luni',
     'moreinfo'				=> 'Mai multe',
     'name'					=> 'Nume',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Fara depreciere',
     'no_results'			=> 'Nici un rezultat.',
     'no'  					=> 'Nr',
     'notes'  				=> 'Note',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'In asteptare',
     'people'				=> 'Oameni',
     'per_page'				=> 'Rezultate pe pagina',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Profilul dvs.',
     'ready_to_deploy'		=> 'Gata de lansare',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Rapoarte',
     'save'  				=> 'Salveaza',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Setari',
     'sign_in'				=> 'Logheaza-te',
     'site_name'				=> 'Nume site',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Nelansabil',
     'unknown_admin'			=> 'Admin necunoscut',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Utilizator',
     'users'                 => 'Users',
     'viewassets'  			=> 'Vezi active desemnate',
diff --git a/app/lang/ru/general.php b/app/lang/ru/general.php
index 26429c938e..ca3a547f55 100755
--- a/app/lang/ru/general.php
+++ b/app/lang/ru/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Изменить адрес почты',
     'changepassword'  		=> 'Изменить пароль',
     'checkin'  				=> 'Привязать',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Отвязать',
     'city'  				=> 'Город',
     'country'  				=> 'Страна',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Амортизация',
     'editprofile'  			=> 'Редактировать свой профиль',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Имя',
     'file_name'				=> 'Файл',
     'file_uploads'			=> 'Загрузка файла',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Удалить изображение',
     'image_upload'         	=> 'Загрузить изображение',
+    'last'					=> 'Last',
     'last_name'				=> 'Фамилия',
     'license'				=> 'Лицензия',
     'license_report'        => 'Отчет по лицензиям',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'Месяцев',
     'moreinfo'				=> 'Подробнее',
     'name'					=> 'Имя',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'Нет аммортизации',
     'no_results'			=> 'Нет результатов.',
     'no'  					=> 'Нет',
     'notes'  				=> 'Примечания',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Ожидание',
     'people'				=> 'Пользователи',
     'per_page'				=> 'Результатов на страницу',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Ваш профиль',
     'ready_to_deploy'		=> 'Готов к установке',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Отчеты',
     'save'  				=> 'Сохранить',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Настройки',
     'sign_in'				=> 'Вход',
     'site_name'				=> 'Название сайта',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Тип',
     'undeployable'			=> 'Не развертываемый',
     'unknown_admin'			=> 'Неизвестный администратор',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'Пользователь',
     'users'                 => 'Пользователи',
     'viewassets'  			=> 'Показать присвоенные активы',
diff --git a/app/lang/sv-SE/general.php b/app/lang/sv-SE/general.php
index 253bd8005c..fe5b32b35e 100755
--- a/app/lang/sv-SE/general.php
+++ b/app/lang/sv-SE/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Ändra E-postadress',
     'changepassword'  		=> 'Ändra Lösenord',
     'checkin'  				=> 'Checkin',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Checkout',
     'city'  				=> 'Ort',
     'country'  				=> 'Land',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Depreciation',
     'editprofile'  			=> 'Ändra Din Profil',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'Förnamn',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Ta bort Bild',
     'image_upload'         	=> 'Ladda upp Bild',
+    'last'					=> 'Last',
     'last_name'				=> 'Efternamn',
     'license'				=> 'Licens',
     'license_report'        => 'License Report',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'months',
     'moreinfo'				=> 'More Info',
     'name'					=> 'Name',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'No Depreciation',
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pending',
     'people'				=> 'People',
     'per_page'				=> 'Results Per Page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Your profile',
     'ready_to_deploy'		=> 'Ready to Deploy',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Settings',
     'sign_in'				=> 'Sign in',
     'site_name'				=> 'Site Name',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'users'                 => 'Users',
     'viewassets'  			=> 'View Assigned Assets',
diff --git a/app/lang/th/general.php b/app/lang/th/general.php
index 897d428588..d06e6c9c18 100755
--- a/app/lang/th/general.php
+++ b/app/lang/th/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'เปลี่ยนอีเมลแอดเดรส',
     'changepassword'  		=> 'เปลี่ยนรหัสผ่าน',
     'checkin'  				=> 'เช็คอิน',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'เช็คเอาท์',
     'city'  				=> 'เมือง',
     'country'  				=> 'ประเทศ',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'การเสื่อมราคา',
     'editprofile'  			=> 'แก้ไขโปรไฟล์ของคุณ',
     'eol'					=> 'อายุการใช้งาน',
+    'first'					=> 'First',
     'first_name'			=> 'ชื่อจริง',
     'file_name'				=> 'ไฟล์',
     'file_uploads'			=> 'อัปโหลดไฟล์',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'ลบรูปภาพประจำตัว',
     'image_upload'         	=> 'อัพโหลดภาพ',
+    'last'					=> 'Last',
     'last_name'				=> 'นามสกุล',
     'license'				=> 'ลิขสิทธิ์',
     'license_report'        => 'รายงานลิขสิทธิ์',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'เดือน',
     'moreinfo'				=> 'ข้อมูลเพิ่มเติม',
     'name'					=> 'ชื่อ',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'ไม่มีค่าเสื่อมราคา',
     'no_results'			=> 'ไม่มีผลการค้นหา',
     'no'  					=> 'ไม่',
     'notes'  				=> 'หมายเหตุ',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'กําลังดำเนินการ',
     'people'				=> 'ผู้คน',
     'per_page'				=> 'ผลการค้นหาต่อหน้า',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'โปรไฟล์ของคุณ',
     'ready_to_deploy'		=> 'พร้อมใช้งาน',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'รายงาน',
     'save'  				=> 'บันทึก',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'การตั้งค่า',
     'sign_in'				=> 'ลงชื่อเข้าใช้',
     'site_name'				=> 'ชื่อไซต์',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'ประเภท',
     'undeployable'			=> 'ไม่สามารถใช้งานได้',
     'unknown_admin'			=> 'Unknown Admin',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'ผู้ใช้',
     'users'                 => 'ผู้ใช้',
     'viewassets'  			=> 'View Assigned Assets',
diff --git a/app/lang/vi/general.php b/app/lang/vi/general.php
index 96ff475f39..fe30d64df0 100755
--- a/app/lang/vi/general.php
+++ b/app/lang/vi/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> 'Change Email Address',
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Checkout',
     'city'  				=> 'City',
     'country'  				=> 'Country',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> 'Depreciation',
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
+    'first'					=> 'First',
     'first_name'			=> 'First Name',
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
@@ -69,17 +72,31 @@ return array(
     'months'				=> 'months',
     'moreinfo'				=> 'More Info',
     'name'					=> 'Name',
+    'next'					=> 'Next',
     'no_depreciation'		=> 'No Depreciation',
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pending',
     'people'				=> 'People',
     'per_page'				=> 'Results Per Page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> 'Your profile',
     'ready_to_deploy'		=> 'Ready to Deploy',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> 'Settings',
     'sign_in'				=> 'Sign in',
     'site_name'				=> 'Site Name',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
+    'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'users'                 => 'Users',
     'viewassets'  			=> 'View Assigned Assets',
diff --git a/app/lang/zh-CN/general.php b/app/lang/zh-CN/general.php
index 6dad2dbb3e..fb9908acfe 100755
--- a/app/lang/zh-CN/general.php
+++ b/app/lang/zh-CN/general.php
@@ -25,6 +25,7 @@ return array(
     'changeemail'  			=> '更改邮箱',
     'changepassword'  		=> '修改密码',
     'checkin'  				=> '借入',
+    'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> '借出',
     'city'  				=> '城市',
     'country'  				=> '国家',
@@ -44,6 +45,7 @@ return array(
     'depreciation'			=> '折旧',
     'editprofile'  			=> '修改简介',
     'eol'					=> '寿命',
+    'first'					=> 'First',
     'first_name'			=> '名字',
     'file_name'				=> '文件',
     'file_uploads'			=> '文件上传',
@@ -54,6 +56,7 @@ return array(
     'id'  					=> '编号',
     'image_delete'         	=> '删除图片',
     'image_upload'         	=> '上传图片',
+    'last'					=> 'Last',
     'last_name'				=> '姓氏',
     'license'				=> '授权许可',
     'license_report'        => '授权许可报告',
@@ -69,17 +72,31 @@ return array(
     'months'				=> '月数',
     'moreinfo'				=> '更多信息',
     'name'					=> '名称',
+    'next'					=> 'Next',
     'no_depreciation'		=> '永久',
     'no_results'			=> '没有结果',
     'no'  					=> '否',
     'notes'  				=> '备注',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> '待定',
     'people'				=> '组织成员',
     'per_page'				=> '每页搜索结果',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
     'profile'				=> '您的个人资料',
     'ready_to_deploy'		=> '待分配',
+    'recent_activity'		=> 'Recent Activity',
     'reports'				=> '报告',
     'save'  				=> '保存​​',
+    'select'				=> 'Select',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
     'settings'				=> '设置',
     'sign_in'				=> '登录',
     'site_name'				=> '站点名称',
@@ -92,6 +109,7 @@ return array(
     'type'  				=> '类型',
     'undeployable'			=> '无法被分配',
     'unknown_admin'			=> '未知管理员',
+    'uploaded'              => 'Uploaded',
     'user'					=> '用户',
     'users'                 => '用户',
     'viewassets'  			=> '查看资产分配',

From 80090a41ec02f7d9c458f96dfa5e4e73754c1417 Mon Sep 17 00:00:00 2001
From: Madd15 <joshdeakin@adam.com.au>
Date: Tue, 7 Apr 2015 13:25:20 +0930
Subject: [PATCH 07/22] Add Group User View

---
 app/lang/en/admin/groups/table.php      |  2 +
 app/routes.php                          |  1 +
 app/views/backend/groups/view.blade.php | 53 +++++++++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 app/views/backend/groups/view.blade.php

diff --git a/app/lang/en/admin/groups/table.php b/app/lang/en/admin/groups/table.php
index 61f060a116..80917448ab 100755
--- a/app/lang/en/admin/groups/table.php
+++ b/app/lang/en/admin/groups/table.php
@@ -5,5 +5,7 @@ return array(
     'id'         => 'Id',
     'name'       => 'Name',
     'users'      => '# of Users',
+    'update'	 => 'Update Group',
+    'view'		 => 'View Group',
 
 );
diff --git a/app/routes.php b/app/routes.php
index 37b6189c78..adf1bf3729 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -281,6 +281,7 @@ Route::group(array('prefix' => 'admin', 'before' => 'admin-auth', 'namespace' =>
         Route::post('{groupId}/edit', 'GroupsController@postEdit');
         Route::get('{groupId}/delete', array('as' => 'delete/group', 'uses' => 'GroupsController@getDelete'));
         Route::get('{groupId}/restore', array('as' => 'restore/group', 'uses' => 'GroupsController@getRestore'));
+        Route::get('{groupId}/view', array('as' => 'view/group', 'uses' => 'GroupsController@getView'));
     });
 
     # Dashboard
diff --git a/app/views/backend/groups/view.blade.php b/app/views/backend/groups/view.blade.php
new file mode 100644
index 0000000000..aa365b5fa3
--- /dev/null
+++ b/app/views/backend/groups/view.blade.php
@@ -0,0 +1,53 @@
+@extends('backend/layouts/default')
+
+{{-- Page title --}}
+@section('title')
+@lang('admin/groups/table.view') -
+{{{ $group->name }}} ::
+@parent
+@stop
+
+{{-- Page content --}}
+@section('content')
+
+<div class="row header">
+    <div class="col-md-12">
+        <a href="{{ route('view/supplier', $group->id) }}" class="btn-flat white pull-right">
+        @lang('admin/groups/table.update')</a>
+        <a href="{{ URL::to('admin/groups') }}" class="btn-flat gray pull-right" style="margin-right:5px;"><i class="fa fa-arrow-left icon-white"></i> @lang('general.back')</a>
+        <h3 class="name"> @lang('admin/groups/titles.group_management') - {{{ $group->name }}}</h3>
+    </div>
+</div>
+
+<div class="user-profile">
+    <div class="row profile">
+        <div class="col-md-12 bio">
+            @if (count($users) > 0)
+           <table id="example">
+            <thead>
+                <tr role="row">
+                        <th class="col-md-3">@lang('admin/groups/table.name')</th>
+                    </tr>
+                </thead>
+                <tbody>
+
+                    @foreach ($users as $user)
+                    <tr>
+                        <td><a href="{{ route('view/user', $user->id) }}">{{{ $user->first_name }}} {{{ $user->last_name }}}</a></td>
+                    </tr>
+                    @endforeach
+
+
+                </tbody>
+            </table>
+
+            @else
+            <div class="col-md-12">
+                <div class="alert alert-info alert-block">
+                    <i class="fa fa-info-circle"></i>
+                    @lang('general.no_results')
+                </div>
+            </div>
+            @endif
+        </div>
+@stop

From efba1b90386b6481b9679a2ec8ddc85d1bd6d7d3 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Tue, 7 Apr 2015 13:31:56 +0930
Subject: [PATCH 08/22] Fix update button to goto right group

---
 app/views/backend/groups/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/backend/groups/view.blade.php b/app/views/backend/groups/view.blade.php
index aa365b5fa3..3ead21088b 100644
--- a/app/views/backend/groups/view.blade.php
+++ b/app/views/backend/groups/view.blade.php
@@ -12,7 +12,7 @@
 
 <div class="row header">
     <div class="col-md-12">
-        <a href="{{ route('view/supplier', $group->id) }}" class="btn-flat white pull-right">
+        <a href="{{ route('update/group', $group->id) }}" class="btn-flat white pull-right">
         @lang('admin/groups/table.update')</a>
         <a href="{{ URL::to('admin/groups') }}" class="btn-flat gray pull-right" style="margin-right:5px;"><i class="fa fa-arrow-left icon-white"></i> @lang('general.back')</a>
         <h3 class="name"> @lang('admin/groups/titles.group_management') - {{{ $group->name }}}</h3>

From 9bbf933b0504d0da051cbea3166827b62df170a0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 8 Apr 2015 16:25:34 -0700
Subject: [PATCH 09/22] Added missing search string

---
 app/config/version.php  |   4 +-
 app/lang/en/general.php |   1 +
 composer.lock           | 225 ++++++++++++++++++++++++----------------
 3 files changed, 139 insertions(+), 91 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 5cef0e27f8..121c607fd0 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-186',
-  'hash_version' => 'v1.2.6.1-186-gc88ce0d',
+  'app_version' => 'v1.2.6.1-187',
+  'hash_version' => 'v1.2.6.1-187-ge88a811',
 );
\ No newline at end of file
diff --git a/app/lang/en/general.php b/app/lang/en/general.php
index fe30d64df0..32e483f061 100755
--- a/app/lang/en/general.php
+++ b/app/lang/en/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/composer.lock b/composer.lock
index a1e2db6fd5..cbcb28e323 100644
--- a/composer.lock
+++ b/composer.lock
@@ -569,12 +569,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common.git",
-                "reference": "23cdbfae8d673d79bb06790a126c96f8b648a052"
+                "reference": "ad89591bebea6490fd589f872d0a9ef63e9674a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/23cdbfae8d673d79bb06790a126c96f8b648a052",
-                "reference": "23cdbfae8d673d79bb06790a126c96f8b648a052",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/ad89591bebea6490fd589f872d0a9ef63e9674a9",
+                "reference": "ad89591bebea6490fd589f872d0a9ef63e9674a9",
                 "shasum": ""
             },
             "require": {
@@ -591,7 +591,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5.x-dev"
+                    "dev-master": "2.6.x-dev"
                 }
             },
             "autoload": {
@@ -634,7 +634,7 @@
                 "persistence",
                 "spl"
             ],
-            "time": "2015-03-15 09:03:43"
+            "time": "2015-04-02 20:23:27"
         },
         {
             "name": "doctrine/dbal",
@@ -1187,12 +1187,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "601ccfd6622090f27f7c1f9eeaa5b271fbf7421c"
+                "reference": "90a92cc55eeff660599840665890eda28a689920"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/601ccfd6622090f27f7c1f9eeaa5b271fbf7421c",
-                "reference": "601ccfd6622090f27f7c1f9eeaa5b271fbf7421c",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/90a92cc55eeff660599840665890eda28a689920",
+                "reference": "90a92cc55eeff660599840665890eda28a689920",
                 "shasum": ""
             },
             "require": {
@@ -1235,7 +1235,7 @@
                 "read",
                 "write"
             ],
-            "time": "2015-03-10 09:55:09"
+            "time": "2015-03-23 11:54:26"
         },
         {
             "name": "maximebf/debugbar",
@@ -1299,12 +1299,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac"
+                "reference": "875cfb91e1ffb9a7fda4dddfdbc7ed529e52164a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c31a2c4e8db5da8b46c74cf275d7f109c0f249ac",
-                "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/875cfb91e1ffb9a7fda4dddfdbc7ed529e52164a",
+                "reference": "875cfb91e1ffb9a7fda4dddfdbc7ed529e52164a",
                 "shasum": ""
             },
             "require": {
@@ -1364,7 +1364,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2015-03-09 09:58:04"
+            "time": "2015-03-31 21:43:29"
         },
         {
             "name": "nesbot/carbon",
@@ -1418,12 +1418,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "592836c4dc9ca96e8843ed96fd1cac82a74c4df1"
+                "reference": "805078e0a96a5309f05899f4a76923be6f94af60"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/592836c4dc9ca96e8843ed96fd1cac82a74c4df1",
-                "reference": "592836c4dc9ca96e8843ed96fd1cac82a74c4df1",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/805078e0a96a5309f05899f4a76923be6f94af60",
+                "reference": "805078e0a96a5309f05899f4a76923be6f94af60",
                 "shasum": ""
             },
             "require": {
@@ -1433,7 +1433,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -1455,7 +1455,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2015-03-14 18:53:08"
+            "time": "2015-03-28 17:14:24"
         },
         {
             "name": "patchwork/utf8",
@@ -1662,12 +1662,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "1af1529b49a6e065ae6802e70192aba35d79b7d8"
+                "reference": "bf2c13de4300e227d7b2fd08027673a79c519987"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/1af1529b49a6e065ae6802e70192aba35d79b7d8",
-                "reference": "1af1529b49a6e065ae6802e70192aba35d79b7d8",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/bf2c13de4300e227d7b2fd08027673a79c519987",
+                "reference": "bf2c13de4300e227d7b2fd08027673a79c519987",
                 "shasum": ""
             },
             "type": "library",
@@ -1677,8 +1677,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Psr\\Log\\": ""
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1697,7 +1697,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2015-02-05 09:32:11"
+            "time": "2015-03-26 14:39:45"
         },
         {
             "name": "stack/builder",
@@ -1750,16 +1750,16 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "dev-master",
+            "version": "5.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "048be6f7c19944d604e321347990543bc2bbe10b"
+                "reference": "728eba28e355e081b0729b4c18cb9c13abe12560"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/048be6f7c19944d604e321347990543bc2bbe10b",
-                "reference": "048be6f7c19944d604e321347990543bc2bbe10b",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/728eba28e355e081b0729b4c18cb9c13abe12560",
+                "reference": "728eba28e355e081b0729b4c18cb9c13abe12560",
                 "shasum": ""
             },
             "require": {
@@ -1798,7 +1798,7 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2015-03-14 06:07:26"
+            "time": "2015-03-30 15:09:02"
         },
         {
             "name": "symfony/browser-kit",
@@ -1862,12 +1862,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Config.git",
-                "reference": "d52e949c0625601918f52139a6358d0d614152bd"
+                "reference": "5e25e7668562f238c621ddc2a2852f8918ae34a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/d52e949c0625601918f52139a6358d0d614152bd",
-                "reference": "d52e949c0625601918f52139a6358d0d614152bd",
+                "url": "https://api.github.com/repos/symfony/Config/zipball/5e25e7668562f238c621ddc2a2852f8918ae34a4",
+                "reference": "5e25e7668562f238c621ddc2a2852f8918ae34a4",
                 "shasum": ""
             },
             "require": {
@@ -1904,7 +1904,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "http://symfony.com",
-            "time": "2015-03-12 14:31:07"
+            "time": "2015-03-30 15:55:07"
         },
         {
             "name": "symfony/console",
@@ -2190,12 +2190,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "cd84fd71bce5e9e136cab7e1fbc07af877e3a932"
+                "reference": "0d0790beeb3bdb997a6cb2d6f4e53f607337efe5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/cd84fd71bce5e9e136cab7e1fbc07af877e3a932",
-                "reference": "cd84fd71bce5e9e136cab7e1fbc07af877e3a932",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/0d0790beeb3bdb997a6cb2d6f4e53f607337efe5",
+                "reference": "0d0790beeb3bdb997a6cb2d6f4e53f607337efe5",
                 "shasum": ""
             },
             "require": {
@@ -2231,7 +2231,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "http://symfony.com",
-            "time": "2015-03-12 14:31:07"
+            "time": "2015-03-22 16:57:18"
         },
         {
             "name": "symfony/finder",
@@ -2287,12 +2287,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "79b2385ee420944ab89c6972acae9c7c8cb9a412"
+                "reference": "08e783861dd9579bac4092814bbfb0cae6666b65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/79b2385ee420944ab89c6972acae9c7c8cb9a412",
-                "reference": "79b2385ee420944ab89c6972acae9c7c8cb9a412",
+                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/08e783861dd9579bac4092814bbfb0cae6666b65",
+                "reference": "08e783861dd9579bac4092814bbfb0cae6666b65",
                 "shasum": ""
             },
             "require": {
@@ -2331,7 +2331,7 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "http://symfony.com",
-            "time": "2015-02-08 07:07:45"
+            "time": "2015-04-01 15:49:36"
         },
         {
             "name": "symfony/http-kernel",
@@ -2340,12 +2340,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "b481edb3c476dcd2040443f38292c1fadd2fac88"
+                "reference": "7b1632cf2bdbc69c59a44942b70d5aae91034304"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/b481edb3c476dcd2040443f38292c1fadd2fac88",
-                "reference": "b481edb3c476dcd2040443f38292c1fadd2fac88",
+                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/7b1632cf2bdbc69c59a44942b70d5aae91034304",
+                "reference": "7b1632cf2bdbc69c59a44942b70d5aae91034304",
                 "shasum": ""
             },
             "require": {
@@ -2405,7 +2405,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "http://symfony.com",
-            "time": "2015-02-08 07:08:16"
+            "time": "2015-04-01 16:01:45"
         },
         {
             "name": "symfony/process",
@@ -2592,12 +2592,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Stopwatch.git",
-                "reference": "6669f15131da84d97851b8398a09d04cd604d223"
+                "reference": "39dc0826d2e0e068e8b2e2218c740110b7216006"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/6669f15131da84d97851b8398a09d04cd604d223",
-                "reference": "6669f15131da84d97851b8398a09d04cd604d223",
+                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/39dc0826d2e0e068e8b2e2218c740110b7216006",
+                "reference": "39dc0826d2e0e068e8b2e2218c740110b7216006",
                 "shasum": ""
             },
             "require": {
@@ -2633,7 +2633,7 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "http://symfony.com",
-            "time": "2015-02-18 10:38:04"
+            "time": "2015-03-22 16:57:18"
         },
         {
             "name": "symfony/translation",
@@ -2698,12 +2698,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "8755b251ba8cadfe9a68a44c4c659728739fecc8"
+                "reference": "76b0aa46eb697eec831c4ba13dbdcca92fca86a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8755b251ba8cadfe9a68a44c4c659728739fecc8",
-                "reference": "8755b251ba8cadfe9a68a44c4c659728739fecc8",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/76b0aa46eb697eec831c4ba13dbdcca92fca86a9",
+                "reference": "76b0aa46eb697eec831c4ba13dbdcca92fca86a9",
                 "shasum": ""
             },
             "require": {
@@ -2749,7 +2749,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2015-03-07 07:43:00"
+            "time": "2015-04-01 13:08:53"
         },
         {
             "name": "symfony/yaml",
@@ -2758,12 +2758,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "6411b65c8bb376e35eae6a2ec023b3e8da3ea44c"
+                "reference": "3882af2f22672e347030b561cc6c5abc2b335566"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/6411b65c8bb376e35eae6a2ec023b3e8da3ea44c",
-                "reference": "6411b65c8bb376e35eae6a2ec023b3e8da3ea44c",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/3882af2f22672e347030b561cc6c5abc2b335566",
+                "reference": "3882af2f22672e347030b561cc6c5abc2b335566",
                 "shasum": ""
             },
             "require": {
@@ -2799,7 +2799,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "http://symfony.com",
-            "time": "2015-03-13 17:50:01"
+            "time": "2015-03-30 15:55:07"
         }
     ],
     "packages-dev": [
@@ -2857,26 +2857,71 @@
             ],
             "time": "2015-01-16 19:29:51"
         },
+        {
+            "name": "hamcrest/hamcrest-php",
+            "version": "v1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hamcrest/hamcrest-php.git",
+                "reference": "ac50c470531243944f977b8de75be0b684a9cb51"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/ac50c470531243944f977b8de75be0b684a9cb51",
+                "reference": "ac50c470531243944f977b8de75be0b684a9cb51",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "replace": {
+                "cordoval/hamcrest-php": "*",
+                "davedevelopment/hamcrest-php": "*",
+                "kodova/hamcrest-php": "*"
+            },
+            "require-dev": {
+                "phpunit/php-file-iterator": "1.3.3",
+                "satooshi/php-coveralls": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "hamcrest"
+                ],
+                "files": [
+                    "hamcrest/Hamcrest.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "description": "This is the PHP port of Hamcrest Matchers",
+            "keywords": [
+                "test"
+            ],
+            "time": "2015-01-20 19:34:09"
+        },
         {
             "name": "mockery/mockery",
             "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/padraic/mockery.git",
-                "reference": "43006b6c41e8fa9ac7469ceea2efd8abbcb20657"
+                "reference": "dbe3cfe736bb1d3e319c4cd0c310c140737028a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/padraic/mockery/zipball/43006b6c41e8fa9ac7469ceea2efd8abbcb20657",
-                "reference": "43006b6c41e8fa9ac7469ceea2efd8abbcb20657",
+                "url": "https://api.github.com/repos/padraic/mockery/zipball/dbe3cfe736bb1d3e319c4cd0c310c140737028a0",
+                "reference": "dbe3cfe736bb1d3e319c4cd0c310c140737028a0",
                 "shasum": ""
             },
             "require": {
+                "hamcrest/hamcrest-php": "~1.1",
                 "lib-pcre": ">=7.0",
-                "php": ">=5.3.2"
+                "php": ">=5.4.0"
             },
             "require-dev": {
-                "hamcrest/hamcrest-php": "~1.1",
                 "phpunit/phpunit": "~4.0"
             },
             "type": "library",
@@ -2920,7 +2965,7 @@
                 "test double",
                 "testing"
             ],
-            "time": "2015-03-19 19:27:19"
+            "time": "2015-04-02 20:16:47"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -2978,12 +3023,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "26530c5a425c6f67c9fe4fa10a3773adc96c418d"
+                "reference": "8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/26530c5a425c6f67c9fe4fa10a3773adc96c418d",
-                "reference": "26530c5a425c6f67c9fe4fa10a3773adc96c418d",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5",
+                "reference": "8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5",
                 "shasum": ""
             },
             "require": {
@@ -2997,7 +3042,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "1.4.x-dev"
                 }
             },
             "autoload": {
@@ -3030,7 +3075,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2015-03-13 14:15:05"
+            "time": "2015-03-27 19:31:25"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -3096,31 +3141,33 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.3.4",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+                "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb",
+                "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
-                    "File/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -3137,7 +3184,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2013-10-10 15:34:57"
+            "time": "2015-04-02 05:19:05"
         },
         {
             "name": "phpunit/php-text-template",
@@ -3282,12 +3329,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "ab0bd2250002bcaeed9407a362eeeaf2a78fe060"
+                "reference": "e0c95bbc21112932abed7372ee98da01c219a6ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ab0bd2250002bcaeed9407a362eeeaf2a78fe060",
-                "reference": "ab0bd2250002bcaeed9407a362eeeaf2a78fe060",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e0c95bbc21112932abed7372ee98da01c219a6ed",
+                "reference": "e0c95bbc21112932abed7372ee98da01c219a6ed",
                 "shasum": ""
             },
             "require": {
@@ -3297,9 +3344,9 @@
                 "ext-reflection": "*",
                 "ext-spl": "*",
                 "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3.1",
+                "phpspec/prophecy": "~1.3,>=1.3.1",
                 "phpunit/php-code-coverage": "~2.0,>=2.0.11",
-                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
                 "phpunit/php-timer": "~1.0",
                 "phpunit/phpunit-mock-objects": "~2.3",
@@ -3349,7 +3396,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-03-18 05:42:02"
+            "time": "2015-04-02 05:38:19"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -3357,12 +3404,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "55484334fb4c306ed24bfc3bdb0874685c29036f"
+                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/55484334fb4c306ed24bfc3bdb0874685c29036f",
-                "reference": "55484334fb4c306ed24bfc3bdb0874685c29036f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/74ffb87f527f24616f72460e54b595f508dccb5c",
+                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c",
                 "shasum": ""
             },
             "require": {
@@ -3371,7 +3418,7 @@
                 "phpunit/php-text-template": "~1.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.4.*@dev"
+                "phpunit/phpunit": "~4.4"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -3379,7 +3426,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4.x-dev"
+                    "dev-master": "2.3.x-dev"
                 }
             },
             "autoload": {
@@ -3404,7 +3451,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2015-03-18 09:04:51"
+            "time": "2015-04-02 05:36:41"
         },
         {
             "name": "sebastian/comparator",

From 551b5c42d81cfb5a66c27a511c3529ddc62d8ab6 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <uberbrady@gmail.com>
Date: Wed, 8 Apr 2015 16:36:06 -0700
Subject: [PATCH 10/22] "Years" turn out to be 12 times longer than months,
 apparently

---
 app/models/Depreciable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/Depreciable.php b/app/models/Depreciable.php
index 52386e853b..ad1a880f40 100644
--- a/app/models/Depreciable.php
+++ b/app/models/Depreciable.php
@@ -48,7 +48,7 @@ class Depreciable extends Elegant
         }
 
         // fraction of value left
-        $months_remaining = $this->time_until_depreciated()->m + $this->time_until_depreciated()->y; //UGlY
+        $months_remaining = $this->time_until_depreciated()->m + 12*$this->time_until_depreciated()->y; //UGlY
         $current_value = round(($months_remaining/ $this->get_depreciation()->months) * $this->purchase_cost, 2);
 
         if ($current_value < 0) {

From 1a4f148318ca325bad1e042aeb7514933faeff7a Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Fri, 10 Apr 2015 09:14:59 +0930
Subject: [PATCH 11/22] Fix #737 -Only display comma & address2 if not Null

---
 app/views/backend/locations/index.blade.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
index 63be00ca19..623802e435 100755
--- a/app/views/backend/locations/index.blade.php
+++ b/app/views/backend/locations/index.blade.php
@@ -33,7 +33,11 @@ Locations ::
         @foreach ($locations as $location)
         <tr>
             <td>{{{ $location->name }}}</td>
-            <td>{{{ $location->address }}}, {{{ $location->address2 }}}  </td>
+            <td>{{{ $location->address }}}
+            	@if($location->address2 != '')
+            		, {{{ $location->address2 }}}
+            	@endif
+            </td>
             <td>{{{ $location->city }}}, {{{ strtoupper($location->state) }}}  {{{ strtoupper($location->country) }}}  </td>
             <td>
                 <a href="{{ route('update/location', $location->id) }}" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a>

From 63b1f3834e5cd1e7e44c27da33ca1e9fc8ca26d0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 13 Apr 2015 11:26:02 -0700
Subject: [PATCH 12/22] New language strings

---
 app/lang/ar/general.php                       |  1 +
 app/lang/cs/general.php                       |  1 +
 app/lang/da/general.php                       |  1 +
 app/lang/de/general.php                       | 37 ++++-----
 app/lang/en-GB/general.php                    |  1 +
 app/lang/en/admin/groups/table.php            |  2 -
 app/lang/es-ES/admin/hardware/form.php        |  4 +-
 app/lang/es-ES/admin/settings/general.php     |  4 +-
 app/lang/es-ES/admin/users/message.php        |  2 +-
 app/lang/es-ES/admin/users/table.php          |  6 +-
 app/lang/es-ES/general.php                    | 39 +++++-----
 app/lang/fi/general.php                       |  1 +
 app/lang/fr/general.php                       |  1 +
 app/lang/hu/general.php                       |  1 +
 app/lang/it/general.php                       | 37 ++++-----
 app/lang/it/validation.php                    | 44 +++++------
 app/lang/ja/general.php                       |  1 +
 app/lang/ms/admin/categories/general.php      |  6 +-
 app/lang/ms/admin/categories/table.php        |  2 +-
 app/lang/ms/general.php                       |  1 +
 app/lang/nl/general.php                       |  1 +
 app/lang/no/admin/hardware/form.php           |  4 +-
 app/lang/no/admin/settings/general.php        |  4 +-
 app/lang/no/admin/users/message.php           |  2 +-
 app/lang/no/admin/users/table.php             |  6 +-
 app/lang/no/general.php                       | 39 +++++-----
 app/lang/pl/general.php                       |  1 +
 app/lang/pt-BR/admin/accessories/general.php  |  6 +-
 app/lang/pt-BR/admin/accessories/message.php  |  6 +-
 app/lang/pt-BR/admin/accessories/table.php    |  2 +-
 app/lang/pt-BR/admin/categories/general.php   | 10 +--
 app/lang/pt-BR/admin/categories/message.php   | 12 +--
 app/lang/pt-BR/admin/categories/table.php     |  2 +-
 .../pt-BR/admin/depreciations/general.php     |  6 +-
 .../pt-BR/admin/depreciations/message.php     | 12 +--
 app/lang/pt-BR/admin/groups/message.php       | 10 +--
 app/lang/pt-BR/admin/hardware/form.php        | 20 ++---
 app/lang/pt-BR/admin/hardware/general.php     | 14 ++--
 app/lang/pt-BR/admin/hardware/message.php     | 30 ++++----
 app/lang/pt-BR/admin/hardware/table.php       |  4 +-
 app/lang/pt-BR/admin/licenses/form.php        |  2 +-
 app/lang/pt-BR/admin/licenses/message.php     | 16 ++--
 app/lang/pt-BR/admin/locations/message.php    | 12 +--
 .../pt-BR/admin/manufacturers/message.php     | 10 +--
 app/lang/pt-BR/admin/manufacturers/table.php  |  2 +-
 app/lang/pt-BR/admin/models/general.php       |  6 +-
 app/lang/pt-BR/admin/models/message.php       | 10 +--
 app/lang/pt-BR/admin/models/table.php         | 14 ++--
 app/lang/pt-BR/admin/reports/general.php      |  2 +-
 app/lang/pt-BR/admin/settings/general.php     | 14 ++--
 app/lang/pt-BR/admin/settings/message.php     |  2 +-
 app/lang/pt-BR/admin/statuslabels/message.php | 12 +--
 app/lang/pt-BR/admin/statuslabels/table.php   |  2 +-
 app/lang/pt-BR/admin/suppliers/message.php    | 12 +--
 app/lang/pt-BR/admin/users/message.php        | 18 ++---
 app/lang/pt-BR/admin/users/table.php          | 12 +--
 app/lang/pt-BR/auth/message.php               | 10 +--
 app/lang/pt-BR/button.php                     |  2 +-
 app/lang/pt-BR/general.php                    | 75 ++++++++++---------
 app/lang/pt-PT/general.php                    |  1 +
 app/lang/ro/general.php                       |  1 +
 app/lang/ru/general.php                       | 37 ++++-----
 app/lang/sv-SE/general.php                    |  1 +
 app/lang/th/admin/users/general.php           | 18 ++---
 app/lang/th/auth/message.php                  | 30 ++++----
 app/lang/th/general.php                       | 45 +++++------
 app/lang/vi/general.php                       |  1 +
 app/lang/zh-CN/general.php                    |  1 +
 68 files changed, 386 insertions(+), 365 deletions(-)

diff --git a/app/lang/ar/general.php b/app/lang/ar/general.php
index f65bc3bec4..603ba29190 100755
--- a/app/lang/ar/general.php
+++ b/app/lang/ar/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'التقارير',
     'save'  				=> 'حفظ',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/cs/general.php b/app/lang/cs/general.php
index 9c6547b991..3901a6e460 100755
--- a/app/lang/cs/general.php
+++ b/app/lang/cs/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Reporty',
     'save'  				=> 'Uložit',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/da/general.php b/app/lang/da/general.php
index abbc986f19..2b2c7727f1 100755
--- a/app/lang/da/general.php
+++ b/app/lang/da/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Rapporter',
     'save'  				=> 'Gem',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/de/general.php b/app/lang/de/general.php
index 26baf43053..7e8c7d94b3 100755
--- a/app/lang/de/general.php
+++ b/app/lang/de/general.php
@@ -25,7 +25,7 @@ return array(
     'changeemail'  			=> 'E-Mail Adresse ändern',
     'changepassword'  		=> 'Passwort ändern',
     'checkin'  				=> 'Checkin Asset',
-    'checkin_from'  		=> 'Checkin from',
+    'checkin_from'  		=> 'Einchecken von',
     'checkout'  			=> 'Checkout Asset to User',
     'city'  				=> 'Stadt',
     'country'  				=> 'Land',
@@ -45,7 +45,7 @@ return array(
     'depreciation'			=> 'Abschreibung',
     'editprofile'  			=> 'Profil bearbeiten',
     'eol'					=> 'EOL',
-    'first'					=> 'First',
+    'first'					=> 'Erstes',
     'first_name'			=> 'Vorname',
     'file_name'				=> 'Datei',
     'file_uploads'			=> 'Datei-Uploads',
@@ -56,7 +56,7 @@ return array(
     'id'  					=> 'Id',
     'image_delete'         	=> 'Bild löschen',
     'image_upload'         	=> 'Bild hinzufügen',
-    'last'					=> 'Last',
+    'last'					=> 'Letztes',
     'last_name'				=> 'Familienname',
     'license'				=> 'Lizenz',
     'license_report'        => 'Lizenz Report',
@@ -72,31 +72,32 @@ return array(
     'months'				=> 'Monate',
     'moreinfo'				=> 'Mehr Informationen',
     'name'					=> 'Location Name',
-    'next'					=> 'Next',
+    'next'					=> 'Nächstes',
     'no_depreciation'		=> 'Do Not Depreciate',
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Notizen',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'page_menu'				=> 'zeige _MENU_ Einträge',
+    'pagination_info'		=> 'Zeige _START_ bis _END_ von _TOTAL_ Einträgen',
     'pending'				=> 'Pending Asset',
     'people'				=> 'Personen',
     'per_page'				=> 'Ergebnisse pro Seite',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
+    'previous'				=> 'Vorherige',
+    'processing'			=> 'In Arbeit',
     'profile'				=> 'Ihr Profil',
     'ready_to_deploy'		=> 'Fertig zum herausgeben',
-    'recent_activity'		=> 'Recent Activity',
+    'recent_activity'		=> 'Letzte Aktivität',
     'reports'				=> 'Berichte',
     'save'  				=> 'Speichern',
-    'select'				=> 'Select',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date',
+    'select'				=> 'auswählen',
+    'search'				=> 'Suche',
+    'select_depreciation'	=> 'Wähle einen Abschreibungstyp',
+    'select_location'		=> 'Wählen Sie einen Standort',
+    'select_manufacturer'	=> 'Wählen Sie einen Hersteller',
+    'select_model'			=> 'Wählen Sie ein Model',
+    'select_supplier'		=> 'wählen Sie einen Lieferant',
+    'select_user'			=> 'wähle einen Benutzer',
+    'select_date'			=> 'Datum auswählen',
     'settings'				=> 'Einstellungen',
     'sign_in'				=> 'Einloggen',
     'site_name'				=> 'Seitenname',
@@ -109,7 +110,7 @@ return array(
     'type'  				=> 'Typ',
     'undeployable'			=> 'Nicht herausgebbar',
     'unknown_admin'			=> 'Unbekannter Administrator',
-    'uploaded'              => 'Uploaded',
+    'uploaded'              => 'Hochgeladen',
     'user'					=> 'Nutzer',
     'users'                 => 'Benutzer',
     'viewassets'  			=> 'Zugeordnete Assets anzeigen',
diff --git a/app/lang/en-GB/general.php b/app/lang/en-GB/general.php
index d9f6eb07cb..81bdd3a946 100755
--- a/app/lang/en-GB/general.php
+++ b/app/lang/en-GB/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/en/admin/groups/table.php b/app/lang/en/admin/groups/table.php
index 80917448ab..61f060a116 100755
--- a/app/lang/en/admin/groups/table.php
+++ b/app/lang/en/admin/groups/table.php
@@ -5,7 +5,5 @@ return array(
     'id'         => 'Id',
     'name'       => 'Name',
     'users'      => '# of Users',
-    'update'	 => 'Update Group',
-    'view'		 => 'View Group',
 
 );
diff --git a/app/lang/es-ES/admin/hardware/form.php b/app/lang/es-ES/admin/hardware/form.php
index 133fa0efb8..64103059f1 100755
--- a/app/lang/es-ES/admin/hardware/form.php
+++ b/app/lang/es-ES/admin/hardware/form.php
@@ -6,8 +6,8 @@ return array(
 	'bulk_update_help'	=> 'Este formulario le permite actualizar múltiples Equipos simultáneamente. Solo complete los campos que quiere modificar. Todo campo en blanco permanecerá sin cambios. ',
 	'bulk_update_warn'	=> 'Esta a punto de editar las propiedades de :asset_count equipos.',
     'checkedout_to'		=> 'Asignado a',
-    'checkout_date'		=> 'Checkout Date',
-    'checkin_date'		=> 'Checkin Date',
+    'checkout_date'		=> 'Fecha de asignación',
+    'checkin_date'		=> 'Fecha de devolución',
     'checkout_to'		=> 'Asignar a',
     'cost'				=> 'Precio Compra',
     'create'			=> 'Crear Equipo',
diff --git a/app/lang/es-ES/admin/settings/general.php b/app/lang/es-ES/admin/settings/general.php
index 76411670b8..daf6182ad1 100755
--- a/app/lang/es-ES/admin/settings/general.php
+++ b/app/lang/es-ES/admin/settings/general.php
@@ -6,7 +6,7 @@ return array(
 	'auto_increment_assets'		=> 'Generar IDs de equipo autoincrementales',
 	'auto_increment_prefix'		=> 'Prefijo (opcional)',
 	'auto_incrementing_help'    => 'Activa la generación automática de IDs de equipo antes de configurar esto',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> 'Tipo de código de barras',
 	'default_eula_text'			=> 'EULA por defecto',
 	'default_eula_help_text'	=> 'También puede asociar EULAs personalizadas para categorías especificas de equipos.',
     'display_asset_name'        => 'Mostrar Nombre Equipo',
@@ -28,7 +28,7 @@ return array(
     'setting'                   => 'Parámetro',
     'settings'                  => 'Configuración',
     'site_name'                 => 'Nombre del sitio',
-     'snipe_version'  			=> 'Snipe-IT version',
+     'snipe_version'  			=> 'Version de Snipe-IT',
     'system'                    => 'Información del Sistema',
     'update'                    => 'Actualizar Parámetros',
     'value'                     => 'Valor',
diff --git a/app/lang/es-ES/admin/users/message.php b/app/lang/es-ES/admin/users/message.php
index 5d2052d086..ca0096c05a 100755
--- a/app/lang/es-ES/admin/users/message.php
+++ b/app/lang/es-ES/admin/users/message.php
@@ -28,7 +28,7 @@ return array(
         'delete' => 'Ha habido un problema eliminando el  Usuario. Intentalo de nuevo.',
         'unsuspend' => 'Ha habido un problema marcando como no suspendido el Usuario. Intentalo de nuevo.',
         'import'    => 'Ha habido un problema importando los usuarios. Por favor intente nuevamente.',
-        'asset_already_accepted' => 'This asset has already been accepted.',
+        'asset_already_accepted' => 'Este equipo ya ha sido aceptado.',
     ),
 
 );
diff --git a/app/lang/es-ES/admin/users/table.php b/app/lang/es-ES/admin/users/table.php
index 6cbf2f2e01..80748286cd 100755
--- a/app/lang/es-ES/admin/users/table.php
+++ b/app/lang/es-ES/admin/users/table.php
@@ -21,12 +21,12 @@ return array(
     'lock_passwords'		=> 'Los detalles de acceso no pueden ser cambiados en esta instalación.',
     'manager' 				=> 'Responsable',
     'name' 					=> 'Usuario',
-    'notes'                 => 'Notes',
+    'notes'                 => 'Notas',
     'password_confirm' 		=> 'Confirmar Password',
     'password' 				=> 'Contraseña',
     'phone'  				=> 'Teléfono',
-    'show_current'          => 'Show Current Users',
-    'show_deleted'          => 'Show Deleted Users',
+    'show_current'          => 'Mostrar usuarios actuales',
+    'show_deleted'          => 'Mostrar usuarios eliminados',
     'title' 				=> 'Puesto',
     'updateuser' 			=> 'Actualizar Usuario',
     'username' 				=> 'UsuarioUsuario',
diff --git a/app/lang/es-ES/general.php b/app/lang/es-ES/general.php
index 9aaaebe894..53bb034d68 100755
--- a/app/lang/es-ES/general.php
+++ b/app/lang/es-ES/general.php
@@ -25,7 +25,7 @@ return array(
     'changeemail'  			=> 'Cambiar Email',
     'changepassword'  		=> 'Cambiar Password',
     'checkin'  				=> 'Quitar Equipo',
-    'checkin_from'  		=> 'Checkin from',
+    'checkin_from'  		=> 'Devolución de',
     'checkout'  			=> 'Asignar a un usuario',
     'city'  				=> 'Ciudad',
     'country'  				=> 'Pais',
@@ -45,7 +45,7 @@ return array(
     'depreciation'			=> 'Amortización',
     'editprofile'  			=> 'Editar Perfil',
     'eol'					=> 'EOL',
-    'first'					=> 'First',
+    'first'					=> 'Primero',
     'first_name'			=> 'Nombre',
     'file_name'				=> 'Archivo',
     'file_uploads'			=> 'Carga de Archivos',
@@ -56,7 +56,7 @@ return array(
     'id'  					=> 'Id',
     'image_delete'         	=> 'Borrar imagen',
     'image_upload'         	=> 'Enviar imagen',
-    'last'					=> 'Last',
+    'last'					=> 'Último',
     'last_name'				=> 'Apellidos',
     'license'				=> 'Licencia',
     'license_report'        => 'Reporte de Licencias',
@@ -72,31 +72,32 @@ return array(
     'months'				=> 'Meses',
     'moreinfo'				=> 'Más Info',
     'name'					=> 'Nombre Localización',
-    'next'					=> 'Next',
+    'next'					=> 'Siguiente',
     'no_depreciation'		=> 'No Amortizar',
     'no_results'			=> 'Sin Resultados.',
     'no'  					=> 'No',
     'notes'  				=> 'Notas',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'page_menu'				=> 'Mostrando elementos de _MENU_',
+    'pagination_info'		=> 'Mostrando _START_ de _END_ de elementos _TOTAL_',
     'pending'				=> 'Equipo Pendiente',
     'people'				=> 'Usuarios',
     'per_page'				=> 'Resultados Por Pag',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
+    'previous'				=> 'Previo',
+    'processing'			=> 'Procesando',
     'profile'				=> 'Perfil',
     'ready_to_deploy'		=> 'Disponibles',
-    'recent_activity'		=> 'Recent Activity',
+    'recent_activity'		=> 'Actividad Reciente',
     'reports'				=> 'Informes',
     'save'  				=> 'Guardar',
-    'select'				=> 'Select',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date',
+    'select'				=> 'Seleccionar',
+    'search'				=> 'Buscar',
+    'select_depreciation'	=> 'Seleccionar un tipo de Amortización',
+    'select_location'		=> 'Seleccionar una Ubicación',
+    'select_manufacturer'	=> 'Seleccionar un Fabricante',
+    'select_model'			=> 'Seleccionar un Modelo',
+    'select_supplier'		=> 'Seleccionar un Proveedor',
+    'select_user'			=> 'Seleccionar un usuario',
+    'select_date'			=> 'Seleccionar fecha',
     'settings'				=> 'Opciones',
     'sign_in'				=> 'Entrar',
     'site_name'				=> 'Sitio',
@@ -109,9 +110,9 @@ return array(
     'type'  				=> 'Tipo',
     'undeployable'			=> 'No Instalable',
     'unknown_admin'			=> 'Admin Desconocido',
-    'uploaded'              => 'Uploaded',
+    'uploaded'              => 'Subido',
     'user'					=> 'Usuario',
-    'users'                 => 'Users',
+    'users'                 => 'Usuarios',
     'viewassets'  			=> 'Ver Equipos Asignados',
     'website'               => 'Sitio web',
     'welcome'				=> 'Bienvenido, :name',
diff --git a/app/lang/fi/general.php b/app/lang/fi/general.php
index 97bf3968cb..4dd4e6a352 100755
--- a/app/lang/fi/general.php
+++ b/app/lang/fi/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Raportit',
     'save'  				=> 'Tallenna',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/fr/general.php b/app/lang/fr/general.php
index 794c983408..b06010a52a 100755
--- a/app/lang/fr/general.php
+++ b/app/lang/fr/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Rapports',
     'save'  				=> 'Sauvegarder',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/hu/general.php b/app/lang/hu/general.php
index 2ff328afe2..2aeabb2cb5 100755
--- a/app/lang/hu/general.php
+++ b/app/lang/hu/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Reports',
     'save'  				=> 'Mentés',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/it/general.php b/app/lang/it/general.php
index 762d9e3726..9b1a323c22 100755
--- a/app/lang/it/general.php
+++ b/app/lang/it/general.php
@@ -25,7 +25,7 @@ return array(
     'changeemail'  			=> 'Modifica indirizzo email',
     'changepassword'  		=> 'Modifica password',
     'checkin'  				=> 'Carica',
-    'checkin_from'  		=> 'Checkin from',
+    'checkin_from'  		=> 'Carica da',
     'checkout'  			=> 'Scarica',
     'city'  				=> 'Città',
     'country'  				=> 'Paese',
@@ -45,7 +45,7 @@ return array(
     'depreciation'			=> 'Obsoleti',
     'editprofile'  			=> 'Edita il tuo profilo',
     'eol'					=> 'EOL',
-    'first'					=> 'First',
+    'first'					=> 'Primo',
     'first_name'			=> 'Nome',
     'file_name'				=> 'File',
     'file_uploads'			=> 'Carica i file',
@@ -56,7 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Cancella l\'Immagine',
     'image_upload'         	=> 'Carica immagine',
-    'last'					=> 'Last',
+    'last'					=> 'Ultimo',
     'last_name'				=> 'Cognome',
     'license'				=> 'Licenza',
     'license_report'        => 'Report Licenze',
@@ -72,31 +72,32 @@ return array(
     'months'				=> 'mesi',
     'moreinfo'				=> 'Altre informazioni',
     'name'					=> 'Nome',
-    'next'					=> 'Next',
+    'next'					=> 'Successivo',
     'no_depreciation'		=> 'Non Obsololeto',
     'no_results'			=> 'Nessun risultato.',
     'no'  					=> 'No',
     'notes'  				=> 'Note',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'page_menu'				=> 'Visualizza _MENU_Items',
+    'pagination_info'		=> 'Visualizza _START_ to _END_ of _TOTAL_ articoli',
     'pending'				=> 'In attesa',
     'people'				=> 'Utenti',
     'per_page'				=> 'Risultati per Pagina',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
+    'previous'				=> 'Precedente',
+    'processing'			=> 'In elaborazione',
     'profile'				=> 'Il tuo profilo',
     'ready_to_deploy'		=> 'Pronto per il rilascio',
-    'recent_activity'		=> 'Recent Activity',
+    'recent_activity'		=> 'Attività Recenti',
     'reports'				=> 'Reports',
     'save'  				=> 'Salva',
-    'select'				=> 'Select',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date',
+    'select'				=> 'Seleziona',
+    'search'				=> 'Cerca',
+    'select_depreciation'	=> 'Selezionare un tipo di ammortamento',
+    'select_location'		=> 'Seleziona una posizione',
+    'select_manufacturer'	=> 'Selezionare un produttore',
+    'select_model'			=> 'Selezionare un modello',
+    'select_supplier'		=> 'Selezionare un fornitore',
+    'select_user'			=> 'Selezionare un utente',
+    'select_date'			=> 'Seleziona la data',
     'settings'				=> 'Impostazioni',
     'sign_in'				=> 'Accedi',
     'site_name'				=> 'Nome sito',
@@ -109,7 +110,7 @@ return array(
     'type'  				=> 'Tipo',
     'undeployable'			=> 'Non consegnabile',
     'unknown_admin'			=> 'Amministratore sconosciuto',
-    'uploaded'              => 'Uploaded',
+    'uploaded'              => 'Caricato',
     'user'					=> 'Utente',
     'users'                 => 'Utenti',
     'viewassets'  			=> 'Visualizza gli Assets assegnati',
diff --git a/app/lang/it/validation.php b/app/lang/it/validation.php
index 6f7200aaa1..c8e201513d 100755
--- a/app/lang/it/validation.php
+++ b/app/lang/it/validation.php
@@ -36,33 +36,33 @@ return array(
     "image"            => "il :attribute deve essere un immagine.",
     "in"               => "Il selezionato :attribute è invalido.",
     "integer"          => "L' :attribute deve essere un numero intero.",
-    "ip"               => "The :attribute must be a valid IP address.",
+    "ip"               => "L' :attribute deve essere un indirizzo IP valido.",
     "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" => "L' :attribute non può essere superiore di :max.",
+        "file"    => "L' :attribute non può essere maggiore di :max kilobytes.",
+        "string"  => "L' :attribute non può essere maggiore di :max caratteri.",
     ),
-    "mimes"            => "The :attribute must be a file of type: :values.",
+    "mimes"            => "L' :attribute deve essere un file di type: :values.",
     "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" => "L' :attribute deve essere almeno :min.",
+        "file"    => "L' :attribute deve essere almeno :min kilobytes.",
+        "string"  => "L' :attribute deve essere almeno :min caratteri.",
     ),
-    "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"           => "L' :attribute selezionato è invalido.",
+    "numeric"          => "L' :attribute deve essere un numero.",
+    "regex"            => "Il formato dell' :attribute è invalido.",
+    "required"         => "Il campo :attribute è obblogatorio.",
+    "required_if"      => "L' :attribute è richiesto quando :other è :value.",
+    "required_with"    => "Il campo :attribute è richiesto quando :values è presente.",
+    "required_without" => "Il campo :attribute è richiesto quando :values non è presente.",
+    "same"             => "L' :attribute e :other devono corrispondere.",
     "size"             => array(
-        "numeric" => "The :attribute must be :size.",
-        "file"    => "The :attribute must be :size kilobytes.",
-        "string"  => "The :attribute must be :size characters.",
+        "numeric" => "L' :attribute deve essere :size.",
+        "file"    => "L' :attribute deve essere :size kilobytes.",
+        "string"  => "L' :attribute deve essere :size characters.",
     ),
-    "unique"           => "The :attribute has already been taken.",
-    "url"              => "The :attribute format is invalid.",
+    "unique"           => "L' :attribute è già stato preso.",
+    "url"              => "Il formato dell' :attribute è invalido.",
 
 
     /*
@@ -77,7 +77,7 @@ return array(
     */
 
     'custom' => array(),
-    'alpha_space' => "The :attribute field may only contain letters, commas, spaces and dashes.",
+    'alpha_space' => "Il campo :attribute può contenere solo lettere, virgole, spazi e trattini.",
 
     /*
     |--------------------------------------------------------------------------
diff --git a/app/lang/ja/general.php b/app/lang/ja/general.php
index fe30d64df0..32e483f061 100755
--- a/app/lang/ja/general.php
+++ b/app/lang/ja/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/ms/admin/categories/general.php b/app/lang/ms/admin/categories/general.php
index 449e8bf661..d74810afeb 100755
--- a/app/lang/ms/admin/categories/general.php
+++ b/app/lang/ms/admin/categories/general.php
@@ -5,10 +5,10 @@ return array(
     'about_categories'  				=> 'Kategori aset membantu anda menyusun aset anda. Diantara contoh aset mungkin  &quot;Komputer desktop&quot;, &quot;Komputer riba&quot;, &quot;Telefon bimbit&quot;, &quot;Tablet&quot;, dan seterusnya, walaubagaimanapun anda boleh menggunakan kategori aset mengikut citarasa anda. ',
     'asset_categories' 					=> 'Kategori aset',
     'category_name'  					=> 'Nama Kategori',
-    'clone'                             => 'Clone Category',
+    'clone'                             => 'Klon Kategori',
     'create'  							=> 'Cipta Kategori',
-    'edit'                              => 'Edit Category',
-    'eula_text'							=> 'Category EULA',
+    'edit'                              => 'Kemaskini Kategori',
+    'eula_text'							=> 'Kategori EULA',
     'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
     'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
     'required_acceptance'				=> 'This user will be emailed with a link to confirm acceptance of this item.',
diff --git a/app/lang/ms/admin/categories/table.php b/app/lang/ms/admin/categories/table.php
index 2a1d7bd1a2..5844609d03 100755
--- a/app/lang/ms/admin/categories/table.php
+++ b/app/lang/ms/admin/categories/table.php
@@ -4,7 +4,7 @@ return array(
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
     'parent'   					=> 'Parent',
-    'require_acceptance'      	=> 'Acceptance',
+    'require_acceptance'      	=> 'Diterima',
     'title'      				=> 'Nama Kategori Harta',
 
 );
diff --git a/app/lang/ms/general.php b/app/lang/ms/general.php
index a320ff50bf..9aa9fbe973 100755
--- a/app/lang/ms/general.php
+++ b/app/lang/ms/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Laporan',
     'save'  				=> 'Simpan',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/nl/general.php b/app/lang/nl/general.php
index a7850633c6..19747671af 100755
--- a/app/lang/nl/general.php
+++ b/app/lang/nl/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Rapporten',
     'save'  				=> 'Opslaan',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/no/admin/hardware/form.php b/app/lang/no/admin/hardware/form.php
index b4780920b4..3ac998570d 100755
--- a/app/lang/no/admin/hardware/form.php
+++ b/app/lang/no/admin/hardware/form.php
@@ -6,8 +6,8 @@ return array(
 	'bulk_update_help'	=> 'Dette skjemaet lar deg oppdatere flere eiendeler på en gang. Fyll kun ut feltene du ønsker å endre. Tomme felter forblir uendret. ',
 	'bulk_update_warn'	=> 'Du er på vei til å endre egenskapene til :asset_count eiendeler.',
     'checkedout_to'		=> 'Utsjekket til',
-    'checkout_date'		=> 'Checkout Date',
-    'checkin_date'		=> 'Checkin Date',
+    'checkout_date'		=> 'Utsjekkdato',
+    'checkin_date'		=> 'Innsjekkdato',
     'checkout_to'		=> 'Sjekk ut til',
     'cost'				=> 'Innkjøpskostnad',
     'create'			=> 'Opprett eiendel',
diff --git a/app/lang/no/admin/settings/general.php b/app/lang/no/admin/settings/general.php
index f72a79740c..8175a09125 100755
--- a/app/lang/no/admin/settings/general.php
+++ b/app/lang/no/admin/settings/general.php
@@ -6,7 +6,7 @@ return array(
 	'auto_increment_assets'		=> 'Generer automatisk økende eiendels-IDer',
 	'auto_increment_prefix'		=> 'Prefiks (valgfritt)',
 	'auto_incrementing_help'    => 'Aktiver først automatisk øking av eiendels-IDer for å velge dette alternativet',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> 'Strekkodetype',
 	'default_eula_text'			=> 'Standard EULA',
 	'default_eula_help_text'	=> 'Du kan også knytte tilpassede EULAer til bestemte eiendelskategorier.',
     'display_asset_name'        => 'Vis eiendelsnavn',
@@ -28,7 +28,7 @@ return array(
     'setting'                   => 'Innstilling',
     'settings'                  => 'Innstillinger',
     'site_name'                 => 'Nettstedsnavn',
-     'snipe_version'  			=> 'Snipe-IT version',
+     'snipe_version'  			=> 'Snipe-IT-versjon',
     'system'                    => 'Systeminformasjon',
     'update'                    => 'Oppdater innstillinger',
     'value'                     => 'Verdi',
diff --git a/app/lang/no/admin/users/message.php b/app/lang/no/admin/users/message.php
index 505242bd52..79d410b874 100755
--- a/app/lang/no/admin/users/message.php
+++ b/app/lang/no/admin/users/message.php
@@ -28,7 +28,7 @@ return array(
         'delete' => 'Det oppstod et problem under sletting av bruker. Prøv igjen.',
         'unsuspend' => 'Det oppstod et problem under aktivering av bruker. Prøv igjen.',
         'import'    => 'Det oppstod et problem under import av brukere. Prøv igjen.',
-        'asset_already_accepted' => 'This asset has already been accepted.',
+        'asset_already_accepted' => 'Denne eiendelen er allerede akseptert.',
     ),
 
 );
diff --git a/app/lang/no/admin/users/table.php b/app/lang/no/admin/users/table.php
index aefd7494a9..66cacd0f41 100755
--- a/app/lang/no/admin/users/table.php
+++ b/app/lang/no/admin/users/table.php
@@ -21,12 +21,12 @@ return array(
     'lock_passwords'		=> 'Innloggingsdetaljer kan ikke endres i denne installasjonen.',
     'manager' 				=> 'Overordnet',
     'name' 					=> 'Navn',
-    'notes'                 => 'Notes',
+    'notes'                 => 'Notater',
     'password_confirm' 		=> 'Bekreft passord',
     'password' 				=> 'Passord',
     'phone'  				=> 'Telefon',
-    'show_current'          => 'Show Current Users',
-    'show_deleted'          => 'Show Deleted Users',
+    'show_current'          => 'Vis nåværende brukere',
+    'show_deleted'          => 'Vis slettede brukere',
     'title' 				=> 'Tittel',
     'updateuser' 			=> 'Oppdater bruker',
     'username' 				=> 'Brukernavn',
diff --git a/app/lang/no/general.php b/app/lang/no/general.php
index 5169225bb1..e932535c26 100755
--- a/app/lang/no/general.php
+++ b/app/lang/no/general.php
@@ -25,7 +25,7 @@ return array(
     'changeemail'  			=> 'Endre e-postadresse',
     'changepassword'  		=> 'Endre passord',
     'checkin'  				=> 'Sjekk inn',
-    'checkin_from'  		=> 'Checkin from',
+    'checkin_from'  		=> 'Innsjekk fra',
     'checkout'  			=> 'Sjekk ut',
     'city'  				=> 'By',
     'country'  				=> 'Land',
@@ -45,7 +45,7 @@ return array(
     'depreciation'			=> 'Avskrivning',
     'editprofile'  			=> 'Rediger din profil',
     'eol'					=> 'Livstid',
-    'first'					=> 'First',
+    'first'					=> 'Første',
     'first_name'			=> 'Fornavn',
     'file_name'				=> 'Fil',
     'file_uploads'			=> 'Filopplastinger',
@@ -56,7 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Slett bilde',
     'image_upload'         	=> 'Last opp bilde',
-    'last'					=> 'Last',
+    'last'					=> 'Siste',
     'last_name'				=> 'Etternavn',
     'license'				=> 'Lisens',
     'license_report'        => 'Lisensrapport',
@@ -72,31 +72,32 @@ return array(
     'months'				=> 'måneder',
     'moreinfo'				=> 'Mer info',
     'name'					=> 'Navn',
-    'next'					=> 'Next',
+    'next'					=> 'Neste',
     'no_depreciation'		=> 'Ingen avskrivning',
     'no_results'			=> 'Ingen treff.',
     'no'  					=> 'Nummer',
     'notes'  				=> 'Notater',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'page_menu'				=> 'Viser _MENU_ enheter',
+    'pagination_info'		=> 'Viser _START_ til _END_ av _TOTAL_ enheter',
     'pending'				=> 'Under arbeid',
     'people'				=> 'Folk',
     'per_page'				=> 'Resultater pr side',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
+    'previous'				=> 'Forrige',
+    'processing'			=> 'Behandler',
     'profile'				=> 'Din profil',
     'ready_to_deploy'		=> 'Klar for utlevering',
-    'recent_activity'		=> 'Recent Activity',
+    'recent_activity'		=> 'Nylig aktivitet',
     'reports'				=> 'Rapporter',
     'save'  				=> 'Lagre',
-    'select'				=> 'Select',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date',
+    'select'				=> 'Velg',
+    'search'				=> 'Search',
+    'select_depreciation'	=> 'Velg en avskrivningstype',
+    'select_location'		=> 'Velg en lokasjon',
+    'select_manufacturer'	=> 'Velg en produsent',
+    'select_model'			=> 'Velg en modell',
+    'select_supplier'		=> 'Velg en leverandør',
+    'select_user'			=> 'Velg en bruker',
+    'select_date'			=> 'Velg en dato',
     'settings'				=> 'Innstillinger',
     'sign_in'				=> 'Logg inn',
     'site_name'				=> 'Nettstedsnavn',
@@ -109,9 +110,9 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'Ikke utleverbar',
     'unknown_admin'			=> 'Ukjent admin',
-    'uploaded'              => 'Uploaded',
+    'uploaded'              => 'Lastet opp',
     'user'					=> 'Bruker',
-    'users'                 => 'Users',
+    'users'                 => 'Brukere',
     'viewassets'  			=> 'Vis tildelte eiendeler',
     'website'               => 'Nettsted',
     'welcome'				=> 'Velkommen, :name',
diff --git a/app/lang/pl/general.php b/app/lang/pl/general.php
index 757427c420..ce0baa4645 100755
--- a/app/lang/pl/general.php
+++ b/app/lang/pl/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Raporty',
     'save'  				=> 'Zapisz',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/pt-BR/admin/accessories/general.php b/app/lang/pt-BR/admin/accessories/general.php
index c7849af7d8..1ed05a8c27 100755
--- a/app/lang/pt-BR/admin/accessories/general.php
+++ b/app/lang/pt-BR/admin/accessories/general.php
@@ -8,13 +8,13 @@ return array(
     'create'  							=> 'Criar Categoria',
     'eula_text'							=> 'EULA da Categoria',
     'eula_text_help'					=> 'Este campo lhe permite personalizar seus EULAs para tipos específicos de ativos. Se você apenas tem um EULA para todos os seus ativos, você pode selecionar a caixa abaixo para usar o padrão primário.',
-    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
+    'require_acceptance'				=> 'Requer que usuários confirmem a aceitação de ativos nesta categoria.',
     'no_default_eula'					=> 'Nenhum EULA padrão primário foi encontrado. Adicione um nas Configurações.',
     'qty'  								=> 'QTD',
     'total'  							=> 'Total',
     'remaining'  						=> 'Avail',
     'update'  							=> 'Atualizar Categoria',
-    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
-    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula'					=> 'Em vez disso, use o <a href="#" data-toggle="modal" data-target="#eulaModal">EULA padrão primário</a>.',
+    'use_default_eula_disabled'			=> '<del>Em vez disso, use o EULA padrão primário.</del> Nenhum EULA padrão primário foi definido. Adicione um nas Configurações.',
 
 );
diff --git a/app/lang/pt-BR/admin/accessories/message.php b/app/lang/pt-BR/admin/accessories/message.php
index ba68b13f1e..150064c546 100755
--- a/app/lang/pt-BR/admin/accessories/message.php
+++ b/app/lang/pt-BR/admin/accessories/message.php
@@ -16,9 +16,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem certeza que deseja deletar esta categoria?',
-        'error'   => 'Houve um problema ao deletar a categoria. Tente novamente.',
-        'success' => 'A categoria foi deletada com sucesso.'
+        'confirm'   => 'Tem certeza de que deseja excluir esta categoria?',
+        'error'   => 'Houve um problema ao excluir a categoria. Tente novamente.',
+        'success' => 'A categoria foi excluída com sucesso.'
     ),
     
      'checkout' => array(
diff --git a/app/lang/pt-BR/admin/accessories/table.php b/app/lang/pt-BR/admin/accessories/table.php
index aefd115b39..837a50955e 100755
--- a/app/lang/pt-BR/admin/accessories/table.php
+++ b/app/lang/pt-BR/admin/accessories/table.php
@@ -3,7 +3,7 @@
 return array(
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
-    'require_acceptance'      	=> 'Acceptance',
+    'require_acceptance'      	=> 'Aceitação',
     'title'      				=> 'Nome do Acessório',
 
 );
diff --git a/app/lang/pt-BR/admin/categories/general.php b/app/lang/pt-BR/admin/categories/general.php
index a88df8d996..db34bd4c4c 100755
--- a/app/lang/pt-BR/admin/categories/general.php
+++ b/app/lang/pt-BR/admin/categories/general.php
@@ -10,12 +10,12 @@ return array(
     'edit'                              => 'Editar Categoria',
     'eula_text'							=> 'EULA da Categoria',
     'eula_text_help'					=> 'Este campo lhe permite personalizar seus EULAs para tipos específicos de bens. Se você apenas tem um EULA para todos os seus bens, você pode selecionar a caixa abaixo para usar o padrão primário.',
-    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
-    'required_acceptance'				=> 'This user will be emailed with a link to confirm acceptance of this item.',
-    'required_eula'						=> 'This user will be emailed a copy of the EULA',
+    'require_acceptance'				=> 'Requer que usuários confirmem a aceitação de ativos nesta categoria.',
+    'required_acceptance'				=> 'Este usuário receberá um e-mail com um link para confirmar a aceitação deste item.',
+    'required_eula'						=> 'Este usuário receberá um e-mail com uma cópia do EULA',
     'no_default_eula'					=> 'Nenhum EULA padrão primário foi encontrado. Adicione um nas Configurações.',
     'update'  							=> 'Atualizar Categoria',
-    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
-    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula'					=> 'Em vez disso, use o <a href="#" data-toggle="modal" data-target="#eulaModal">EULA padrão primário</a>.',
+    'use_default_eula_disabled'			=> '<del>Em vez disso, use o EULA padrão primário.</del> Nenhum EULA padrão primário foi definido. Adicione um nas Configurações.',
 
 );
diff --git a/app/lang/pt-BR/admin/categories/message.php b/app/lang/pt-BR/admin/categories/message.php
index 52114e9a98..b828671b6c 100755
--- a/app/lang/pt-BR/admin/categories/message.php
+++ b/app/lang/pt-BR/admin/categories/message.php
@@ -3,22 +3,22 @@
 return array(
 
     'does_not_exist' => 'A categoria não existe.',
-    'assoc_users'	 => 'Esta categoria está no momento associada com pelo menos um modelo e não pode ser deletada. Por favor, atualize seus modelos para não referenciarem mais esta categoria e tente novamente. ',
+    'assoc_users'	 => 'Esta categoria está no momento associada com pelo menos um modelo e não pode ser excluída. Atualize seus modelos para não referenciarem mais esta categoria e tente novamente. ',
 
     'create' => array(
-        'error'   => 'A categoria não foi criada, por favor, tente novamente.',
+        'error'   => 'A categoria não foi criada. Tente novamente.',
         'success' => 'Categoria criada com sucesso.'
     ),
 
     'update' => array(
-        'error'   => 'A categoria não foi atualizada, por favor, tente novamente',
+        'error'   => 'A categoria não foi atualizada, tente novamente',
         'success' => 'Categoria atualizada com sucesso.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem certeza que deseja deletar esta categoria?',
-        'error'   => 'Houve um problema ao deletar a categoria. Por favor, tente novamente.',
-        'success' => 'A categoria foi deletada com sucesso.'
+        'confirm'   => 'Tem certeza de que deseja excluir esta categoria?',
+        'error'   => 'Houve um problema ao excluir a categoria. Tente novamente.',
+        'success' => 'A categoria foi excluída com sucesso.'
     )
 
 );
diff --git a/app/lang/pt-BR/admin/categories/table.php b/app/lang/pt-BR/admin/categories/table.php
index 1b10cf6fd4..fcafba2499 100755
--- a/app/lang/pt-BR/admin/categories/table.php
+++ b/app/lang/pt-BR/admin/categories/table.php
@@ -4,7 +4,7 @@ return array(
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
     'parent'   					=> 'Pai',
-    'require_acceptance'      	=> 'Acceptance',
+    'require_acceptance'      	=> 'Aceitação',
     'title'      				=> 'Nome da Categoria de Bens',
 
 );
diff --git a/app/lang/pt-BR/admin/depreciations/general.php b/app/lang/pt-BR/admin/depreciations/general.php
index f2e95bbeaf..74d3636ab8 100755
--- a/app/lang/pt-BR/admin/depreciations/general.php
+++ b/app/lang/pt-BR/admin/depreciations/general.php
@@ -1,9 +1,9 @@
 <?php
 
 return array(
-    'about_asset_depreciations'  			=> 'Sobre as Depreciações de Bens',
-    'about_depreciations'  					=> 'Você pode configurar depreciações para depreciar bens baseados na depreciação linear.',
-    'asset_depreciations'  					=> 'Depreciações de Bens',
+    'about_asset_depreciations'  			=> 'Sobre as Depreciações de Ativos',
+    'about_depreciations'  					=> 'Você pode configurar depreciações para depreciar ativos baseados na depreciação linear.',
+    'asset_depreciations'  					=> 'Depreciações de Ativos',
     'create_depreciation'  					=> 'Criar Depreciação',
     'depreciation_name'  					=> 'Nome da Depreciação',
     'number_of_months'  					=> 'Número de Meses',
diff --git a/app/lang/pt-BR/admin/depreciations/message.php b/app/lang/pt-BR/admin/depreciations/message.php
index 46279c9580..8432458486 100755
--- a/app/lang/pt-BR/admin/depreciations/message.php
+++ b/app/lang/pt-BR/admin/depreciations/message.php
@@ -3,23 +3,23 @@
 return array(
 
     'does_not_exist' => 'A classe de depreciação não existe.',
-    'assoc_users'	 => 'A depreciação está no momento associada com um ou mais modelos e não pode ser deletada. Por favor, delete os modelos, e então tente deletar novamente. ',
+    'assoc_users'	 => 'A depreciação está no momento associada com um ou mais modelos e não pode ser excluída. Exclua os modelos e então tente excluir novamente. ',
 
 
     'create' => array(
-        'error'   => 'A classe de depreciação não foi criada, por favor, tente novamente. :(',
+        'error'   => 'A classe de depreciação não foi criada. Tente novamente. :(',
         'success' => 'Classe de depreciação criada com sucesso. :)'
     ),
 
     'update' => array(
-        'error'   => 'A classe de depreciação não foi atualizada, por favor, tente novamente',
+        'error'   => 'A classe de depreciação não foi atualizada, tente novamente',
         'success' => 'Classe de depreciação atualizada com sucesso.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem certeza que deseja deletar esta classe de depreciação?',
-        'error'   => 'Houve um problema ao deletar a classe de depreciação. Por favor, tente novamente.',
-        'success' => 'A classe de depreciação foi deletada com sucesso.'
+        'confirm'   => 'Tem certeza de que deseja excluir esta classe de depreciação?',
+        'error'   => 'Houve um problema ao excluir a classe de depreciação. Tente novamente.',
+        'success' => 'A classe de depreciação foi excluída com sucesso.'
     )
 
 );
diff --git a/app/lang/pt-BR/admin/groups/message.php b/app/lang/pt-BR/admin/groups/message.php
index 25ef48691d..6869ea2d1f 100755
--- a/app/lang/pt-BR/admin/groups/message.php
+++ b/app/lang/pt-BR/admin/groups/message.php
@@ -9,14 +9,14 @@ return array(
     'success' => array(
         'create' => 'O grupo foi criado com sucesso.',
         'update' => 'O grupo foi atualizado com sucesso.',
-        'delete' => 'O grupo foi deletado com sucesso.',
+        'delete' => 'O grupo foi excluído com sucesso.',
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem certeza que deseja deletar este grupo?',
-        'create' => 'Houve um problema ao criar o grupo. Por favor, tente novamente.',
-        'update' => 'Houve um problema ao atualizar o grupo. Por favor, tente novamente.',
-        'delete' => 'Houve um problema ao deletar o grupo. Por favor, tente novamente.',
+        'confirm'   => 'Tem certeza de que deseja excluir este grupo?',
+        'create' => 'Houve um problema ao criar o grupo. Tente novamente.',
+        'update' => 'Houve um problema ao atualizar o grupo. Tente novamente.',
+        'delete' => 'Houve um problema ao excluir o grupo. Tente novamente.',
     ),
 
 );
diff --git a/app/lang/pt-BR/admin/hardware/form.php b/app/lang/pt-BR/admin/hardware/form.php
index f5031d95e0..4e99e2610e 100755
--- a/app/lang/pt-BR/admin/hardware/form.php
+++ b/app/lang/pt-BR/admin/hardware/form.php
@@ -2,39 +2,39 @@
 
 return array(
 
-	'bulk_update'		=> 'Bens da Atualização em Massa',
-	'bulk_update_help'	=> 'Este formulário lhe permite atualizar múltiplos bens de uma vez só. Apenas preencha os campos que você precisa alterá-los. Qualquer campo deixado em branco permanecerá inalterado. ',
-	'bulk_update_warn'	=> 'Você está prestes a editar as propriedades de :asset_count bens.',
+	'bulk_update'		=> 'Ativos da Atualização em Massa',
+	'bulk_update_help'	=> 'Este formulário lhe permite atualizar múltiplos ativos de uma vez só. Apenas preencha os campos que você precisa alterar. Qualquer campo deixado em branco permanecerá inalterado. ',
+	'bulk_update_warn'	=> 'Você está prestes a editar as propriedades de :asset_count ativos.',
     'checkedout_to'		=> 'Alocado para',
     'checkout_date'		=> 'Checkout Date',
     'checkin_date'		=> 'Checkin Date',
     'checkout_to'		=> 'Alocado para',
     'cost'				=> 'Custo da Compra',
-    'create'			=> 'Criar Bem',
+    'create'			=> 'Criar Ativo',
     'date'				=> 'Data da Compra',
-    'depreciates_on'	=> 'Deprecia Em',
+    'depreciates_on'	=> 'Deprecia em',
     'depreciation'		=> 'Depreciação',
     'default_location'	=> 'Local Padrão',
     'eol_date'			=> 'Date de EOL',
     'eol_rate'			=> 'Classificação de EOL',
     'expires'			=> 'Expira',
     'fully_depreciated'	=> 'Totalmente Depreciado',
-    'help_checkout'		=> 'Se você deseja atribuir este bem imediatamente, você deve selecionar "Pronto para Implantar" da lista de status acima, ou coisas inesperadas podem acontecer. ',
+    'help_checkout'		=> 'Se você deseja atribuir este ativo imediatamente, você deve selecionar "Pronto para Implantar" da lista de status acima, ou coisas inesperadas podem acontecer. ',
     'mac_address'		=> 'Endereço MAC',
     'manufacturer'		=> 'Fabricante',
     'model'				=> 'Modelo',
     'months'			=> 'meses',
-    'name'				=> 'Nome do Bem',
+    'name'				=> 'Nome do Ativo',
     'notes'				=> 'Notas',
     'order'				=> 'Número do Pedido',
     'qr'				=> 'Código QR',
-    'requestable'		=> 'Os usuários podem solicitar este bem',
+    'requestable'		=> 'Usuários podem solicitar este ativo',
     'select_statustype'	=> 'Selecione o Tipo de Status',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
     'supplier'			=> 'Fornecedor',
-    'tag'				=> 'Marcação do Bem',
-    'update'			=> 'Atualização do Bem',
+    'tag'				=> 'Marcação do Ativo',
+    'update'			=> 'Atualização do Ativo',
     'warranty'			=> 'Garantia',
     'years'				=> 'anos',
 )
diff --git a/app/lang/pt-BR/admin/hardware/general.php b/app/lang/pt-BR/admin/hardware/general.php
index 69008b1150..ec1c62bc3a 100755
--- a/app/lang/pt-BR/admin/hardware/general.php
+++ b/app/lang/pt-BR/admin/hardware/general.php
@@ -2,17 +2,17 @@
 
 return array(
 	'archived'  				=> 'Arquivado',
-    'asset'  					=> 'Bem',
+    'asset'  					=> 'Ativo',
     'checkin'  					=> 'Retornar Ativo',
     'checkout'  				=> 'Registrar Ativo ao Usuário',
-    'clone'  					=> 'Clonar Bem',
+    'clone'  					=> 'Clonar Ativo',
     'deployable'  				=> 'Implementável',
-    'deleted'  					=> 'Este bem foi deletado. <a href="/hardware/:asset_id/restore">Clique aqui para restaurá-lo</a>.',
-    'edit'  					=> 'Editar Bem',
-    'model_deleted'  			=> 'Este modelo de Bens foi deletado. Você deve restaurar o modelo antes de restaurar o Bem.<br/> <a href="/hardware/models/:model_id/restore">Clique aqui para restaurar o modelo</a>.',
+    'deleted'  					=> 'Este ativo foi excluído. <a href="/hardware/:asset_id/restore">Clique aqui para restaurá-lo</a>.',
+    'edit'  					=> 'Editar Ativo',
+    'model_deleted'  			=> 'Este modelo de Ativos foi excluído. Você deve restaurar o modelo antes de restaurar o Ativo.<br/> <a href="/hardware/models/:model_id/restore">Clique aqui para restaurar o modelo</a>.',
     'requestable'				=> 'Solicitável',
-    'restore'  					=> 'Restaurar Bem',
+    'restore'  					=> 'Restaurar Ativo',
     'pending'  					=> 'Pendente',
     'undeployable'  			=> 'Não implementável',
-    'view'  					=> 'Ver Bem',
+    'view'  					=> 'Ver Ativo',
 );
diff --git a/app/lang/pt-BR/admin/hardware/message.php b/app/lang/pt-BR/admin/hardware/message.php
index 6a281007fc..9b6e8a6b77 100755
--- a/app/lang/pt-BR/admin/hardware/message.php
+++ b/app/lang/pt-BR/admin/hardware/message.php
@@ -2,29 +2,29 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Aviso:</strong> Este bem foi marcado como atualmente não implementável.                        Se este status mudou, por favor, atualize o status do bem.',
-    'does_not_exist' 	=> 'O bem não existe.',
+    'undeployable' 		=> '<strong>Aviso:</strong> Este ativo foi marcado como atualmente não implementável.                        Se este status mudou, atualize o status do ativo.',
+    'does_not_exist' 	=> 'O ativo não existe.',
     'assoc_users'	 	=> 'Este bem está no momento associado com pelo menos um usuário e não pode ser deletado. Por favor, atualize seu bem para que não referencie mais este usuário e tente novamente. ',
 
     'create' => array(
-        'error'   		=> 'O bem não foi criado, por favor, tente novamente. :(',
-        'success' 		=> 'Bem criado com sucesso. :)'
+        'error'   		=> 'O ativo não foi criado, tente novamente. :(',
+        'success' 		=> 'Ativo criado com sucesso. :)'
     ),
 
     'update' => array(
-        'error'   			=> 'O bem não foi atualizado, por favor, tente novamente',
-        'success' 			=> 'Bem atualizado com sucesso.',
+        'error'   			=> 'O ativo não foi atualizado, tente novamente',
+        'success' 			=> 'Ativo atualizado com sucesso.',
         'nothing_updated'	=>  'Nenhum campo foi selecionado, então nada foi atualizado.',
     ),
 
     'restore' => array(
-        'error'   		=> 'O bem não foi restaurado, por favor, tente novamente',
-        'success' 		=> 'Bem restaurado com sucesso.'
+        'error'   		=> 'O ativo não foi restaurado, tente novamente',
+        'success' 		=> 'Ativo restaurado com sucesso.'
     ),
     
     'deletefile' => array(
-        'error'   => 'O arquivo não foi deletado. Tente novamente.',
-        'success' => 'Arquivo deletado com sucesso.',
+        'error'   => 'O arquivo não foi excluído. Tente novamente.',
+        'success' => 'Arquivo excluído com sucesso.',
     ),
 
     'upload' => array(
@@ -36,21 +36,21 @@ return array(
 
 
     'delete' => array(
-        'confirm'   	=> 'Tem certeza de que deseja deletar este bem?',
-        'error'   		=> 'Houve um problema ao deletar o bem. Por favor, tente novamente.',
-        'success' 		=> 'O bem foi deletado com sucesso.'
+        'confirm'   	=> 'Tem certeza de que deseja excluir este ativo?',
+        'error'   		=> 'Houve um problema ao excluir o ativo. Tente novamente.',
+        'success' 		=> 'O ativo foi excluído com sucesso.'
     ),
 
     'checkout' => array(
         'error'   		=> 'Ativo não foi registrado, favor tentar novamente',
         'success' 		=> 'Ativo registrado com sucesso.',
-        'user_does_not_exist' => 'Este usuário é inválido. Por favor, tente novamente.'
+        'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.'
     ),
 
     'checkin' => array(
         'error'   		=> 'Ativo não foi retornado, favor tentar novamente',
         'success' 		=> 'Ativo retornado com sucesso.',
-        'user_does_not_exist' => 'Este usuário é inválido. Por favor, tente novamente.'
+        'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.'
     )
 
 );
diff --git a/app/lang/pt-BR/admin/hardware/table.php b/app/lang/pt-BR/admin/hardware/table.php
index cf5115ee8b..396b9ba2d9 100755
--- a/app/lang/pt-BR/admin/hardware/table.php
+++ b/app/lang/pt-BR/admin/hardware/table.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'asset_tag'   	=> 'Marcação do Bem',
+    'asset_tag'   	=> 'Marcação do Ativo',
     'asset_model'       => 'Modelo',
     'book_value'  	=> 'Valor',
     'change' 		=> 'Entrada/Saída',
@@ -17,6 +17,6 @@ return array(
     'purchase_date'	=> 'Comprado',
     'serial'   		=> 'Serial',
     'status'   		=> 'Status',
-    'title'      	=> 'Bem ',
+    'title'      	=> 'Ativo ',
 
 );
diff --git a/app/lang/pt-BR/admin/licenses/form.php b/app/lang/pt-BR/admin/licenses/form.php
index ec8ae8a68b..d37a5ce6cd 100755
--- a/app/lang/pt-BR/admin/licenses/form.php
+++ b/app/lang/pt-BR/admin/licenses/form.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'asset'             => 'Bem',
+    'asset'             => 'Ativo',
     'checkin'           => 'Registrar',
     'cost'              => 'Custo da Compra',
     'create'            => 'Criar Licença',
diff --git a/app/lang/pt-BR/admin/licenses/message.php b/app/lang/pt-BR/admin/licenses/message.php
index ab46822f39..2cd6736a7d 100755
--- a/app/lang/pt-BR/admin/licenses/message.php
+++ b/app/lang/pt-BR/admin/licenses/message.php
@@ -4,19 +4,19 @@ return array(
 
     'does_not_exist' => 'A licença não existe.',
     'user_does_not_exist' => 'O usuário não existe.',
-    'asset_does_not_exist' 	=> 'O bem que você está tentando associar com esta licença não existe.',
+    'asset_does_not_exist' 	=> 'O ativo do qual você está tentando associar com esta licença não existe.',
     'owner_doesnt_match_asset' => 'O bem que você está tentando associar a está licença é propriedade de alguma outra pessoa que não está selecionada na lista suspensa.',
     'assoc_users'	 => 'Esta licença é atualmente check-out para um usuário e não pode ser excluído. Por favor, atualize seu bem para que não referencie mais este usuário e, em seguida, tente apagar novamente. ',
 
 
     'create' => array(
-        'error'   => 'A licença não foi criada, por favor, tente novamente.',
+        'error'   => 'A licença não foi criada, tente novamente.',
         'success' => 'Licença criada com sucesso.'
     ),
 
     'deletefile' => array(
-        'error'   => 'O arquivo não foi deletado. Tente novamente.',
-        'success' => 'Arquivo deletado com sucesso.',
+        'error'   => 'O arquivo não foi excluído. Tente novamente.',
+        'success' => 'Arquivo excluído com sucesso.',
     ),
 
     'upload' => array(
@@ -27,14 +27,14 @@ return array(
     ),
 
     'update' => array(
-        'error'   => 'A licença não foi atualizada, por favor, tente novamente',
+        'error'   => 'A licença não foi atualizada, tente novamente',
         'success' => 'Licença atualizada com sucesso.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem certeza que deseja deletar esta licença?',
-        'error'   => 'Houve um problema ao deletar esta licença. Por favor, tente novamente.',
-        'success' => 'A licença foi deletada com sucesso.'
+        'confirm'   => 'Tem certeza de que deseja excluir esta licença?',
+        'error'   => 'Houve um problema ao excluir esta licença. Tente novamente.',
+        'success' => 'A licença foi excluída com sucesso.'
     ),
 
     'checkout' => array(
diff --git a/app/lang/pt-BR/admin/locations/message.php b/app/lang/pt-BR/admin/locations/message.php
index 9734f01b22..fa0211185a 100755
--- a/app/lang/pt-BR/admin/locations/message.php
+++ b/app/lang/pt-BR/admin/locations/message.php
@@ -3,23 +3,23 @@
 return array(
 
     'does_not_exist' => 'O local não existe.',
-    'assoc_users'	 => 'Este local está no momento associado com pelo menos um usuário e não pode ser deletado. Por favor, atualize os seus usuários para não referenciarem mais este local e tente novamente. ',
+    'assoc_users'	 => 'Este local está no momento associado com pelo menos um usuário e não pode ser excluído. Atualize seus usuários para não referenciarem mais este local e tente novamente. ',
 
 
     'create' => array(
-        'error'   => 'O local não foi criado, por favor, tente novamente.',
+        'error'   => 'O local não foi criado, tente novamente.',
         'success' => 'Local criado com sucesso.'
     ),
 
     'update' => array(
-        'error'   => 'O local não foi atualizado, por favor, tente novamente',
+        'error'   => 'O local não foi atualizado, tente novamente',
         'success' => 'Local atualizado com sucesso.'
     ),
 
     'delete' => array(
-        'confirm'   	=> 'Tem certeza de que quer deletar este local?',
-        'error'   => 'Houve um problema ao deletar o local. Por favor, tente novamente.',
-        'success' => 'O local foi deletado com sucesso.'
+        'confirm'   	=> 'Tem certeza de que quer excluir este local?',
+        'error'   => 'Houve um problema ao excluir o local. Tente novamente.',
+        'success' => 'O local foi excluído com sucesso.'
     )
 
 );
diff --git a/app/lang/pt-BR/admin/manufacturers/message.php b/app/lang/pt-BR/admin/manufacturers/message.php
index 2ef43fa788..a1216ab150 100755
--- a/app/lang/pt-BR/admin/manufacturers/message.php
+++ b/app/lang/pt-BR/admin/manufacturers/message.php
@@ -3,22 +3,22 @@
 return array(
 
     'does_not_exist' => 'O fabricante não existe.',
-    'assoc_users'	 => 'Este fabricante está no momento associado com pelo menos um modelo e não pode ser deletado. Por favor, atualize os seus modelos para não referenciarem mais este fabricante e tente novamente. ',
+    'assoc_users'	 => 'Este fabricante está no momento associado com pelo menos um modelo e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fabricante e tente novamente. ',
 
     'create' => array(
-        'error'   => 'O fabricante não foi criado, por favor, tente novamente.',
+        'error'   => 'O fabricante não foi criado, tente novamente.',
         'success' => 'Fabricante criado com sucesso.'
     ),
 
     'update' => array(
-        'error'   => 'O fabricante não foi atualizado, por favor, tente novamente',
+        'error'   => 'O fabricante não foi atualizado, tente novamente',
         'success' => 'Fabricante atualizado com sucesso.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem certeza que deseja deletar este fabricante?',
+        'confirm'   => 'Tem certeza de que deseja excluir este fabricante?',
         'error'   => 'Ocorreu um erro ao tentar deletar o fabricante. Por favor, tente novamente.',
-        'success' => 'O Fabricante foi deletado com sucesso.'
+        'success' => 'O Fabricante foi excluído com sucesso.'
     )
 
 );
diff --git a/app/lang/pt-BR/admin/manufacturers/table.php b/app/lang/pt-BR/admin/manufacturers/table.php
index 3a5214ee7d..943a5fee65 100755
--- a/app/lang/pt-BR/admin/manufacturers/table.php
+++ b/app/lang/pt-BR/admin/manufacturers/table.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'asset_manufacturers'	=> 'Fabricantes de Bens',
+    'asset_manufacturers'	=> 'Fabricantes de Ativos',
     'create'				=> 'Criar Fabricante',
     'id'   					=> 'ID',
     'name'      			=> 'Nome do Fabricante',
diff --git a/app/lang/pt-BR/admin/models/general.php b/app/lang/pt-BR/admin/models/general.php
index 40da815a10..2d156b1a52 100755
--- a/app/lang/pt-BR/admin/models/general.php
+++ b/app/lang/pt-BR/admin/models/general.php
@@ -2,10 +2,10 @@
 
 return array(
 
-    'deleted'  					=> 'Este modelo foi deletado. <a href="/hardware/models/:model_id/restore">Clique aqui para restaurá-lo</a>.',
+    'deleted'  					=> 'Este modelo foi excluído. <a href="/hardware/models/:model_id/restore">Clique aqui para o restaurar</a>.',
     'restore'                   => 'Restaurar Modelo',
-	'show_mac_address'			=> 'Exibir o campo de endereço MAC nos bens neste modelo',
-    'view_deleted'              => 'Ver Deletados',
+	'show_mac_address'			=> 'Exibir o campo de endereço MAC nos ativos neste modelo',
+    'view_deleted'              => 'Ver Excluídos',
     'view_models'               => 'Ver Modelos',
 
 );
diff --git a/app/lang/pt-BR/admin/models/message.php b/app/lang/pt-BR/admin/models/message.php
index d9c81d2c22..53491738f6 100755
--- a/app/lang/pt-BR/admin/models/message.php
+++ b/app/lang/pt-BR/admin/models/message.php
@@ -3,23 +3,23 @@
 return array(
 
     'does_not_exist' => 'O modelo não existe.',
-    'assoc_users'	 => 'Este modelo está no momento associado com um ou mais bens e não pode ser deletado. Por favor, delete os bens, e então tente deletar novamente. ',
+    'assoc_users'	 => 'Este modelo está no momento associado com um ou mais ativos e não pode ser excluído. Exclua os ativos e então tente excluir novamente. ',
 
 
     'create' => array(
-        'error'   => 'O modelo não foi criado, por favor, tente novamente.',
+        'error'   => 'O modelo não foi criado, tente novamente.',
         'success' => 'Modelo criado com sucesso.'
     ),
 
     'update' => array(
-        'error'   => 'O modelo não foi atualizado, por favor, tente novamente',
+        'error'   => 'O modelo não foi atualizado, tente novamente',
         'success' => 'Modelo atualizado com sucesso.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem certeza de que quer deletar este modelo de bem?',
+        'confirm'   => 'Tem certeza de que quer excluir este modelo de ativo?',
         'error'   => 'Houve um problema ao deletar o modelo. Por favor, tente novamente.',
-        'success' => 'O modelo foi deletado com sucesso.'
+        'success' => 'O modelo foi excluído com sucesso.'
     ),
     
     'restore' => array(
diff --git a/app/lang/pt-BR/admin/models/table.php b/app/lang/pt-BR/admin/models/table.php
index 5f63e01205..d3f6c3c811 100755
--- a/app/lang/pt-BR/admin/models/table.php
+++ b/app/lang/pt-BR/admin/models/table.php
@@ -2,16 +2,16 @@
 
 return array(
 
-    'create'				=> 'Criar Modelo de Bens',
+    'create'				=> 'Criar Modelo de Ativos',
     'created_at' 			=> 'Criado em',
     'eol'	 				=> 'EOL',
     'modelnumber'   		=> 'Nº do Modelo',
-    'name'      			=> 'Nome do Modelo de Bens',
-    'numassets' 			=> 'Bens',
-    'title'					=> 'Modelos de Bens',
-    'update'				=> 'Atualizar Modelo de Bens',
-    'view'					=> 'Ver Modelo de Bens',
-    'update'				=> 'Atualizar Modelo de Bens',
+    'name'      			=> 'Nome do Modelo de Ativos',
+    'numassets' 			=> 'Ativos',
+    'title'					=> 'Modelos de Ativos',
+    'update'				=> 'Atualizar Modelo de Ativos',
+    'view'					=> 'Ver Modelo de Ativos',
+    'update'				=> 'Atualizar Modelo de Ativos',
     'clone'				=> 'Clonar Modelo',
     'edit'				=> 'Editar Modelo',
 );
diff --git a/app/lang/pt-BR/admin/reports/general.php b/app/lang/pt-BR/admin/reports/general.php
index dbe4af16b6..ea56fb3353 100755
--- a/app/lang/pt-BR/admin/reports/general.php
+++ b/app/lang/pt-BR/admin/reports/general.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'info'   => 'Selecione as opções que você quer para o seu relatório de bens.'
+    'info'   => 'Selecione as opções que você quer para o seu relatório de ativos.'
 );
diff --git a/app/lang/pt-BR/admin/settings/general.php b/app/lang/pt-BR/admin/settings/general.php
index d35b473c89..4449847165 100755
--- a/app/lang/pt-BR/admin/settings/general.php
+++ b/app/lang/pt-BR/admin/settings/general.php
@@ -6,16 +6,16 @@ return array(
 	'auto_increment_assets'		=> 'Gerar ID de ativo crescente',
 	'auto_increment_prefix'		=> 'Prefixo (opcional)',
 	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
-	'barcode_type'				=> 'Barcode Type',
+	'barcode_type'				=> 'Tipo do Código de Barras',
 	'default_eula_text'			=> 'EULA Padrão',
-	'default_eula_help_text'	=> 'Você também pode associar EULAs personalizados para categorias diferentes de bens.',
-    'display_asset_name'        => 'Exibir Nome do Bem',
+	'default_eula_help_text'	=> 'Você também pode associar EULAs personalizados para categorias específicas de ativos.',
+    'display_asset_name'        => 'Exibir Nome do Ativo',
     'display_checkout_date'     => 'Mostrar data de check-out',
-    'display_eol'               => 'Exibir EOL na visualização tabela',
+    'display_eol'               => 'Exibir EOL na visualização de tabela',
     'display_qr'                => 'Exibir Códigos QR',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'header_color'              => 'Cor do Cabeçalho',
-    'info'                      => 'Estas configurações lhe deixam personalizar certos aspectos da sua instalação.',
+    'info'                      => 'Estas configurações deixam-lhe personalizar certos aspectos da sua instalação.',
     'laravel'                   => 'Versão do Laravel',
     'load_remote'				=> 'This Snipe-IT install can load scripts from the outside world.',
     'logo'                    	=> 'Logo',
@@ -24,11 +24,11 @@ return array(
     'php_gd_info'               => 'Você deve instalar o php-gd para exibir códigos QR, veja as <a href="http://www.php.net/manual/en/image.installation.php">instruções de instalação</a>.',
     'php_gd_warning'            => 'O plugin PHP Image Processing and GD NÃO está instalado.',
     'qr_help'                   => 'Habilite os Códigos QR primeiro para definir isto',
-    'qr_text'                   => 'Texto de Código QR',
+    'qr_text'                   => 'Texto do Código QR',
     'setting'                   => 'Configuração',
     'settings'                  => 'Configurações',
     'site_name'                 => 'Nome do Site',
-     'snipe_version'  			=> 'Snipe-IT version',
+     'snipe_version'  			=> 'Versão do Snipe-IT',
     'system'                    => 'Informação do sistema',
     'update'                    => 'Atualizar Configurações',
     'value'                     => 'Valor',
diff --git a/app/lang/pt-BR/admin/settings/message.php b/app/lang/pt-BR/admin/settings/message.php
index 641b237807..e259ebf5ea 100755
--- a/app/lang/pt-BR/admin/settings/message.php
+++ b/app/lang/pt-BR/admin/settings/message.php
@@ -4,7 +4,7 @@ return array(
 
 
     'update' => array(
-        'error'   => 'Um erro ocorreu ao atualizar. ',
+        'error'   => 'Ocorreu um erro ao atualizar. ',
         'success' => 'Configurações atualizadas com sucesso.'
     ),
 
diff --git a/app/lang/pt-BR/admin/statuslabels/message.php b/app/lang/pt-BR/admin/statuslabels/message.php
index 306cf7354c..8bc492eee0 100755
--- a/app/lang/pt-BR/admin/statuslabels/message.php
+++ b/app/lang/pt-BR/admin/statuslabels/message.php
@@ -3,23 +3,23 @@
 return array(
 
     'does_not_exist' => 'O local não existe.',
-    'assoc_users'	 => 'Este local está no momento associado com pelo menos um usuário e não pode ser deletado. Por favor, atualize os seus usuários para não referenciarem mais este local e tente novamente. ',
+    'assoc_users'	 => 'Este local está no momento associado com pelo menos um usuário e não pode ser excluído. Atualize seus usuários para não referenciarem mais este local e tente novamente. ',
 
 
     'create' => array(
-        'error'   => 'O local não foi criado, por favor, tente novamente.',
+        'error'   => 'O local não foi criado, tente novamente.',
         'success' => 'Local criado com sucesso.'
     ),
 
     'update' => array(
-        'error'   => 'O local não foi atualizado, por favor, tente novamente',
+        'error'   => 'O local não foi atualizado, tente novamente',
         'success' => 'Local atualizado com sucesso.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem certeza de que quer deletar este rótulo de status?',
-        'error'   => 'Houve um problema ao deletar o local. Por favor, tente novamente.',
-        'success' => 'O local foi deletado com sucesso.'
+        'confirm'   => 'Tem certeza de que quer excluir este rótulo de status?',
+        'error'   => 'Houve um problema ao excluir o local. Tente novamente.',
+        'success' => 'O local foi excluído com sucesso.'
     )
 
 );
diff --git a/app/lang/pt-BR/admin/statuslabels/table.php b/app/lang/pt-BR/admin/statuslabels/table.php
index cd5cbd3abb..781405513e 100755
--- a/app/lang/pt-BR/admin/statuslabels/table.php
+++ b/app/lang/pt-BR/admin/statuslabels/table.php
@@ -5,7 +5,7 @@ return array(
     'archived'      	=> 'Arquivado',
     'create'      	=> 'Criar Rótulo de Status',
     'deployable'      	=> 'Implementável',
-    'info'      	=> 'Rótulos de status são usados para descrever os vários estados que seus bens podem estar. Eles podem ser fora do ar para reparo, perdido/roubado, etc. Você pode criar novos rótulos de status para bens implementáveis, pendentes e arquivados.',
+    'info'      	=> 'Rótulos de status são usados para descrever os vários estados que seus ativos podem estar. Eles podem ser fora do ar para reparo, perdido/roubado, etc. Você pode criar novos rótulos de status para ativos implementáveis, pendentes e arquivados.',
     'name'      	=> 'Nome do Status',
     'pending'      	=> 'Pendente',
     'status_type'   => 'Tipo do Status',
diff --git a/app/lang/pt-BR/admin/suppliers/message.php b/app/lang/pt-BR/admin/suppliers/message.php
index 04b4d0666e..15d38a2447 100755
--- a/app/lang/pt-BR/admin/suppliers/message.php
+++ b/app/lang/pt-BR/admin/suppliers/message.php
@@ -3,22 +3,22 @@
 return array(
 
     'does_not_exist' => 'O fornecedor não existe.',
-    'assoc_users'	 => 'Este fornecedor está no momento associado com pelo menos um modelo e não pode ser deletado. Por favor, atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ',
+    'assoc_users'	 => 'Este fornecedor está no momento associado com pelo menos um modelo e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ',
 
     'create' => array(
-        'error'   => 'O fornecedor não foi criado, por favor, tente novamente.',
+        'error'   => 'O fornecedor não foi criado, tente novamente.',
         'success' => 'Fornecedor criado com sucesso.'
     ),
 
     'update' => array(
-        'error'   => 'O fornecedor não foi atualizado, por favor, tente novamente',
+        'error'   => 'O fornecedor não foi atualizado, tente novamente',
         'success' => 'Fornecedor atualizado com sucesso.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem certeza que deseja deletar este fornecedor?',
-        'error'   => 'Houve um problema ao deletar o fornecedor. Por favor, tente novamente.',
-        'success' => 'O fornecedor foi deletado com sucesso.'
+        'confirm'   => 'Tem certeza de que deseja excluir este fornecedor?',
+        'error'   => 'Houve um problema ao excluir o fornecedor. Tente novamente.',
+        'success' => 'O fornecedor foi excluído com sucesso.'
     )
 
 );
diff --git a/app/lang/pt-BR/admin/users/message.php b/app/lang/pt-BR/admin/users/message.php
index ac391c9799..16440e1727 100755
--- a/app/lang/pt-BR/admin/users/message.php
+++ b/app/lang/pt-BR/admin/users/message.php
@@ -4,7 +4,7 @@ return array(
 
     'user_exists'              	=> 'O usuário já existe!',
     'user_not_found'           	=> 'O usuário [:id] não existe.',
-    'user_login_required'      	=> 'O campo entrar é requerido',
+    'user_login_required'      	=> 'O campo de login é requerido',
     'user_password_required'   	=> 'A senha é requerida.',
     'insufficient_permissions' 	=> 'Permissões Insuficientes.',
     'user_deleted_warning' 		=> 'Este usuário foi deletado. Você terá que restaurar este usuário para editá-los ou atribui-lós novos bens.',
@@ -13,22 +13,22 @@ return array(
     'success' => array(
         'create'    => 'O usuário foi criado com sucesso.',
         'update'    => 'O usuário foi atualizado com sucesso.',
-        'delete'    => 'O usuário foi deletado com sucesso.',
+        'delete'    => 'O usuário foi excluído com sucesso.',
         'ban'       => 'O usuário foi banido com sucesso.',
         'unban'     => 'O usuário foi desbanido com sucesso.',
         'suspend'   => 'O usuário foi suspenso com sucesso.',
-        'unsuspend' => 'O usuário foi dessuspenso com sucesso.',
+        'unsuspend' => 'O usuário foi removido da suspensão com sucesso.',
         'restored'  => 'O usuário foi restaurado com sucesso.',
         'import'    => 'Usuários importados com sucesso.',
     ),
 
     'error' => array(
-        'create' => 'Houve um problema ao criar o usuário. Por favor, tente novamente.',
-        'update' => 'Houve um problema ao atualizar o usuário. Por favor, tente novamente.',
-        'delete' => 'Houve um problema ao deletar o usuário. Por favor, tente novamente.',
-        'unsuspend' => 'Houve um problema ao dessuspender o usuário. Por favor, tente novamente.',
-        'import'    => 'Houve um problema ao importar os usuários. Tente novamente.',
-        'asset_already_accepted' => 'This asset has already been accepted.',
+        'create' => 'Houve um problema ao criar o usuário. Tente novamente.',
+        'update' => 'Houve um problema ao atualizar o usuário. Tente novamente.',
+        'delete' => 'Houve um problema ao excluir o usuário. Tente novamente.',
+        'unsuspend' => 'Houve um problema ao remover a suspensão do usuário. Tente novamente.',
+        'import'    => 'Houve um problema ao importar usuários. Tente novamente.',
+        'asset_already_accepted' => 'Este ativo já foi aceito.',
     ),
 
 );
diff --git a/app/lang/pt-BR/admin/users/table.php b/app/lang/pt-BR/admin/users/table.php
index 6c1d8116d7..d7585d199e 100755
--- a/app/lang/pt-BR/admin/users/table.php
+++ b/app/lang/pt-BR/admin/users/table.php
@@ -4,14 +4,14 @@ return array(
 
     'activated'  			=> 'Ativo',
     'allow'  				=> 'Permitir',
-    'checkedout'  			=> 'Bens',
+    'checkedout'  			=> 'Ativos',
     'created_at' 			=> 'Criado',
     'createuser' 			=> 'Criar Usuário',
     'deny'  				=> 'Negar',
     'email'      			=> 'E-mail',
-    'employee_num'      	=> 'Nº do Empregado',
+    'employee_num'      	=> 'Nº do Funcionário',
     'first_name' 			=> 'Primeiro Nome',
-    'groupnotes'			=> 'Selecione um grupo para atribuir ao usuário, lembre-se que um usuário tem todas as permissões do grupo que ele esta atribuído.',
+    'groupnotes'			=> 'Selecione um grupo para atribuir ao usuário, lembre-se que um usuário tem todas as permissões do grupo que ele está atribuído.',
     'id'         			=> 'Id',
     'inherit'  				=> 'Herdar',
     'job' 					=> 'Cargo',
@@ -21,12 +21,12 @@ return array(
     'lock_passwords'		=> 'Detalhes de login não podem ser alterados nesta instalação.',
     'manager' 				=> 'Gerenciador',
     'name' 					=> 'Nome',
-    'notes'                 => 'Notes',
+    'notes'                 => 'Notas',
     'password_confirm' 		=> 'Confirmar Senha',
     'password' 				=> 'Senha',
     'phone'  				=> 'Telefone',
-    'show_current'          => 'Show Current Users',
-    'show_deleted'          => 'Show Deleted Users',
+    'show_current'          => 'Mostrar Usuários Atuais',
+    'show_deleted'          => 'Mostrar Usuários Excluídos',
     'title' 				=> 'Título',
     'updateuser' 			=> 'Atualizar Usuário',
     'username' 				=> 'Usuário',
diff --git a/app/lang/pt-BR/auth/message.php b/app/lang/pt-BR/auth/message.php
index e413b327ef..00c5f30ba3 100755
--- a/app/lang/pt-BR/auth/message.php
+++ b/app/lang/pt-BR/auth/message.php
@@ -9,27 +9,27 @@ return array(
     'account_banned'         => 'Esta conta de usuário está banida.',
 
     'signin' => array(
-        'error'   => 'Houve um problema ao lhe tentar entrar, por favor, tente novamente.',
+        'error'   => 'Houve um problema ao tentar-lhe entrar, tente novamente.',
         'success' => 'Você entrou com sucesso.',
     ),
 
     'signup' => array(
-        'error'   => 'Houve um problema ao tentar criar sua conta, por favor, tente novamente.',
+        'error'   => 'Houve um problema ao tentar criar sua conta, tente novamente.',
         'success' => 'Conta criada com sucesso.',
     ),
 
         'forgot-password' => array(
-            'error'   => 'Houve um problema ao tentar obter um código de redefinição da senha, por favor, tente novamente.',
+            'error'   => 'Houve um problema ao tentar obter um código de redefinição da senha, tente novamente.',
             'success' => 'E-mail de recuperação de senha enviado com sucesso.',
         ),
 
         'forgot-password-confirm' => array(
-            'error'   => 'Houve um problema ao tentar redefinir sua senha, por favor, tente novamente.',
+            'error'   => 'Houve um problema ao tentar redefinir sua senha, tente novamente.',
             'success' => 'Sua senha foi redefinida com sucesso.',
         ),
 
     'activate' => array(
-        'error'   => 'Houve um problema ao tentar ativar sua conta, por favor, tente novamente.',
+        'error'   => 'Houve um problema ao tentar ativar sua conta, tente novamente.',
         'success' => 'Sua conta foi ativada com sucesso.',
     ),
 
diff --git a/app/lang/pt-BR/button.php b/app/lang/pt-BR/button.php
index 87de356698..6f91ff9d9c 100755
--- a/app/lang/pt-BR/button.php
+++ b/app/lang/pt-BR/button.php
@@ -5,7 +5,7 @@ return array(
     'actions' 	=> 'Ações',
     'add'    	=> 'Adicionar Novo',
     'cancel'    => 'Cancelar',
-    'delete'  	=> 'Deletar',
+    'delete'  	=> 'Excluir',
     'edit'    	=> 'Editar',
     'restore' 	=> 'Restaurar',
     'submit'  	=> 'Enviar',
diff --git a/app/lang/pt-BR/general.php b/app/lang/pt-BR/general.php
index f61abacb1b..9414bc15c0 100755
--- a/app/lang/pt-BR/general.php
+++ b/app/lang/pt-BR/general.php
@@ -4,24 +4,24 @@ return array(
 
 
     'accessories'			=> 'Acessórios',
-    'accessory'				=> 'Accessory',
+    'accessory'				=> 'Acessório',
     'address'				=> 'Endereço',
     'admin'					=> 'Administrador',
-    'all_assets'			=> 'Todos os Bens',
+    'all_assets'			=> 'Todos os Ativos',
     'all'       			=> 'Todos',
     'archived'              => 'Arquivado',
-    'asset_models'			=> 'Modelos de Bens',
-    'asset'					=> 'Bem',
-    'asset_report'          => 'Relatório de Bens',
-    'asset_tag'				=> 'Marcação do Bem',
-    'assets_available'		=> 'bens disponíveis',
-    'assets'				=> 'Bens',
-    'avatar_delete'         => 'Deletar Avatar',
+    'asset_models'			=> 'Modelos de Ativos',
+    'asset'					=> 'Ativo',
+    'asset_report'          => 'Relatório de Ativos',
+    'asset_tag'				=> 'Marcação do Ativo',
+    'assets_available'		=> 'ativos disponíveis',
+    'assets'				=> 'Ativos',
+    'avatar_delete'         => 'Excluir Avatar',
     'avatar_upload'         => 'Carregar Avatar',
     'back'      			=> 'Voltar',
     'cancel'  				=> 'Cancelar',
-    'categories'			=> 'Categorias de Bens',
-    'category'				=> 'Categoria do Bem',
+    'categories'			=> 'Categorias de Ativos',
+    'category'				=> 'Categoria do Ativo',
     'changeemail'  			=> 'Alterar Endereço de E-mail',
     'changepassword'  		=> 'Alterar Senha',
     'checkin'  				=> 'Check-in',
@@ -30,33 +30,33 @@ return array(
     'city'  				=> 'Cidade',
     'country'  				=> 'País',
     'create'				=> 'Criar Novo',
-    'created_asset'			=> 'criou bem',
+    'created_asset'			=> 'created asset',
     'created_at' 			=> 'Criado em',
     'currency'  			=> '$',
     'current'  				=> 'Atuais',
-    'custom_report'         => 'Relatório de Bens Personalizado',
+    'custom_report'         => 'Relatório de Ativos Personalizado',
     'dashboard'				=> 'Dashboard',
     'date'					=> 'Data',
     'delete'  				=> 'Deletar',
-    'deleted'  				=> 'Deletado',
+    'deleted'  				=> 'Excluído',
     'deployed'				=> 'Implantado',
     'depreciation_report'	=> 'Relatório de Depreciações',
-    'download'				=> 'Baixar',
+    'download'				=> 'Download',
     'depreciation'			=> 'Depreciação',
     'editprofile'  			=> 'Editar Seu Perfil',
     'eol'					=> 'EOL',
-    'first'					=> 'First',
+    'first'					=> 'Primeira',
     'first_name'			=> 'Primeiro Nome',
     'file_name'				=> 'Arquivo',
     'file_uploads'			=> 'Carregamentos de Arquivos',
     'generate'				=> 'Gerar',
     'groups'				=> 'Grupos',
     'gravatar_email'        => 'Endereço de E-mail do Gravatar',
-    'history_for'  			=> 'Histórico para',
+    'history_for'  			=> 'Histórico de',
     'id'  					=> 'ID',
-    'image_delete'         	=> 'Deletar Imagem',
+    'image_delete'         	=> 'Excluir Imagem',
     'image_upload'         	=> 'Carregar Imagem',
-    'last'					=> 'Last',
+    'last'					=> 'Última',
     'last_name'				=> 'Último Nome',
     'license'				=> 'Licença',
     'license_report'        => 'Relatório da Licença',
@@ -72,31 +72,32 @@ return array(
     'months'				=> 'meses',
     'moreinfo'				=> 'Mais Informações',
     'name'					=> 'Nome',
-    'next'					=> 'Next',
+    'next'					=> 'Próxima',
     'no_depreciation'		=> 'Sem Depreciação',
     'no_results'			=> 'Sem Resultados.',
     'no'  					=> 'Não',
     'notes'  				=> 'Notas',
-    'page_menu'				=> 'Showing _MENU_ items',
+    'page_menu'				=> 'Mostrando _MENU_ itens',
     'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pendente',
     'people'				=> 'Pessoas',
     'per_page'				=> 'Resultados Por Página',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
+    'previous'				=> 'Anterior',
+    'processing'			=> 'Processando',
     'profile'				=> 'Seu perfil',
     'ready_to_deploy'		=> 'Pronto para Implantar',
-    'recent_activity'		=> 'Recent Activity',
+    'recent_activity'		=> 'Atividade Recente',
     'reports'				=> 'Relatórios',
     'save'  				=> 'Salvar',
-    'select'				=> 'Select',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date',
+    'select'				=> 'Selecionar',
+    'search'				=> 'Search',
+    'select_depreciation'	=> 'Selecionar um Tipo de Depreciação',
+    'select_location'		=> 'Selecionar um Local',
+    'select_manufacturer'	=> 'Selecionar um Fabricante',
+    'select_model'			=> 'Selecionar um Modelo',
+    'select_supplier'		=> 'Selecionar um Fornecedor',
+    'select_user'			=> 'Selecionar um Usuário',
+    'select_date'			=> 'Selecionar Data',
     'settings'				=> 'Configurações',
     'sign_in'				=> 'Entrar',
     'site_name'				=> 'Nome do Site',
@@ -104,17 +105,17 @@ return array(
     'status_labels'			=> 'Rótulos de Status',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Fornecedores',
-    'total_assets'			=> 'bens no total',
+    'total_assets'			=> 'ativos no total',
     'total_licenses'		=> 'licenças no total',
     'type'  				=> 'Tipo',
     'undeployable'			=> 'Não implantável',
     'unknown_admin'			=> 'Administrador Desconhecido',
-    'uploaded'              => 'Uploaded',
+    'uploaded'              => 'Carregado',
     'user'					=> 'Usuário',
-    'users'                 => 'Users',
-    'viewassets'  			=> 'Ver Bens Atribuídos',
+    'users'                 => 'Usuários',
+    'viewassets'  			=> 'Ver Ativos Atribuídos',
     'website'               => 'Site',
-    'welcome'				=> 'Bem-vindo, :name',
+    'welcome'				=> 'Bem-vindo(a), :name',
     'years'					=> 'anos',
     'yes' 					=> 'Sim',
     'zip'  					=> 'Cep',
diff --git a/app/lang/pt-PT/general.php b/app/lang/pt-PT/general.php
index fe30d64df0..32e483f061 100755
--- a/app/lang/pt-PT/general.php
+++ b/app/lang/pt-PT/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/ro/general.php b/app/lang/ro/general.php
index fa61072096..1559a88e9b 100755
--- a/app/lang/ro/general.php
+++ b/app/lang/ro/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Rapoarte',
     'save'  				=> 'Salveaza',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/ru/general.php b/app/lang/ru/general.php
index ca3a547f55..be415d1cda 100755
--- a/app/lang/ru/general.php
+++ b/app/lang/ru/general.php
@@ -25,7 +25,7 @@ return array(
     'changeemail'  			=> 'Изменить адрес почты',
     'changepassword'  		=> 'Изменить пароль',
     'checkin'  				=> 'Привязать',
-    'checkin_from'  		=> 'Checkin from',
+    'checkin_from'  		=> 'Возврат из',
     'checkout'  			=> 'Отвязать',
     'city'  				=> 'Город',
     'country'  				=> 'Страна',
@@ -45,7 +45,7 @@ return array(
     'depreciation'			=> 'Амортизация',
     'editprofile'  			=> 'Редактировать свой профиль',
     'eol'					=> 'EOL',
-    'first'					=> 'First',
+    'first'					=> 'В начало',
     'first_name'			=> 'Имя',
     'file_name'				=> 'Файл',
     'file_uploads'			=> 'Загрузка файла',
@@ -56,7 +56,7 @@ return array(
     'id'  					=> 'ID',
     'image_delete'         	=> 'Удалить изображение',
     'image_upload'         	=> 'Загрузить изображение',
-    'last'					=> 'Last',
+    'last'					=> 'В конец',
     'last_name'				=> 'Фамилия',
     'license'				=> 'Лицензия',
     'license_report'        => 'Отчет по лицензиям',
@@ -72,31 +72,32 @@ return array(
     'months'				=> 'Месяцев',
     'moreinfo'				=> 'Подробнее',
     'name'					=> 'Имя',
-    'next'					=> 'Next',
+    'next'					=> 'Далее',
     'no_depreciation'		=> 'Нет аммортизации',
     'no_results'			=> 'Нет результатов.',
     'no'  					=> 'Нет',
     'notes'  				=> 'Примечания',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'page_menu'				=> 'Показаны элементы _MENU_',
+    'pagination_info'		=> 'Показаны _START_ для _END_ _TOTAL_ элементы',
     'pending'				=> 'Ожидание',
     'people'				=> 'Пользователи',
     'per_page'				=> 'Результатов на страницу',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
+    'previous'				=> 'Пред',
+    'processing'			=> 'Обработка',
     'profile'				=> 'Ваш профиль',
     'ready_to_deploy'		=> 'Готов к установке',
-    'recent_activity'		=> 'Recent Activity',
+    'recent_activity'		=> 'Недавняя активность',
     'reports'				=> 'Отчеты',
     'save'  				=> 'Сохранить',
-    'select'				=> 'Select',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date',
+    'select'				=> 'Выбор',
+    'search'				=> 'Search',
+    'select_depreciation'	=> 'Выберите тип амортизации',
+    'select_location'		=> 'Выберите местоположение',
+    'select_manufacturer'	=> 'Выберите производителя',
+    'select_model'			=> 'Выберите модель',
+    'select_supplier'		=> 'Выберите поставщика',
+    'select_user'			=> 'Выберите пользователя',
+    'select_date'			=> 'Выберите дату',
     'settings'				=> 'Настройки',
     'sign_in'				=> 'Вход',
     'site_name'				=> 'Название сайта',
@@ -109,7 +110,7 @@ return array(
     'type'  				=> 'Тип',
     'undeployable'			=> 'Не развертываемый',
     'unknown_admin'			=> 'Неизвестный администратор',
-    'uploaded'              => 'Uploaded',
+    'uploaded'              => 'Загружено',
     'user'					=> 'Пользователь',
     'users'                 => 'Пользователи',
     'viewassets'  			=> 'Показать присвоенные активы',
diff --git a/app/lang/sv-SE/general.php b/app/lang/sv-SE/general.php
index fe5b32b35e..841dee8f50 100755
--- a/app/lang/sv-SE/general.php
+++ b/app/lang/sv-SE/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/th/admin/users/general.php b/app/lang/th/admin/users/general.php
index 550a32854d..f2641ef609 100755
--- a/app/lang/th/admin/users/general.php
+++ b/app/lang/th/admin/users/general.php
@@ -3,13 +3,13 @@
 
 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',
-    'usercsv'			=> 'CSV file',
+    'assets_user'  		=> 'ทรัพย์สินที่กำหนดให้ :name',
+    'clone'  			=> 'โคลนผู้ใช้',
+    'contact_user'  	=> 'ติดต่อ :name',
+    'edit'  			=> 'แก้ไขผู้ใช้',
+    'history_user'  	=> 'ประวัติของ :name',
+    'last_login'  		=> 'เข้าสู่ระบบล่าสุด',
+    'software_user'  	=> 'ซอฟต์แวร์ที่กำหนดให้ :name',
+    'view_user'  		=> 'ดูผู้ใช้ :name',
+    'usercsv'			=> 'ไฟล์ CSV',
     );
diff --git a/app/lang/th/auth/message.php b/app/lang/th/auth/message.php
index 8148b126e9..53bc458069 100755
--- a/app/lang/th/auth/message.php
+++ b/app/lang/th/auth/message.php
@@ -2,35 +2,35 @@
 
 return array(
 
-    'account_already_exists' => 'An account with the this email already exists.',
-    'account_not_found'      => 'The email account or password is incorrect.',
-    'account_not_activated'  => 'This user account is not activated.',
-    'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
+    'account_already_exists' => 'อีเมลนี้มีการลงทะเบียนในระบบแล้ว',
+    'account_not_found'      => 'อีเมล์หรือรหัสผ่านไม่ถูกต้อง',
+    'account_not_activated'  => 'ชื่อผู้ใช้นี้ยังไม่ได้ทำการเปิดใช้งาน',
+    'account_suspended'      => 'บัญชีผู้ใช้นี้ถูกระงับการใช้งาน',
+    'account_banned'         => 'บัญชีผู้ใช้นี้ถูกห้ามใช้งาน',
 
     'signin' => array(
-        'error'   => 'There was a problem while trying to log you in, please try again.',
-        'success' => 'You have successfully logged in.',
+        'error'   => 'มีปัญหาขณะกำลังเข้าสู่ระบบ กรุณาลองอีกครั้ง',
+        'success' => 'คุณได้เข้าสู่ระบบเรียบร้อย',
     ),
 
     'signup' => array(
-        'error'   => 'There was a problem while trying to create your account, please try again.',
-        'success' => 'Account sucessfully created.',
+        'error'   => 'มีปัญหาในการเปิดใช้งานบัญชีผู้ใช้ของคุณ โปรดลองอีกครั้ง',
+        'success' => 'สร้างบัญชีผู้ใช้เสร็จเรียบร้อย',
     ),
 
         'forgot-password' => array(
-            'error'   => 'There was a problem while trying to get a reset password code, please try again.',
-            'success' => 'Password recovery email successfully sent.',
+            'error'   => 'มีปัญหาในการรับรหัสตั้งค่ารหัสผ่านใหม่ โปรดลองอีกครั้ง',
+            'success' => 'ส่งอีเมลตั้งค่ารหัสผ่านใหม่เรียบร้อย',
         ),
 
         'forgot-password-confirm' => array(
-            'error'   => 'There was a problem while trying to reset your password, please try again.',
-            'success' => 'Your password has been successfully reset.',
+            'error'   => 'มีปัญหาในการตั้งค่ารหัสผ่านใหม่ กรุณาลองอีกครั้ง',
+            'success' => 'รหัสผ่านบัญชีผู้ใช้ของคุณได้รับการตั้งค่าใหม่เรียบร้อยแล้ว',
         ),
 
     'activate' => array(
-        'error'   => 'There was a problem while trying to activate your account, please try again.',
-        'success' => 'Your account has been successfully activated.',
+        'error'   => 'มีปัญหาในการเปิดใช้งานบัญชีผู้ใช้ของคุณ โปรดลองอีกครั้ง',
+        'success' => 'บัญชีผู้ใช้ของคุณได้ถูกเปิดใช้งานเรียบร้อยแล้ว',
     ),
 
 );
diff --git a/app/lang/th/general.php b/app/lang/th/general.php
index d06e6c9c18..c6bec1b02d 100755
--- a/app/lang/th/general.php
+++ b/app/lang/th/general.php
@@ -25,7 +25,7 @@ return array(
     'changeemail'  			=> 'เปลี่ยนอีเมลแอดเดรส',
     'changepassword'  		=> 'เปลี่ยนรหัสผ่าน',
     'checkin'  				=> 'เช็คอิน',
-    'checkin_from'  		=> 'Checkin from',
+    'checkin_from'  		=> 'เช็คอินจาก',
     'checkout'  			=> 'เช็คเอาท์',
     'city'  				=> 'เมือง',
     'country'  				=> 'ประเทศ',
@@ -45,18 +45,18 @@ return array(
     'depreciation'			=> 'การเสื่อมราคา',
     'editprofile'  			=> 'แก้ไขโปรไฟล์ของคุณ',
     'eol'					=> 'อายุการใช้งาน',
-    'first'					=> 'First',
+    'first'					=> 'เริ่ม',
     'first_name'			=> 'ชื่อจริง',
     'file_name'				=> 'ไฟล์',
     'file_uploads'			=> 'อัปโหลดไฟล์',
-    'generate'				=> 'Generate',
+    'generate'				=> 'สร้าง',
     'groups'				=> 'กลุ่ม',
     'gravatar_email'        => 'อีเมลแอดเดรส Gravatar',
     'history_for'  			=> 'ประวัติของ',
     'id'  					=> 'ID',
     'image_delete'         	=> 'ลบรูปภาพประจำตัว',
     'image_upload'         	=> 'อัพโหลดภาพ',
-    'last'					=> 'Last',
+    'last'					=> 'สุดท้าย',
     'last_name'				=> 'นามสกุล',
     'license'				=> 'ลิขสิทธิ์',
     'license_report'        => 'รายงานลิขสิทธิ์',
@@ -72,47 +72,48 @@ return array(
     'months'				=> 'เดือน',
     'moreinfo'				=> 'ข้อมูลเพิ่มเติม',
     'name'					=> 'ชื่อ',
-    'next'					=> 'Next',
+    'next'					=> 'ถัด​ไป',
     'no_depreciation'		=> 'ไม่มีค่าเสื่อมราคา',
     'no_results'			=> 'ไม่มีผลการค้นหา',
     'no'  					=> 'ไม่',
     'notes'  				=> 'หมายเหตุ',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'page_menu'				=> 'กำลังแสดง_MENU_รายการ',
+    'pagination_info'		=> 'กำลังแสดง_START_ถึง_END_จากทั้งหมด_TOTAL_รายการ',
     'pending'				=> 'กําลังดำเนินการ',
     'people'				=> 'ผู้คน',
     'per_page'				=> 'ผลการค้นหาต่อหน้า',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
+    'previous'				=> 'ก่อนหน้า',
+    'processing'			=> 'กำลังดำเนินการ',
     'profile'				=> 'โปรไฟล์ของคุณ',
     'ready_to_deploy'		=> 'พร้อมใช้งาน',
-    'recent_activity'		=> 'Recent Activity',
+    'recent_activity'		=> 'กิจกรรมล่าสุด',
     'reports'				=> 'รายงาน',
     'save'  				=> 'บันทึก',
-    'select'				=> 'Select',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date',
+    'select'				=> 'เลือก',
+    'search'				=> 'Search',
+    'select_depreciation'	=> 'เลือกประเภทค่าเสื่อมราคา',
+    'select_location'		=> 'เลือกที่ตั้ง',
+    'select_manufacturer'	=> 'เลือกผู้ผลิต',
+    'select_model'			=> 'เลือกรุ่น',
+    'select_supplier'		=> 'เลือกผู้จัดจำหน่าย',
+    'select_user'			=> 'เลือกผู้ใช้',
+    'select_date'			=> 'เลือกวันที่',
     'settings'				=> 'การตั้งค่า',
     'sign_in'				=> 'ลงชื่อเข้าใช้',
     'site_name'				=> 'ชื่อไซต์',
     'state'  				=> 'รัฐ',
-    'status_labels'			=> 'Status Labels',
+    'status_labels'			=> 'ป้ายสถานะ',
     'status'    			=> 'สถานะ',
     'suppliers'  			=> 'ตัวแทนจำหน่าย',
     'total_assets'			=> 'ทรัพย์สินทั้งหมด',
     'total_licenses'		=> 'ลิขสิทธิ์ทั้งหมด',
     'type'  				=> 'ประเภท',
     'undeployable'			=> 'ไม่สามารถใช้งานได้',
-    'unknown_admin'			=> 'Unknown Admin',
-    'uploaded'              => 'Uploaded',
+    'unknown_admin'			=> 'ผู้ดูแลระบบที่ไม่รู้จัก',
+    'uploaded'              => 'อัพโหลด',
     'user'					=> 'ผู้ใช้',
     'users'                 => 'ผู้ใช้',
-    'viewassets'  			=> 'View Assigned Assets',
+    'viewassets'  			=> 'ดูทรัพย์สินที่มอบหมาย',
     'website'               => 'เว็บไซต์',
     'welcome'				=> 'ยินดีต้อนรับ, :name',
     'years'					=> 'ปี',
diff --git a/app/lang/vi/general.php b/app/lang/vi/general.php
index fe30d64df0..32e483f061 100755
--- a/app/lang/vi/general.php
+++ b/app/lang/vi/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> 'Reports',
     'save'  				=> 'Save',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
diff --git a/app/lang/zh-CN/general.php b/app/lang/zh-CN/general.php
index fb9908acfe..5a761b7d7f 100755
--- a/app/lang/zh-CN/general.php
+++ b/app/lang/zh-CN/general.php
@@ -90,6 +90,7 @@ return array(
     'reports'				=> '报告',
     'save'  				=> '保存​​',
     'select'				=> 'Select',
+    'search'				=> 'Search',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',

From 2e0fa9126aef122a1a7ed5fa8fe990fadcdb3616 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Tue, 14 Apr 2015 10:02:37 +0930
Subject: [PATCH 13/22] Add dashboard to side navigation

---
 app/views/backend/layouts/default.blade.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
index 36034c1ed2..62202888b7 100644
--- a/app/views/backend/layouts/default.blade.php
+++ b/app/views/backend/layouts/default.blade.php
@@ -248,6 +248,9 @@
     <div id="sidebar-nav">
         <ul id="dashboard-menu">
 			@if(Sentry::getUser()->hasAccess('admin'))
+			<li{{ (Request::is('*/') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
+                <a href="/"><i class="fa fa-dashboard"></i><span>Dashboard</span></a>
+            </li>
             <li{{ (Request::is('hardware*') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
                 <a href="{{ URL::to('hardware') }}" class="dropdown-toggle">
                     <i class="fa fa-barcode"></i>

From 6cb70e865e90cd61cc7bcbb787a1dd13b092cf6a Mon Sep 17 00:00:00 2001
From: Daniel Nemanic <daniel.nemanic@gmail.com>
Date: Tue, 14 Apr 2015 10:56:58 +0200
Subject: [PATCH 14/22] Update layout.css

To avoid screen resolution errors on printing, added the @media attribute.
---
 public/assets/css/compiled/layout.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/assets/css/compiled/layout.css b/public/assets/css/compiled/layout.css
index ae0062155f..236ebc38e5 100644
--- a/public/assets/css/compiled/layout.css
+++ b/public/assets/css/compiled/layout.css
@@ -2,4 +2,6 @@
 This file has been generated with SiteFlow (http://siteflow.witiz.com).
 To remove this comment, please support us and upgrade to SiteFlow Pro.
 */
-body{font-family:'Open Sans', sans-serif;background-color:#f7f7f7;position:relative;margin:0px;font-size:12px;padding:0px}h1,h2,h3,h4,h5{margin:0;line-height:inherit;color:#29323d}h1 small,h2 small,h3 small,h4 small,h5 small{margin-left:15px;font-style:italic}body.menu{overflow-x:hidden}body.menu .content{margin-left:165px;position:fixed;width:850px}body.menu #sidebar-nav{position:absolute;left:0;border-right:0px;box-shadow:none}input.search{background:url("../../img/lens.png") #fcfcfc no-repeat 95%;box-shadow:none;height:25px;width:220px;font-size:13px;padding:2px 6px;border:1px solid #d0dde9;margin:0;border-radius:2px;top:11px}.header{margin-bottom:25px}.header h1,.header h2,.header h3,.header h4,.header h5{float:left;margin-top:5px}.navbar-inverse input.search{height:27px;width:220px;padding:3px 6px;background:url("../../img/lens.png") #0f1217 no-repeat 95%;border:1px solid #0f1217;position:relative;border-radius:4px;top:9px;color:#000;font-size:13px;margin-right:40px;-webkit-transition:all .3s linear;-moz-transition:all .3s linear;transition:all .3s linear}.navbar-inverse input.search:focus{background-color:#fff;border:0}.navbar-inverse .settings i{color:#9ba3ad;font-size:21px}.navbar-inverse .notification-dropdown{position:relative}.navbar-inverse .notification-dropdown>a:hover,.navbar-inverse .notification-dropdown>a.active{background:#254261 !important;box-shadow:inset 1px 0px 1px 0px #3e5a79}.navbar-inverse .notification-dropdown i{font-size:17px;color:#9ba3ad}.navbar-inverse .notification-dropdown .count{position:absolute;top:1px;left:58%;background:#35bac4;padding:0px 5px;border-radius:30px;color:#fff;line-height:16px;z-index:9999;text-align:center;font-size:11px}.navbar-inverse .pop-dialog{position:absolute;right:-10px;top:55px;display:none}.navbar-inverse .pop-dialog.is-visible{display:block;-webkit-animation:reveal .2s ease-out;-moz-animation:reveal .2s ease-out;animation:reveal .2s ease-out}.navbar-inverse .pop-dialog .body{box-shadow:0px 1px 9px 1px #c2c2c2}.navbar-inverse .pop-dialog .close-icon{float:right;text-decoration:none;z-index:9999;position:relative}.navbar-inverse .pop-dialog .footer{border-top:1px solid #e6e8e9;background-color:#eff4f7;margin:15px 0px -10px 0px;border-radius:0px 0px 5px 5px;padding:12px 20px;text-align:center}.navbar-inverse .pop-dialog .footer a{font-weight:600;color:#7d91a8}.navbar-inverse .pop-dialog .notifications{width:330px;margin:10px -10px 0px -10px}.navbar-inverse .pop-dialog .notifications h3{font-size:13px;color:#404951;font-weight:bold;padding-left:20px;margin-top:5px;margin-bottom:15px}.navbar-inverse .pop-dialog .notifications .item{display:block;padding:10px 0px 8px 20px;border-top:1px solid #e7e8ea;color:#363636;text-decoration:none;padding-left:50px;position:relative;transition:all .25s linear;-moz-transition:all .25s linear;-webkit-transition:all .25s linear;-o-transition:all .25s linear}.navbar-inverse .pop-dialog .notifications .item:hover{background:#f0f6ff}.navbar-inverse .pop-dialog .notifications .item>i{color:#fc827b;position:absolute;left:19px;font-size:18px}.navbar-inverse .pop-dialog .notifications .item>i.icon-user{left:18px}.navbar-inverse .pop-dialog .notifications .item .time{float:right;color:#82a3c1;font-style:italic;font-weight:600;font-size:11px;min-width:60px;margin-right:5px}.navbar-inverse .pop-dialog .notifications .item .time i{font-size:13px;color:#cfcfcf;margin-right:1px}.navbar-inverse .pop-dialog .messages{width:325px;margin:10px -10px 0px -10px}.navbar-inverse .pop-dialog .messages .item{display:block;padding:10px 20px 15px 20px;height:80px;border-bottom:1px solid #e7e8ea;color:#363636;text-decoration:none;position:relative;transition:all .25s linear;-moz-transition:all .25s linear;-webkit-transition:all .25s linear;-o-transition:all .25s linear}.navbar-inverse .pop-dialog .messages .item.last{border-bottom:0px}.navbar-inverse .pop-dialog .messages .item:hover{background:#f0f6ff}.navbar-inverse .pop-dialog .messages .item .display{float:left;border-radius:50px;margin-right:15px}.navbar-inverse .pop-dialog .messages .item .name{font-size:12px;color:#404951;font-weight:bold}.navbar-inverse .pop-dialog .messages .item .msg{font-size:11px;color:#636363;line-height:13px;position:relative;top:2px}.navbar-inverse .pop-dialog .messages .item .time{position:absolute;right:0px;bottom:6px;color:#82a3c1;font-style:italic;font-weight:600;font-size:11px;min-width:60px;margin-right:5px}.navbar-inverse .pop-dialog .messages .item .time i{font-size:13px;color:#cfcfcf;margin-right:1px}.navbar-inverse .pop-dialog .messages .footer{margin-top:6px}#sidebar-nav{position:absolute;width:180px;float:left;margin:0em;padding-top:5.8em}#sidebar-nav #dashboard-menu{list-style:none;padding-right:15px;padding-left:15px;margin-bottom:0;margin-left:20px}#sidebar-nav #dashboard-menu>li>a{display:block;padding:19px 14px 15px 14px;margin-left:-15px;margin-bottom:5px;border-bottom:1px solid #dae1e8;box-shadow:0 2px 1px -1px #FFFFFF;color:#6e829b;outline:0px;line-height:21px}#sidebar-nav #dashboard-menu>li{position:relative}#sidebar-nav #dashboard-menu>li .icon-group{font-size:22px}#sidebar-nav #dashboard-menu>li i{font-size:23px;top:17px}#sidebar-nav #dashboard-menu>li:hover i{opacity:1}#sidebar-nav #dashboard-menu>li.active>a,#sidebar-nav #dashboard-menu>li>a:hover{color:#33455a;text-decoration:none}#sidebar-nav #dashboard-menu>li.active a{font-weight:600;text-shadow:1px 1px 1px #fff}#sidebar-nav #dashboard-menu>li.active i{opacity:1}#sidebar-nav #dashboard-menu .pointer{position:absolute;right:9px;top:20px}#sidebar-nav #dashboard-menu .pointer .arrow,#sidebar-nav #dashboard-menu .pointer .arrow_border{border-color:transparent #fff transparent transparent;border-width:11px;border-style:solid;font-size:0;left:50%;line-height:0;margin:0 auto;position:absolute;top:0;width:0;z-index:1002;left:0;margin-left:45%}#sidebar-nav #dashboard-menu .pointer .arrow_border{border-color:transparent #c0d2dd transparent transparent;border-width:11px;margin-left:-1px;border-style:solid;z-index:1001;top:0px}#sidebar-nav #dashboard-menu a span{margin-left:35px;transition:color .1s linear;-moz-transition:color .1s linear;-webkit-transition:color .1s linear;-o-transition:color .1s linear}#sidebar-nav #dashboard-menu a.ui-elements span{margin-left:25px}#sidebar-nav #dashboard-menu a i{position:absolute;left:0;height:24px;width:24px;opacity:0.7;transition:opacity .1s ease;-moz-transition:opacity .1s ease;-webkit-transition:opacity .1s ease;-o-transition:opacity .1s ease}#sidebar-nav #dashboard-menu a i.icon-chevron-down{position:relative;float:right;top:5px;font-size:11px;color:#686868;width:initial;height:initial}#sidebar-nav #dashboard-menu>li.active .dropdown-toggle{border-bottom:0px;box-shadow:none}#sidebar-nav #dashboard-menu ul.submenu{list-style-type:none;display:none;margin-top:7px;margin-bottom:15px;margin-right:5px;margin-left:-15px;padding-left:15px;border-bottom:1px solid #dae1e8;box-shadow:0 2px 1px -1px #FFFFFF;padding-bottom:10px}#sidebar-nav #dashboard-menu ul.submenu.active{display:block}#sidebar-nav #dashboard-menu ul.submenu a{font-weight:normal;font-size:13px;color:#4c535a;text-decoration:none;display:block;margin-bottom:7px}#sidebar-nav #dashboard-menu ul.submenu a:hover{text-decoration:underline}#sidebar-nav #dashboard-menu ul.submenu a.active{font-weight:bold;text-shadow:none}#pad-wrapper{padding:0px 50px;margin-top:15px}#pad-wrapper h4{color:#696d73;font-style:italic}.content{min-width:400px;min-height:620px;margin-bottom:20px;padding-bottom:50px;overflow:hidden;position:relative;background:#fff;margin-left:177px;border-left:1px solid #dae3e9;border-bottom:1px solid #dae3e9;box-shadow:-3px 3px 3px -2px #f1f1f3;border-radius:0px 0px 0px 5px;-webkit-transition:margin-left .3s ease;-moz-transition:margin-left .3s ease;-o-transition:margin-left .3s ease;-ms-transition:margin-left .3s ease;transition:margin-left .3s ease}.content.wide-content{margin-left:0;border-radius:0}.content .skins-nav{opacity:1;-webkit-transition:right .3s;-moz-transition:right .3s;-ms-transition:right .3s;-o-transition:right .3s;transition:right .3s;position:fixed;right:-88px;top:135px;font-size:13px;z-index:9999}.content .skins-nav:hover{right:0}.content .skins-nav a{display:block;color:#fff;text-decoration:none;padding-left:10px;height:37px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;margin-bottom:3px;-webkit-transition:all .5s;-moz-transition:all .5s;-ms-transition:all .5s;-o-transition:all .5s;transition:all .5s}.content .skins-nav a.first_nav{background:rgba(95,175,228,0.8)}.content .skins-nav a.first_nav:hover{background:#5fafe4}.content .skins-nav a.second_nav{background:rgba(36,43,77,0.8)}.content .skins-nav a.second_nav:hover{background:#242b4d}.content .skins-nav a .icon{float:left;width:9px;height:10px;background:url("../../img/skin-nav-bullets.png") 0 0 no-repeat;margin:15px 15px 0 5px}.content .skins-nav a.selected .icon{background-position:0 -9px}.content .skins-nav a .text{padding-right:12px;white-space:nowrap;display:block;width:115px;position:relative;top:9px;-webkit-transition:width .2s;-moz-transition:width .2s;-ms-transition:width .2s;-o-transition:width .2s;transition:width .2s}@media (max-width: 768px){#pad-wrapper{padding:0px 15px}.content{min-width:0px;margin:0}#dashboard-menu .pointer{display:none}#sidebar-nav{left:-200px;position:fixed;z-index:9999;background-color:#f7f7f7;padding-top:0px;border-right:1px solid #ccc;width:165px;box-shadow:1px 1px 4px 1px #e9e9e9;-webkit-transition:left .3s ease;-moz-transition:left .3s ease;-o-transition:left .3s ease;-ms-transition:left .3s ease;transition:left .3s ease}#sidebar-nav #dashboard-menu{margin-left:10px}#sidebar-nav #dashboard-menu li a span{visibility:visible}#sidebar-nav #dashboard-menu li:last-child a{border-bottom:0px;box-shadow:none}}@media (max-width: 822px){.navbar-inverse input.search{display:none}}@media (max-width: 767px){#main-stats .stat{width:50%;float:left}}.alert-msg{color:#b94a48}
+@media screen {
+  body{font-family:'Open Sans', sans-serif;background-color:#f7f7f7;position:relative;margin:0px;font-size:12px;padding:0px}h1,h2,h3,h4,h5{margin:0;line-height:inherit;color:#29323d}h1 small,h2 small,h3 small,h4 small,h5 small{margin-left:15px;font-style:italic}body.menu{overflow-x:hidden}body.menu .content{margin-left:165px;position:fixed;width:850px}body.menu #sidebar-nav{position:absolute;left:0;border-right:0px;box-shadow:none}input.search{background:url("../../img/lens.png") #fcfcfc no-repeat 95%;box-shadow:none;height:25px;width:220px;font-size:13px;padding:2px 6px;border:1px solid #d0dde9;margin:0;border-radius:2px;top:11px}.header{margin-bottom:25px}.header h1,.header h2,.header h3,.header h4,.header h5{float:left;margin-top:5px}.navbar-inverse input.search{height:27px;width:220px;padding:3px 6px;background:url("../../img/lens.png") #0f1217 no-repeat 95%;border:1px solid #0f1217;position:relative;border-radius:4px;top:9px;color:#000;font-size:13px;margin-right:40px;-webkit-transition:all .3s linear;-moz-transition:all .3s linear;transition:all .3s linear}.navbar-inverse input.search:focus{background-color:#fff;border:0}.navbar-inverse .settings i{color:#9ba3ad;font-size:21px}.navbar-inverse .notification-dropdown{position:relative}.navbar-inverse .notification-dropdown>a:hover,.navbar-inverse .notification-dropdown>a.active{background:#254261 !important;box-shadow:inset 1px 0px 1px 0px #3e5a79}.navbar-inverse .notification-dropdown i{font-size:17px;color:#9ba3ad}.navbar-inverse .notification-dropdown .count{position:absolute;top:1px;left:58%;background:#35bac4;padding:0px 5px;border-radius:30px;color:#fff;line-height:16px;z-index:9999;text-align:center;font-size:11px}.navbar-inverse .pop-dialog{position:absolute;right:-10px;top:55px;display:none}.navbar-inverse .pop-dialog.is-visible{display:block;-webkit-animation:reveal .2s ease-out;-moz-animation:reveal .2s ease-out;animation:reveal .2s ease-out}.navbar-inverse .pop-dialog .body{box-shadow:0px 1px 9px 1px #c2c2c2}.navbar-inverse .pop-dialog .close-icon{float:right;text-decoration:none;z-index:9999;position:relative}.navbar-inverse .pop-dialog .footer{border-top:1px solid #e6e8e9;background-color:#eff4f7;margin:15px 0px -10px 0px;border-radius:0px 0px 5px 5px;padding:12px 20px;text-align:center}.navbar-inverse .pop-dialog .footer a{font-weight:600;color:#7d91a8}.navbar-inverse .pop-dialog .notifications{width:330px;margin:10px -10px 0px -10px}.navbar-inverse .pop-dialog .notifications h3{font-size:13px;color:#404951;font-weight:bold;padding-left:20px;margin-top:5px;margin-bottom:15px}.navbar-inverse .pop-dialog .notifications .item{display:block;padding:10px 0px 8px 20px;border-top:1px solid #e7e8ea;color:#363636;text-decoration:none;padding-left:50px;position:relative;transition:all .25s linear;-moz-transition:all .25s linear;-webkit-transition:all .25s linear;-o-transition:all .25s linear}.navbar-inverse .pop-dialog .notifications .item:hover{background:#f0f6ff}.navbar-inverse .pop-dialog .notifications .item>i{color:#fc827b;position:absolute;left:19px;font-size:18px}.navbar-inverse .pop-dialog .notifications .item>i.icon-user{left:18px}.navbar-inverse .pop-dialog .notifications .item .time{float:right;color:#82a3c1;font-style:italic;font-weight:600;font-size:11px;min-width:60px;margin-right:5px}.navbar-inverse .pop-dialog .notifications .item .time i{font-size:13px;color:#cfcfcf;margin-right:1px}.navbar-inverse .pop-dialog .messages{width:325px;margin:10px -10px 0px -10px}.navbar-inverse .pop-dialog .messages .item{display:block;padding:10px 20px 15px 20px;height:80px;border-bottom:1px solid #e7e8ea;color:#363636;text-decoration:none;position:relative;transition:all .25s linear;-moz-transition:all .25s linear;-webkit-transition:all .25s linear;-o-transition:all .25s linear}.navbar-inverse .pop-dialog .messages .item.last{border-bottom:0px}.navbar-inverse .pop-dialog .messages .item:hover{background:#f0f6ff}.navbar-inverse .pop-dialog .messages .item .display{float:left;border-radius:50px;margin-right:15px}.navbar-inverse .pop-dialog .messages .item .name{font-size:12px;color:#404951;font-weight:bold}.navbar-inverse .pop-dialog .messages .item .msg{font-size:11px;color:#636363;line-height:13px;position:relative;top:2px}.navbar-inverse .pop-dialog .messages .item .time{position:absolute;right:0px;bottom:6px;color:#82a3c1;font-style:italic;font-weight:600;font-size:11px;min-width:60px;margin-right:5px}.navbar-inverse .pop-dialog .messages .item .time i{font-size:13px;color:#cfcfcf;margin-right:1px}.navbar-inverse .pop-dialog .messages .footer{margin-top:6px}#sidebar-nav{position:absolute;width:180px;float:left;margin:0em;padding-top:5.8em}#sidebar-nav #dashboard-menu{list-style:none;padding-right:15px;padding-left:15px;margin-bottom:0;margin-left:20px}#sidebar-nav #dashboard-menu>li>a{display:block;padding:19px 14px 15px 14px;margin-left:-15px;margin-bottom:5px;border-bottom:1px solid #dae1e8;box-shadow:0 2px 1px -1px #FFFFFF;color:#6e829b;outline:0px;line-height:21px}#sidebar-nav #dashboard-menu>li{position:relative}#sidebar-nav #dashboard-menu>li .icon-group{font-size:22px}#sidebar-nav #dashboard-menu>li i{font-size:23px;top:17px}#sidebar-nav #dashboard-menu>li:hover i{opacity:1}#sidebar-nav #dashboard-menu>li.active>a,#sidebar-nav #dashboard-menu>li>a:hover{color:#33455a;text-decoration:none}#sidebar-nav #dashboard-menu>li.active a{font-weight:600;text-shadow:1px 1px 1px #fff}#sidebar-nav #dashboard-menu>li.active i{opacity:1}#sidebar-nav #dashboard-menu .pointer{position:absolute;right:9px;top:20px}#sidebar-nav #dashboard-menu .pointer .arrow,#sidebar-nav #dashboard-menu .pointer .arrow_border{border-color:transparent #fff transparent transparent;border-width:11px;border-style:solid;font-size:0;left:50%;line-height:0;margin:0 auto;position:absolute;top:0;width:0;z-index:1002;left:0;margin-left:45%}#sidebar-nav #dashboard-menu .pointer .arrow_border{border-color:transparent #c0d2dd transparent transparent;border-width:11px;margin-left:-1px;border-style:solid;z-index:1001;top:0px}#sidebar-nav #dashboard-menu a span{margin-left:35px;transition:color .1s linear;-moz-transition:color .1s linear;-webkit-transition:color .1s linear;-o-transition:color .1s linear}#sidebar-nav #dashboard-menu a.ui-elements span{margin-left:25px}#sidebar-nav #dashboard-menu a i{position:absolute;left:0;height:24px;width:24px;opacity:0.7;transition:opacity .1s ease;-moz-transition:opacity .1s ease;-webkit-transition:opacity .1s ease;-o-transition:opacity .1s ease}#sidebar-nav #dashboard-menu a i.icon-chevron-down{position:relative;float:right;top:5px;font-size:11px;color:#686868;width:initial;height:initial}#sidebar-nav #dashboard-menu>li.active .dropdown-toggle{border-bottom:0px;box-shadow:none}#sidebar-nav #dashboard-menu ul.submenu{list-style-type:none;display:none;margin-top:7px;margin-bottom:15px;margin-right:5px;margin-left:-15px;padding-left:15px;border-bottom:1px solid #dae1e8;box-shadow:0 2px 1px -1px #FFFFFF;padding-bottom:10px}#sidebar-nav #dashboard-menu ul.submenu.active{display:block}#sidebar-nav #dashboard-menu ul.submenu a{font-weight:normal;font-size:13px;color:#4c535a;text-decoration:none;display:block;margin-bottom:7px}#sidebar-nav #dashboard-menu ul.submenu a:hover{text-decoration:underline}#sidebar-nav #dashboard-menu ul.submenu a.active{font-weight:bold;text-shadow:none}#pad-wrapper{padding:0px 50px;margin-top:15px}#pad-wrapper h4{color:#696d73;font-style:italic}.content{min-width:400px;min-height:620px;margin-bottom:20px;padding-bottom:50px;overflow:hidden;position:relative;background:#fff;margin-left:177px;border-left:1px solid #dae3e9;border-bottom:1px solid #dae3e9;box-shadow:-3px 3px 3px -2px #f1f1f3;border-radius:0px 0px 0px 5px;-webkit-transition:margin-left .3s ease;-moz-transition:margin-left .3s ease;-o-transition:margin-left .3s ease;-ms-transition:margin-left .3s ease;transition:margin-left .3s ease}.content.wide-content{margin-left:0;border-radius:0}.content .skins-nav{opacity:1;-webkit-transition:right .3s;-moz-transition:right .3s;-ms-transition:right .3s;-o-transition:right .3s;transition:right .3s;position:fixed;right:-88px;top:135px;font-size:13px;z-index:9999}.content .skins-nav:hover{right:0}.content .skins-nav a{display:block;color:#fff;text-decoration:none;padding-left:10px;height:37px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;margin-bottom:3px;-webkit-transition:all .5s;-moz-transition:all .5s;-ms-transition:all .5s;-o-transition:all .5s;transition:all .5s}.content .skins-nav a.first_nav{background:rgba(95,175,228,0.8)}.content .skins-nav a.first_nav:hover{background:#5fafe4}.content .skins-nav a.second_nav{background:rgba(36,43,77,0.8)}.content .skins-nav a.second_nav:hover{background:#242b4d}.content .skins-nav a .icon{float:left;width:9px;height:10px;background:url("../../img/skin-nav-bullets.png") 0 0 no-repeat;margin:15px 15px 0 5px}.content .skins-nav a.selected .icon{background-position:0 -9px}.content .skins-nav a .text{padding-right:12px;white-space:nowrap;display:block;width:115px;position:relative;top:9px;-webkit-transition:width .2s;-moz-transition:width .2s;-ms-transition:width .2s;-o-transition:width .2s;transition:width .2s}@media (max-width: 768px){#pad-wrapper{padding:0px 15px}.content{min-width:0px;margin:0}#dashboard-menu .pointer{display:none}#sidebar-nav{left:-200px;position:fixed;z-index:9999;background-color:#f7f7f7;padding-top:0px;border-right:1px solid #ccc;width:165px;box-shadow:1px 1px 4px 1px #e9e9e9;-webkit-transition:left .3s ease;-moz-transition:left .3s ease;-o-transition:left .3s ease;-ms-transition:left .3s ease;transition:left .3s ease}#sidebar-nav #dashboard-menu{margin-left:10px}#sidebar-nav #dashboard-menu li a span{visibility:visible}#sidebar-nav #dashboard-menu li:last-child a{border-bottom:0px;box-shadow:none}}@media (max-width: 822px){.navbar-inverse input.search{display:none}}@media (max-width: 767px){#main-stats .stat{width:50%;float:left}}.alert-msg{color:#b94a48}
+}

From 61eda122e4f90f78621021cad2ea40a11bde2544 Mon Sep 17 00:00:00 2001
From: Daniel Nemanic <daniel.nemanic@gmail.com>
Date: Tue, 14 Apr 2015 11:00:09 +0200
Subject: [PATCH 15/22] Update print.css

Added @media print for printing and .table-responsive {overflow: hidden;} to avoid table scrollbars.
---
 public/assets/css/compiled/print.css | 29 +++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/public/assets/css/compiled/print.css b/public/assets/css/compiled/print.css
index bff9a09df0..f867c493c0 100644
--- a/public/assets/css/compiled/print.css
+++ b/public/assets/css/compiled/print.css
@@ -1,15 +1,18 @@
-body {margin:0; padding:0; line-height: 1.4em; word-spacing:1px; letter-spacing:0.2px; font: 13px Arial, Helvetica,"Lucida Grande", serif; color: #000; width:auto}
+@media print {
+  body {margin:0; padding:0; line-height: 1.4em; word-spacing:1px; letter-spacing:0.2px; font: 13px Arial, Helvetica,"Lucida Grande", serif; color: #000; width:auto}
+  
+  .content a:link:after, #content a:visited:after {
+    content: "";
+  }
+  /*Remove Element*/
+  #footer, .footer, .navbar, navbar-header, .nav, .navbar-nav, .navbar-right, #sidebar-nav, .btn, .btn-flat, .dataTables_length, .dataTables_filter, .paginate_button, .dataTables_info  {display:none;}
+  
+  .content {margin-left: 10px; border: 0px; width:auto}
+  
+  .col-md-9, .col-md-3 { width: 100%; }
+
+  .table-responsive {overflow: hidden;}
+  
+  .header{ margin-bottom: 10px; }
 
-.content a:link:after, #content a:visited:after {
-  content: "";
 }
-/*Remove Element*/
-#footer, .footer, .navbar, navbar-header, .nav, .navbar-nav, .navbar-right, #sidebar-nav, .btn, .btn-flat, .dataTables_length, .dataTables_filter, .paginate_button, .dataTables_info  {display:none;}
-
-
-.content {margin-left: 10px; border: 0px; width:auto}
-
-.col-md-9, .col-md-3 { width: 100%; }
-
-.header{ margin-bottom: 10px; }
-

From fe721394102701cfe76d3e043abcb5817f0ffd33 Mon Sep 17 00:00:00 2001
From: Daniel Nemanic <daniel.nemanic@gmail.com>
Date: Wed, 15 Apr 2015 09:05:02 +0200
Subject: [PATCH 16/22] Update view.blade.php

Added class="img-responsive" to Model Image on Line 116.
---
 app/views/backend/models/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php
index 67e864b49b..1ab2361d95 100755
--- a/app/views/backend/models/view.blade.php
+++ b/app/views/backend/models/view.blade.php
@@ -113,7 +113,7 @@
                                 @endif
 
                                 @if ($model->image)
-                                <li><br /><img src="/uploads/models/{{{ $model->image }}}" /></li>
+                                <li><br /><img src="/uploads/models/{{{ $model->image }}}" class="img-responsive" /></li>
                                 @endif
                                    
                                 @if  ($model->deleted_at!='')

From 30c8fffa0a58e7a3501aaa2413b2e60df914e0c6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 Apr 2015 09:51:48 -0700
Subject: [PATCH 17/22] Loading string

---
 app/config/version.php  | 4 ++--
 app/lang/en/general.php | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 121c607fd0..43122d5e94 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-187',
-  'hash_version' => 'v1.2.6.1-187-ge88a811',
+  'app_version' => 'v1.2.6.1-195',
+  'hash_version' => 'v1.2.6.1-195-g9de083a',
 );
\ No newline at end of file
diff --git a/app/lang/en/general.php b/app/lang/en/general.php
index 32e483f061..795c5e2772 100755
--- a/app/lang/en/general.php
+++ b/app/lang/en/general.php
@@ -63,6 +63,7 @@ return array(
     'licenses_available'	=> 'licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
+    'loading'				=> 'Loading',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',

From ba58e718b4af2e2f60138e0b6fb3f6f6985f30e0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 16 Apr 2015 22:18:35 -0700
Subject: [PATCH 18/22] Resolved some deps from vendor changes

---
 app/config/version.php | 4 ++--
 composer.json          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 43122d5e94..2b809339e5 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-195',
-  'hash_version' => 'v1.2.6.1-195-g9de083a',
+  'app_version' => 'v1.2.6.1-206',
+  'hash_version' => 'v1.2.6.1-206-ga560d4d',
 );
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 45a7dd7965..0977a572b4 100755
--- a/composer.json
+++ b/composer.json
@@ -12,17 +12,17 @@
     	"mtdowling/classpreloader":"1.0.*"
 	},
 	"require": {
-		"classpreloader/classpreloader": "1.2.0",
+		"classpreloader/classpreloader": "1.*",
 		"symfony/console": "~2",
         "symfony/yaml": "~2",
         "symfony/config": "~2",
         "symfony/stopwatch": "~2",
-		"laravel/framework": "4.2.*",
+		"laravel/framework": "4.2.17",
 		"doctrine/dbal": "v2.4.2",
 		"cartalyst/sentry": "2.1.5",
 		"barryvdh/laravel-debugbar": "1.x",
 		"chumper/datatable": "2.3.*",
-		"dinesh/barcode": "dev-master",
+		"dinesh/barcode": "4.0.*@dev",
 		"intervention/image": "dev-master",
 		"league/csv": "~7.0",
 		"erusev/parsedown": "dev-master"

From c6419e1c0742c25fbb9febdbdbc41d3731805ed5 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Fri, 17 Apr 2015 16:01:44 +0930
Subject: [PATCH 19/22] Update link to Documentation in footer

---
 app/views/backend/layouts/default.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
index 62202888b7..2d53de3538 100644
--- a/app/views/backend/layouts/default.blade.php
+++ b/app/views/backend/layouts/default.blade.php
@@ -402,7 +402,7 @@
 					  		project by
 					  			<a target="_blank" href="http://twitter.com/snipeyhead">@snipeyhead</a>.
 						  		<a target="_blank" href="https://github.com/snipe/snipe-it">Fork it</a> |
-						  		<a target="_blank" href="http://docs.snipeitapp.com/">Documentation</a> |
+						  		<a target="_blank" href="http://snipeitapp.com/documentation/">Documentation</a> |
 						  		<a href="https://crowdin.com/project/snipe-it">Help Translate It! </a> |
 						  		<a target="_blank" href="https://github.com/snipe/snipe-it/issues?state=open">Report a Bug</a>
 						  		 &nbsp; &nbsp; ({{{  Config::get('version.app_version') }}})

From f8ea40d3d122ad2959a756f2d27abded284f959d Mon Sep 17 00:00:00 2001
From: Ivar Nesje <ivarne@gmail.com>
Date: Tue, 21 Apr 2015 09:11:43 +0200
Subject: [PATCH 20/22] Delete .bash_history

This file does not look like a natural part of the project.
---
 .bash_history | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100755 .bash_history

diff --git a/.bash_history b/.bash_history
deleted file mode 100755
index 198b1084ea..0000000000
--- a/.bash_history
+++ /dev/null
@@ -1,37 +0,0 @@
-ls
-pwd
-cd app
-ls
-cd views/
-cd backend/
-ls
-cd users/
-ls
-vi view.blade.php 
-ls -alF
-cd
-pwd
-ls -alF
-pwd
-cd app
-ls
-cd views/
-cd backend/
-cd users/
-ls
-ls -alF
-chown snipeitftp view.blade.php
-sudo chown snipeitftp view.blade.php
-pwd
-ls
-vi view.blade.php
-set noswapfile
-set nobackup
-vi view.blade.php
-touch delete.me
-vi delete.me
-ls
-ls -alF
-touch view.blade.php
-touch index.blade.php
-vi view.blade.php

From 1c2e5ecc0f9460bc23f3c0e6ee44774263d08bd6 Mon Sep 17 00:00:00 2001
From: Fei Song <wp.southwolf@gmail.com>
Date: Tue, 28 Apr 2015 15:19:00 +0800
Subject: [PATCH 21/22] Remove space after concat to fix SQL FUNCTION CONCAT
 NOT EXIST error

---
 app/controllers/admin/AssetsController.php   | 4 ++--
 app/controllers/admin/LicensesController.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index fe2e40cf68..8a9ab7dc93 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -64,7 +64,7 @@ class AssetsController extends AdminController
 
 
         $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
+        $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
         $location_list = array('' => Lang::get('general.select_location')) + Location::orderBy('name', 'asc')->lists('name', 'id');
 
 
@@ -626,7 +626,7 @@ class AssetsController extends AdminController
 
         // get depreciation list
         $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
+        $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
 
         $asset = clone $asset_to_clone;
         $asset->id = null;
diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php
index 94a6196ce5..814447fa31 100755
--- a/app/controllers/admin/LicensesController.php
+++ b/app/controllers/admin/LicensesController.php
@@ -405,7 +405,7 @@ class LicensesController extends AdminController
             ->leftJoin('users', 'users.id', '=', 'assets.assigned_to')
             ->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'))
+            DB::raw('concat(first_name," ",last_name) as full_name, assets.id as id, models.name as modelname'))
             ->whereNull('assets.deleted_at')
             ->get();
 

From c0a58897c06b7837e545ba7f1c7027810f49ced7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 28 Apr 2015 13:19:13 -0700
Subject: [PATCH 22/22] Re-re-trying --prefer-source --no-interaction

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f708c0aa51..e3d66dd232 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_script:
   - 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
+  - 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