Merge pull request #10165 from snipe/fixes/set_restore_actions_to_POST_requests

Set restore actions to POST requests instead of GET

app/Http/Controllers/Api/AssetModelsController.php

@@ -67,7 +67,7 @@ class AssetModelsController extends Controller
 
 
 
-        if ($request->filled('status')) {
+        if ($request->input('status')=='deleted') {
             $assetmodels->onlyTrashed();
         }
 

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -32,7 +32,8 @@ class BulkAssetsController extends Controller
             return redirect()->back()->with('error', 'No assets selected');
         }
 
-        $asset_ids = array_keys($request->input('ids'));
+        
+        $asset_ids = array_values(array_unique($request->input('ids')));
 
         if ($request->filled('bulk_actions')) {
             switch($request->input('bulk_actions')) {
@@ -50,7 +51,7 @@ class BulkAssetsController extends Controller
                     return view('hardware/bulk-delete')->with('assets', $assets);
                 case 'edit':
                     return view('hardware/bulk')
-                        ->with('assets', request('ids'))
+                        ->with('assets', $asset_ids)
                         ->with('statuslabel_list', Helper::statusLabelList());
             }
         }
@@ -90,6 +91,7 @@ class BulkAssetsController extends Controller
             || ($request->filled('model_id'))
         ) {
             foreach ($assets as $assetId) {
+
                 $this->update_array = [];
 
                 $this->conditionallyAddItem('purchase_date')

app/Http/Transformers/AssetsTransformer.php

@@ -116,7 +116,7 @@ class AssetsTransformer
         $permissions_array['available_actions'] = [
             'checkout' => Gate::allows('checkout', Asset::class),
             'checkin' => Gate::allows('checkin', Asset::class),
-            'clone' => Gate::allows('create', Asset::class),
+            'clone' => false,
             'restore' => false,
             'update' => (bool) Gate::allows('update', Asset::class),
             'delete' => ($asset->assigned_to=='' && Gate::allows('delete', Asset::class)),

resources/lang/af/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Waardevermindering Naam',
     'number_of_months'  					=> 'Aantal maande',
     'update'  					            => 'Werk waardevermindering op',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/af/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klone Bate',
     'deployable'  				=> 'verbintenis',
-    'deleted'  					=> 'Hierdie bate is verwyder. <a href="/hardware/:asset_id/restore">Klik hier om dit te herstel</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Wysig bate',
-    'model_deleted'  			=> 'Hierdie batesmodel is uitgevee. Jy moet die model herstel voordat jy die Bate kan herstel. <br/> <a href="/hardware/models/:model_id/restore">Klik hier om die model</a> te herstel.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requestable',
     'requested'				    => 'versoek',
     'restore'  					=> 'Herstel bate',

resources/lang/af/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Oor Asset Models',
     'about_models_text'           => 'Batemodelle is \'n manier om identiese bates te groepeer. "MBP 2013", "IPhone 6s", ens.',
-    'deleted'  					        => 'Hierdie model is verwyder. <a href="/hardware/models/:model_id/restore">Klik hier om dit te herstel</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

resources/lang/af/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Verwyder Maatskappyvereniging',
     'reports'				=> 'Berigte',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'versoek',
     'request_canceled'      => 'Versoek gekanselleer',
     'save'  				=> 'Save',

resources/lang/am/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Depreciation Name',
     'number_of_months'  					=> 'Number of Months',
     'update'  					            => 'Update Depreciation',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/am/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
     'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',

resources/lang/am/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

resources/lang/am/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'Requested',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',

resources/lang/ar/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'اسم الاستهلاك',
     'number_of_months'  					=> 'عدد الأشهر',
     'update'  					            => 'تحديث الاستهلاك',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/ar/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'اخراج الأصل',
     'clone'  					=> 'استنساخ الأصل',
     'deployable'  				=> 'قابل للتوزيع',
-    'deleted'  					=> 'تم حذف هذا الأصل. <a href="/hardware/:asset_id/restore"> انقر هنا لاستعادته </a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'تعديل الأصل',
-    'model_deleted'  			=> 'تم حذف موديل الأصل هذا. يجب عليك استعادة الموديل قبل أن تتمكن من استعادة الأصل.<br/> <a href="/hardware/models/:model_id/restore"> انقر هنا لاستعادة الموديل</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'قابل للطلب',
     'requested'				    => 'تم الطلب',
     'restore'  					=> 'استعادة الأصل',

resources/lang/ar/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'حول موديلات الأصول',
     'about_models_text'           => 'موديلات الأصول هي طريقة لتجميع الأصول المتطابقة "MBP 2013", "IPhone 6s", الخ.',
-    'deleted'  					        => 'تم حذف هذا الموديل. <a href="/hardware/models/:model_id/restore"> انقر هنا لاستعادته </a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'حذف موديلات الاصول بالجملة',
     'bulk_delete_help'               => 'استخدم مربعات الاختيار أدناه لتأكيد حذف موديلات الأصول المحددة. لا يمكن حذف موديلات الأصول التي تحتوي على أصول مرتبطة بها إلى أن يتم ربط الأصول بموديل مختلف.',
     'bulk_delete_warn'          => 'أنت على وشك حذف :model_count من موديلات الأصول.',

resources/lang/ar/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'إزالة جمعية الشركة',
     'reports'				=> 'التقارير',
     'restored'				=> 'المعاد',
+    'restore'				=> 'Restore',
     'requested'				=> 'طلب',
     'request_canceled'      => 'تم إلغاء الطلب',
     'save'  				=> 'حفظ',

resources/lang/bg/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Амортизация',
     'number_of_months'  					=> 'Брой месеци',
     'update'  					            => 'Обновяване на амортизация',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/bg/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Проверка на активите',
     'clone'  					=> 'Копиране на актив',
     'deployable'  				=> 'Може да бъде предоставен',
-    'deleted'  					=> 'Активът беше изтрит. <a href="/hardware/:asset_id/restore">Възстановяване</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Редакция на актив',
-    'model_deleted'  			=> 'Моделът актив беше изтрит.Необходимо е да възстановите моделът, преди да възстановите актива.<br/> <a href="/hardware/models/:model_id/restore">Възстановяване на модел</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Може да бъде изискван',
     'requested'				    => 'Изискан',
     'restore'  					=> 'Възстановяване на актив',

resources/lang/bg/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Относно модели на актив',
     'about_models_text'           => 'Модели на актив са начин за групиране на идентични активи. "MBP 2013", "IPhone 6s" и др.',
-    'deleted'  					        => 'Моделът беше изтрит. <a href="/hardware/models/:model_id/restore">Възстановяване</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Масово изтриване на модели на активите',
     'bulk_delete_help'               => 'Използвайте квадратчетата за отметка по-долу, за да потвърдите изтриването на избраните модели на активи. Моделите, за които има асоциирани активи, не могат да бъдат изтрити, докато активите не се асоциират с друг модел.',
     'bulk_delete_warn'          => 'Ще бъдат изтрити :model_count модели на активи.',

resources/lang/bg/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Премахване на асоциация към компания',
     'reports'				=> 'Справки',
     'restored'				=> 'възстановени',
+    'restore'				=> 'Restore',
     'requested'				=> 'Изискан',
     'request_canceled'      => 'Заявка отменена',
     'save'  				=> 'Запис',

resources/lang/ca/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Depreciation Name',
     'number_of_months'  					=> 'Number of Months',
     'update'  					            => 'Update Depreciation',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/ca/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
     'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',

resources/lang/ca/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

resources/lang/ca/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'Requested',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',

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

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Jméno amortizace',
     'number_of_months'  					=> 'Počet měsíců',
     'update'  					            => 'Aktualizovat amortizaci',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

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

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Pokladní majetek',
     'clone'  					=> 'Klonovat majetek',
     'deployable'  				=> 'Připraveno k nasazení',
-    'deleted'  					=> 'Toto zařízení bylo odstraněno. <a href="/hardware/:asset_id/restore">Klepněte zde pro jeho obnovení</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Upravit majetek',
-    'model_deleted'  			=> 'Tento model majetku byl odstraněn. Přejete-li si obnovit zařízení, <a href="/hardware/models/:model_id/restore">klepněte zde</a><br/> a obnovte nejdříve jeho model.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Lze vyžádat',
     'requested'				    => 'Požadováno',
     'restore'  					=> 'Obnovit zařízení',

resources/lang/cs/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'O modelech majetku',
     'about_models_text'           => 'Modely majetku jsou způsoby seskupení shodných majetků. "MBP 2013", "iPhone 6s" atd.',
-    'deleted'  					        => 'Model byl vymazán. <a href="/hardware/models/:model_id/restore">Klikněte sem pro jeho obnovení</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Hromadné mazání modelů majetku',
     'bulk_delete_help'               => 'Pomocí zaškrtávacích kolonek potvrďte smazání označených modelů majetku. Modely majetku, ke kterým je přiřazen majetek nemohou být smazány dokud jim přiřazený majetek nebude přeřazen k jinému modulu.',
     'bulk_delete_warn'          => 'Chystáte se smazat :model_count asset models.',

resources/lang/cs/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Odstraňte sdružení společnosti',
     'reports'				=> 'Reporty',
     'restored'				=> 'obnoveno',
+    'restore'				=> 'Restore',
     'requested'				=> 'Požadováno',
     'request_canceled'      => 'Žádost zrušena',
     'save'  				=> 'Uložit',

resources/lang/cy/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Enw Dibrisiant',
     'number_of_months'  					=> 'Nifer o Fisoedd',
     'update'  					            => 'Diweddaru Dibrisiant',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/cy/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Nodi Asedau Allan',
     'clone'  					=> 'Dyblygu Ased',
     'deployable'  				=> 'Gellir ei ddefnyddio',
-    'deleted'  					=> 'Mae\'r ased yma wedi dileu. <a href="/hardware/:asset_id/restore">Cliciwch yma i\'w adfer</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Addasu Ased',
-    'model_deleted'  			=> 'Mae\'r model yma o ased wedi\'i dileu. Rhaid i chi adfer y model cyn fedrwch chi adfer y\'r ased. <br/> <a href="/hardware/models/:model_id/restore">Cliciwch yma i adfer yr ased</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Ar gael',
     'requested'				    => 'Gofynnwyd amdano',
     'restore'  					=> 'Adfer Ased',

resources/lang/cy/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Amdan Modelau',
     'about_models_text'           => 'Mae modelau o asedau yn ffordd o creu grwp o asedau. "iPhone 7, Samsung TAB 4, ayyb.',
-    'deleted'  					        => 'Mae\'r model yma wedi dileu. <a href="/hardware/models/:model_id/restore">Cliciwch yma i\'w adfer</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Dileu Nifer o Modelau',
     'bulk_delete_help'               => 'Rhowch tic yn y bocsys isod i cadarnhau dileu y model. Nid oes modd dileu modelau sydd hefo asedau yn ei erbyn.',
     'bulk_delete_warn'          => 'Rydych am dileu :model_count o asedau.',

resources/lang/cy/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Dileu Cymdeithas y Cwmni',
     'reports'				=> 'Adroddiadau',
     'restored'				=> 'wedi adfer',
+    'restore'				=> 'Restore',
     'requested'				=> 'Gofynnwyd amdano',
     'request_canceled'      => 'Cais wedi dileu',
     'save'  				=> 'Cadw',

resources/lang/da/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Afskrivningnavn',
     'number_of_months'  					=> 'Antal måneder',
     'update'  					            => 'Opdater Afskrivninger',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/da/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klonaktiver',
     'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'Dette aktiv er blevet slettet. <a href="/hardware/:asset_id/restore">Klik her for at gendanne det</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Rediger aktiv',
-    'model_deleted'  			=> 'Denne aktivmodel er blevet slettet. Du skal gendanne modellen, før du kan gendanne Asset.<br/> <a href="/hardware/models/:model_id/restore">Klik her for at gendanne model</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'kan anmodes',
     'requested'				    => 'Anmodet',
     'restore'  					=> 'Gendan aktiv',

resources/lang/da/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Om aktiv modeller',
     'about_models_text'           => 'Aktiv modeller er en måde at gruppere identiske aktiver. "MBP 2013", "IPhone 6s", osv.',
-    'deleted'  					        => 'Denne model er blevet slettet. <a href="/hardware/models/:model_id/restore"> Klik her for at gendanne den</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Slet flere aktivmodeller',
     'bulk_delete_help'               => 'Brug checkboksene nedenfor til at bekræfte sletning af valgte aktivmodeller. Aktivmodeller med tilknyttede aktiver kan ikke slettes før aktivet er knyttet til en anden model.',
     'bulk_delete_warn'          => 'Du er ved at slette :model_count aktivmodeller.',

resources/lang/da/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Fjern association med selskab',
     'reports'				=> 'Rapporter',
     'restored'				=> 'gendannet',
+    'restore'				=> 'Restore',
     'requested'				=> 'Anmodet',
     'request_canceled'      => 'Anmodning Annulleret',
     'save'  				=> 'Gem',

resources/lang/de/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Abschreibungs Name',
     'number_of_months'  					=> 'Anzahl der Monate',
     'update'  					            => 'Abschreibung aktualisieren',
+    'depreciation_min'                      => 'Minimaler Wert nach Abschreibung'
 
 );

resources/lang/de/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Asset herausgeben',
     'clone'  					=> 'Asset duplizieren',
     'deployable'  				=> 'Einsetzbar',
-    'deleted'  					=> 'Dieses Asset wurde gelöscht. <a href="/hardware/:asset_id/restore">Zur Wiederherstellung hier klicken</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Asset bearbeiten',
-    'model_deleted'  			=> 'Dieses Asset wurde gelöscht. Sie müssen das Modell Wiederherstellen bevor Sie das Asset Wiederherstellen können <br/><a href="/hardware/models/:model_id/restore">klicken Sie hier um das Modell wiederherzustellen</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Anforderbar',
     'requested'				    => 'Angefordert',
     'restore'  					=> 'Asset wiederherstellen',

resources/lang/de/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Über Asset-Modelle',
     'about_models_text'           => 'Asset-Modelle sind eine Möglichkeit, identische Assets zu gruppieren. "MBP 2013", "IPhone 6 s" usw.',
-    'deleted'  					        => 'Dieses Modell wurde gelöscht.<a href="/hardware/models/:model_id/restore">klicken Sie hier um es Wiederzuherstellen</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Massenlöschen von Asset-Modellen',
     'bulk_delete_help'               => 'Nutzen Sie die nachfolgenden Kontrollkästchen, um die Löschung der Asset-Modelle zu bestätigen. Asset-Modelle die noch zugewiesene Assets haben können nur dann gelöscht werden, wenn die enthaltenen Assets einem anderem Asset-Modell zugewiesen werden.',
     'bulk_delete_warn'          => 'Sie sind im Begriff :model_count Asset-Modelle zu löschen.',

resources/lang/de/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Firmenzuordnung entfernen',
     'reports'				=> 'Berichte',
     'restored'				=> 'wiederhergestellt',
+    'restore'				=> 'Restore',
     'requested'				=> 'Angefragt',
     'request_canceled'      => 'Anfrage abgebrochen',
     'save'  				=> 'Speichern',

resources/lang/el/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Όνομα απόσβεσης',
     'number_of_months'  					=> 'Αριθμός των μηνών',
     'update'  					            => 'Ενημέρωση αποσβέσεων',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/el/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Ταμείο ελέγχου',
     'clone'  					=> 'Κλώνος χρήστη',
     'deployable'  				=> 'Προς ανάπτυξη',
-    'deleted'  					=> 'Αυτό το στοιχείο έχει διαγραφεί. <a href="/hardware/:asset_id/restore">Κάντε κλικ εδώ για να την επαναφέρετε</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Επεξεργασία παγίων',
-    'model_deleted'  			=> 'Αυτό το μοντέλο περιουσιακών στοιχείων έχει διαγραφεί. Πρέπει να επαναφέρετε το μοντέλο για να μπορέσετε να επαναφέρετε το Asset.<br/> <a href="/hardware/models/:model_id/restore">Κάντε κλικ εδώ για να επαναφέρετε το μοντέλο</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Επαναληπτικό',
     'requested'				    => 'Ζητήθηκαν',
     'restore'  					=> 'Επαναφορά παγίου',

resources/lang/el/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Σχετικά με τους τύπους παγίων',
     'about_models_text'           => 'Τα μοντέλα περιουσιακών στοιχείων είναι ένας τρόπος για να ομαδοποιήσετε ταυτόσημα περιουσιακά στοιχεία "MBP 2013", "IPhone 6s" κ.λπ.',
-    'deleted'  					        => 'Αυτό το μοντέλο έχει διαγραφεί. <a href="/hardware/models/:model_id/restore">Κάντε κλικ εδώ για να την επαναφέρετε</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Μαζική διαγραφή μοντέλου Asset',
     'bulk_delete_help'               => 'Χρησιμοποιήστε τα παρακάτω πλαίσια ελέγχου για να επιβεβαιώσετε τη διαγραφή των επιλεγμένων μοντέλων στοιχείων. Τα μοντέλα στοιχείων που έχουν στοιχεία που σχετίζονται με αυτά δεν μπορούν να διαγραφούν έως ότου τα στοιχεία συσχετιστούν με διαφορετικό μοντέλο.',
     'bulk_delete_warn'          => 'Πρόκειται να διαγράψετε: asset_count περιουσιακών στοιχείων.',

resources/lang/el/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Κατάργηση σύνδεσης εταιρείας',
     'reports'				=> 'Αναφορές',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'Ζητήθηκαν',
     'request_canceled'      => 'Το αίτημα ακυρώθηκε',
     'save'  				=> 'Αποθήκευση',

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

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Depreciation Name',
     'number_of_months'  					=> 'Number of Months',
     'update'  					            => 'Update Depreciation',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

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

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
     'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',

resources/lang/en-GB/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

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

@@ -14,7 +14,7 @@ return array(
     'alerts_enabled'			=> 'Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
-    'allow_user_skin'           => 'Erlaube Benutzer Skin',
+    'allow_user_skin'           => 'Allow User Skin',
     'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
     'asset_ids'					=> 'Asset IDs',
     'audit_interval'            => 'Audit Interval',

resources/lang/en-GB/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'Requested',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',

resources/lang/en-ID/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Nama Penyusutan',
     'number_of_months'  					=> 'Jumlah Bulan',
     'update'  					            => 'Perbarui pengurangan',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/en-ID/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Periksa aset',
     'clone'  					=> 'Gandakan aset',
     'deployable'  				=> 'Bisa dicairkan',
-    'deleted'  					=> 'Aset ini telah dihapus <a href="/hardware/:asset_id/restore"> Klik di sini untuk memulihkannya</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
-    'model_deleted'  			=> 'Model Aset ini telah dihapus. Anda harus mengembalikan model sebelum mengembalikan Aset.<br/> <a href="/hardware/models/:model_id/restore">Klik di sini untuk memulihkan modelnya</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Permintaan',
     'requested'				    => 'Diminta',
     'restore'  					=> 'Kembalikan Aset',

resources/lang/en-ID/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Tentang Model Aset',
     'about_models_text'           => 'Model Aset adalah cara untuk mengelompokkan aset identik. "MBP 2013", "IPhone 6s", dll.',
-    'deleted'  					        => 'Model ini telah dihapus. <a href="/hardware/models/:model_id/restore">Klik di sini untuk memulihkannya</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk hapus model aset',
     'bulk_delete_help'               => 'Gunakan kotak centang di bawah untuk mengkonfirmasi penghapusan model aset yang dipilih. Model aset yang memiliki aset yang terkait dengannya tidak dapat dihapus sampai aset dikaitkan dengan model yang berbeda.',
     'bulk_delete_warn'          => 'Anda akan menghapus: model aset model_count.',

resources/lang/en-ID/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Hapus Asosiasi Perusahaan',
     'reports'				=> 'Laporan',
     'restored'				=> 'dikembalikan',
+    'restore'				=> 'Restore',
     'requested'				=> 'Diminta',
     'request_canceled'      => 'Permintaan dibatalkan',
     'save'  				=> 'Simpan',

resources/lang/en/admin/categories/general.php

@@ -17,7 +17,7 @@ return array(
     'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
     'update'  							=> 'Update Category',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
-    'use_default_eula_column'			=> 'Use default EULA',
     '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_column'			=> 'Use default EULA',
 
 );

resources/lang/en/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
     'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',

resources/lang/en/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

resources/lang/en/admin/settings/general.php

@@ -62,8 +62,6 @@ return array(
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
-    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
-    'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_enabled'              => 'LDAP enabled',
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP Settings',

resources/lang/en/admin/users/message.php

@@ -16,7 +16,6 @@ return array(
     'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
-
     'success' => array(
         'create'    => 'User was successfully created.',
         'update'    => 'User was successfully updated.',

resources/lang/en/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'Requested',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',

resources/lang/es-CO/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Nombre de Depreciación',
     'number_of_months'  					=> 'Número de Meses',
     'update'  					            => 'Actualizar Depreciación',
+    'depreciation_min'                      => 'Valor mínimo después de depreciación'
 
 );

resources/lang/es-CO/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Asignar Equipo',
     'clone'  					=> 'Clonar Equipo',
     'deployable'  				=> 'Desplegable',
-    'deleted'  					=> 'Este equipo ha sido eliminado. <a href="/hardware/:asset_id/restore">Click aquí para restaurarlo</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Editar Equipo',
-    'model_deleted'  			=> 'Este modelo de equipo ha sido borrado. Debes restaurar el modelo antes de poder restaurar el equipo.<br/><a href="/hardware/models/:model_id/restore">Hacer click aquí para restaurar el modelo</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Puede Solicitarse',
     'requested'				    => 'Solicitado',
     'restore'  					=> 'Restaurar equipo',

resources/lang/es-CO/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Acerca de modelos de activos',
     'about_models_text'           => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'Este modelo ha sido borrado.<a href="/hardware/models/:model_id/restore">Click aquí para restaurarlo</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Borrar Grandes Modelos de Activos',
     'bulk_delete_help'               => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.',
     'bulk_delete_warn'          => 'Estás a punto de eliminar: los modelos de activo model_count.',

resources/lang/es-CO/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Eliminar Asociación de compañía',
     'reports'				=> 'Informes',
     'restored'				=> 'restaurado',
+    'restore'				=> 'Restore',
     'requested'				=> 'Solicitado',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',

resources/lang/es-ES/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Nombre Amortización',
     'number_of_months'  					=> 'Meses',
     'update'  					            => 'Actualizar Amortización',
+    'depreciation_min'                      => 'Valor mínimo después de la depreciación'
 
 );

resources/lang/es-ES/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Activo de pago',
     'clone'  					=> 'Clonar Equipo',
     'deployable'  				=> 'Desplegable',
-    'deleted'  					=> 'Este equipo ha sido eliminado. <a href="/hardware/:asset_id/restore">Click aqui para restaurarlot</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Editar Equipo',
-    'model_deleted'  			=> 'Este modelo de equipo ha sido borrado. Debe restaurar el modelo antes de poder restaurar el equipo.<br/><a href="/hardware/models/:model_id/restore">Hacer click aquí para restaurar el modelo</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requerible',
     'requested'				    => 'Solicitado',
     'restore'  					=> 'Restaurar equipo',

resources/lang/es-ES/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Acerca de modelos de activos',
     'about_models_text'           => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'Este modelo ha sido borrado.<a href="/hardware/models/:model_id/restore">Click aquí para restaurarlo</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Borrar Grandes Modelos de Activos',
     'bulk_delete_help'               => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.',
     'bulk_delete_warn'          => 'Estás a punto de eliminar: los modelos de activo model_count.',

resources/lang/es-ES/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Eliminar Asociación de compañía',
     'reports'				=> 'Informes',
     'restored'				=> 'restaurado',
+    'restore'				=> 'Restore',
     'requested'				=> 'Solicitado',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',

resources/lang/es-MX/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Nombre Amortización',
     'number_of_months'  					=> 'Meses',
     'update'  					            => 'Actualizar Amortización',
+    'depreciation_min'                      => 'Valor mínimo después de depreciado'
 
 );

resources/lang/es-MX/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Activo de pago',
     'clone'  					=> 'Clonar Equipo',
     'deployable'  				=> 'Desplegable',
-    'deleted'  					=> 'Este equipo ha sido eliminado. <a href="/hardware/:asset_id/restore">Click aqui para restaurarlot</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Editar Equipo',
-    'model_deleted'  			=> 'Este modelo de equipo ha sido borrado. Debe restaurar el modelo antes de poder restaurar el equipo.<br/><a href="/hardware/models/:model_id/restore">Hacer click aquí para restaurar el modelo</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requerible',
     'requested'				    => 'Solicitado',
     'restore'  					=> 'Restaurar equipo',

resources/lang/es-MX/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Acerca de modelos de activos',
     'about_models_text'           => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'Este modelo ha sido borrado.<a href="/hardware/models/:model_id/restore">Click aquí para restaurarlo</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Borrar Grandes Modelos de Activos',
     'bulk_delete_help'               => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.',
     'bulk_delete_warn'          => 'Estás a punto de eliminar: los modelos de activo model_count.',

resources/lang/es-MX/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Eliminar Asociación de compañía',
     'reports'				=> 'Informes',
     'restored'				=> 'restaurado',
+    'restore'				=> 'Restore',
     'requested'				=> 'Solicitado',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',

resources/lang/es-VE/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Nombre de Depreciación',
     'number_of_months'  					=> 'Número de Meses',
     'update'  					            => 'Actualizar Depreciación',
+    'depreciation_min'                      => 'Valor mínimo después de la depreciación'
 
 );

resources/lang/es-VE/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Retirar Activo',
     'clone'  					=> 'Clonar Activo',
     'deployable'  				=> 'Enviable',
-    'deleted'  					=> 'Este activo ha sido borrado. <a href="/hardware/:asset_id/restore">Click aquí para restaurarlos</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Editar Activo',
-    'model_deleted'  			=> 'Este modelo de activos ha sido borrado. Debes restaurar el modelo antes de poder restaurar los activos. <br/><a href="/hardware/models/:model_id/restore">Click aquí para restaurar el modelo</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Solicitable',
     'requested'				    => 'Solicitado',
     'restore'  					=> 'Restaurar Activo',

resources/lang/es-VE/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Acerca de los Modelos de Activos',
     'about_models_text'           => 'Los Modelos de Activos son un grupo de activos idénticos. "MBP 2013", "iPhone 6S", etc.',
-    'deleted'  					        => 'Este modelo ha sido borrado. <a href="/hardware/models/:model_id/restore">Click aquí para restaurarlo</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Eliminación Masiva de Modelos de Activos',
     'bulk_delete_help'               => 'Usa las casillas abajo para confirmar la eliminación de los modelos de activos seleccionados. Los modelos de activo que tienen distintos activos asociados con ellos no pueden ser borrados hasta que los activos sean asociados a un modelo diferente.',
     'bulk_delete_warn'          => 'Estás a punto de borrar :model_count modelos de activo.',

resources/lang/es-VE/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Eliminar Asociación de la Compañía',
     'reports'				=> 'Reportes',
     'restored'				=> 'restaurado',
+    'restore'				=> 'Restore',
     'requested'				=> 'Solicitado',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',

resources/lang/et/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Amortisatsiooni nimi',
     'number_of_months'  					=> 'Kuude arv',
     'update'  					            => 'Kulumi ajakohastamine',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/et/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klooni vahend',
     'deployable'  				=> 'Käivitatav',
-    'deleted'  					=> 'See vara on kustutatud. <a href="/hardware/:asset_id/restore">Klõpsake selle taastamiseks klõpsake siia</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Muuda vahendit',
-    'model_deleted'  			=> 'See varade mudel on kustutatud. Enne varade taastamist peate mudeleid taastada. 123._5_0_321 <a href="/hardware/models/:model_id/restore">Klõpsake mudeli taastamiseks siin</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Taodeldav',
     'requested'				    => 'Taotletud',
     'restore'  					=> 'Taasta vara',

resources/lang/et/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Mudelitest',
     'about_models_text'           => 'Mudelid on selleks, et vahendeid grupeerida. "MBP 2013", "IPhone 6d", jne.',
-    'deleted'  					        => 'See mudel on kustutatud. <a href="/hardware/models/:model_id/restore">Kliki siin selle taastamiseks</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

resources/lang/et/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Eemalda ettevõtteühing',
     'reports'				=> 'Aruanded',
     'restored'				=> 'taastatud',
+    'restore'				=> 'Restore',
     'requested'				=> 'Taotletud',
     'request_canceled'      => 'Taotlus tühistati',
     'save'  				=> 'Salvesta',

resources/lang/fa/admin/accessories/message.php

@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'does_not_exist' => 'ابزار/وسیله [:id] وجود ندارد.',
     'assoc_users'	 => 'این وسیله هم اکنون:آیتم های چک شده به کاربران را حساب کنید.لطفا در لوازم جانبی چک کنید و دوباره امتحان کنید',
 
     'create' => array(

resources/lang/fa/admin/asset_maintenances/general.php

@@ -8,7 +8,7 @@
         'repair'             => 'بازسازی',
         'maintenance'        => 'نگهداشت',
         'upgrade'            => 'ارتقا',
-        'calibration'        => 'Calibration',
+        'calibration'        => 'کالیبره کردن',
-        'software_support'   => 'Software Support',
+        'software_support'   => 'پشتیبانی نرم‌افزار',
-        'hardware_support'   => 'Hardware Support',
+        'hardware_support'   => 'پشتیبانی سخت‌افزار',
     ];

resources/lang/fa/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'نام استهلاک',
     'number_of_months'  					=> 'تعداد ماه ها',
     'update'  					            => 'کمبود به روزرسانی',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/fa/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'دارایی پرداخت',
     'clone'  					=> 'دارایی شگرف',
     'deployable'  				=> 'گسترش',
-    'deleted'  					=> 'این دارایی حذف شده است. <a href="/hardware/:asset_id/restore"> اینجا به بازگرداندن آن کلیک کنید </a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'ویرایش دارایی',
-    'model_deleted'  			=> 'این مدل دارایی حذف شده است. شما باید مدل بازگرداندن قبل از شما می توانید دارایی بازگرداندن کنید. <br/> <a href="/hardware/models/:model_id/restore"> برای بازگرداندن مدل </a> را اینجا را کلیک کنید.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'در خواست شد',
     'requested'				    => 'درخواست شده',
     'restore'  					=> 'بازیابی دارایی',

resources/lang/fa/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'درباره مدل های دارایی',
     'about_models_text'           => 'مدل های دارایی یک راه برای گروه بندی دارایی های یکسان هستند. "MBP 2013"، "IPhone 6s" و غیره',
-    'deleted'  					        => 'این مدل حذف شده است. <a href="/hardware/models/:model_id/restore"> اینجا برای بازگرداندن کلیک کنید it</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

resources/lang/fa/general.php

@@ -179,6 +179,7 @@
     'remove_company'        => 'حذف انجمن شرکت',
     'reports'				=> 'گزارش‌ها',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'در خواست شده',
     'request_canceled'      => 'درخواست لغو شد',
     'save'  				=> 'ذخیره کردن',

resources/lang/fi/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Poiston nimi',
     'number_of_months'  					=> 'Kuukausien lukumäärä',
     'update'  					            => 'Päivitä poistot',
+    'depreciation_min'                      => 'Minimiarvo poistojen jälkeen'
 
 );

resources/lang/fi/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Luovuta laite',
     'clone'  					=> 'Monista laite',
     'deployable'  				=> 'Käyttöönotettavissa',
-    'deleted'  					=> 'Tämä laite on poistettu. <a href="/hardware/:asset_id/restore">Klikkaa tästä palauttaaksesi sen</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Muokkaa laitetta',
-    'model_deleted'  			=> 'Tämä laitemalli on poistettu. Sinun on palautettava malli ennen kuin voit palauttaa laitteen.<br/> <a href="/hardware/models/:model_id/restore">Klikkaa tästä palauttaaksesi mallin</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Pyydettävissä',
     'requested'				    => 'Pyydetty',
     'restore'  					=> 'Palauta laite',

resources/lang/fi/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Tietoja laitemalleista',
     'about_models_text'           => 'Laitemalleilla ryhmitellään samankaltaiset laitteet. "Elitebook 820 G3", "IPhone 6s" jne.',
-    'deleted'  					        => 'Tämä malli on poistettu. <a href="/hardware/models/:model_id/restore">Vaihda tästä palauttaaksesi sen</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Massapoista laitemalleja',
     'bulk_delete_help'               => 'Käytä alla olevia valintaruutuja vahvistaaksesi laitemallien poistaminen. Laitemalleja, joissa on niihin liittyviä laitteita, ei voida poistaa ennen kuin laitteet on liitetty toiseen malliin.',
     'bulk_delete_warn'          => 'Olet poistamassa :model_count laitemallia.',

resources/lang/fi/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Poista',
     'reports'				=> 'Raportit',
     'restored'				=> 'palautettu',
+    'restore'				=> 'Restore',
     'requested'				=> 'Pyydetty',
     'request_canceled'      => 'Pyyntö peruutettu',
     'save'  				=> 'Tallenna',

resources/lang/fil/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Ang Pangalan ng Depresasyon',
     'number_of_months'  					=> 'Ang Bilang ng mga Buwan',
     'update'  					            => 'I-update ang Depresasyon',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/fil/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'I-checkout ang Asset',
     'clone'  					=> 'I-clone ang Asset',
     'deployable'  				=> 'Pwedeng mai-deploy',
-    'deleted'  					=> 'Ang asset na ito ay nai-delete na. <a href="/hardware/:asset_id/restore">I-klick dito para ibalik sa dati</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'I-edit ang Asset',
-    'model_deleted'  			=> 'Ang model ng mga Asset na ito ay nai-delete na. Dapat mo munang ibalik sa dati ang model bago ibalik sa dati ang Asset. <br/> <a href="/hardware/models/:model_id/restore">I-klick dito para ibalik sa dati ang model</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Pwedeng Ma-rekwest',
     'requested'				    => 'Ni-rekwest',
     'restore'  					=> 'Ibalik sa dati ang Asset',

resources/lang/fil/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Ang Tungkol sa mga Modelo ng Asset',
     'about_models_text'           => 'Ang mga Modelo ng Asset ay isang paraan para i-grupo ang magkakaparehong mga asset. "MBP 2013", "IPhone 6s", atbp.',
-    'deleted'  					        => 'Ang modelong ito ay nai-delete na. <a href="/hardware/models/:model_id/restore">I-klik dito para maibalik sa dati</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Ang Maramihang Pag-delete sa mga Modelo ng Asset',
     'bulk_delete_help'               => 'Gamitin ang mga checkboxes sa ibaba para i-komperma ang pag-delete sa mga napiling mga modelo ng asset. Ang mga modelo ng asset na mayroong mga asset na nai-ugnay sa mga ito ay hindi pwedeng i-delete hanggang sa ang lahat ng mga asset ay nai-ugnay sa ibat-ibang modelo.',
     'bulk_delete_warn'          => 'Ikaw ay mag-delete ng :model_count mga modelo ng asset.',

resources/lang/fil/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Tanggalin ang Assosasyon ng Kompanya',
     'reports'				=> 'Mga Ulat',
     'restored'				=> 'ibinalik sa dati',
+    'restore'				=> 'Restore',
     'requested'				=> 'Ang Nirekwest',
     'request_canceled'      => 'Ang mga Rekwest ay Nakansela',
     'save'  				=> 'I-save',

resources/lang/fr/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Nom d\'Amortissement',
     'number_of_months'  					=> 'Mois',
     'update'  					            => 'Actualiser l\'amortissement',
+    'depreciation_min'                      => 'Valeur minimale après amortissement'
 
 );

resources/lang/fr/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Commander l\'actif',
     'clone'  					=> 'Cloner le Bien',
     'deployable'  				=> 'Déployable',
-    'deleted'  					=> 'Cet actif a été détruit. <a href="/hardware/:asset_id/restore">Cliquez ici pour le restaurer</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Editer le Bien',
-    'model_deleted'  			=> 'Ce modèle d\'actif a été supprimé. Vous devez le restaurer avant de restaurer l\'actif.<br/> <a href="/hardware/models/:model_id/restore">Cliquez ici pour le restaurer</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Réquisitionnable',
     'requested'				    => 'Demandé',
     'restore'  					=> 'Restaurer l\'actif',

resources/lang/fr/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'A propos des modèles actifs',
     'about_models_text'           => 'Les modèles actifs sont une façon de regrouper les actifs identiques. « MBP 2013", « IPhone 6 s », etc.',
-    'deleted'  					        => 'Ce modèle a été détruit. <a href="/hardware/models/:model_id/restore">Cliquez ici pour le restaurer</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Suppression en masse des modèles d\'actifs',
     'bulk_delete_help'               => 'Cochez la case ci-dessous pour confirmer la suppression des modèles d\'actifs sélectionnés. Les modèles d\'actifs associés à des actifs ne peuvent pas être supprimés tant que les actifs ne sont pas associés à un modèle différent.',
     'bulk_delete_warn'          => 'Vous êtes sur le points de suppimer :model_count modèles d\'actifs.',

resources/lang/fr/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Retirer l\'association avec l\'organisation',
     'reports'				=> 'Rapports',
     'restored'				=> 'restauré',
+    'restore'				=> 'Restore',
     'requested'				=> 'Demandé',
     'request_canceled'      => 'Demande annulée',
     'save'  				=> 'Sauvegarder',

resources/lang/ga-IE/admin/depreciations/general.php

@@ -8,5 +8,6 @@ return array(
     'depreciation_name'  					=> 'Ainm Dímheas',
     'number_of_months'  					=> 'Líon na Míonna',
     'update'  					            => 'Dímheas Nuashonraigh',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/ga-IE/admin/hardware/general.php

@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Seiceáil Seiceáil',
     'clone'  					=> 'Sócmhainn Clón',
     'deployable'  				=> 'Infheidhmithe',
-    'deleted'  					=> 'Scriosadh an tsócmhainn seo. <a href="/hardware/:asset_id/restore"> Cliceáil anseo chun é a chur ar ais</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Athraigh Sócmhainn',
-    'model_deleted'  			=> 'Scriosadh an tsamhail Sócmhainní seo. Caithfidh tú an tsamhail a chur ar ais sular féidir leat an Sócmhainn a athbhunú.<br/> <a href="/hardware/models/:model_id/restore"> Cliceáil anseo chun an tsamhail</a> a chur ar ais.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Inrianaithe',
     'requested'				    => 'Iarrtar',
     'restore'  					=> 'Athchóirigh Sócmhainn',

resources/lang/ga-IE/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Maidir le Múnlaí Sócmhainne',
     'about_models_text'           => 'Tá modhanna sócmhainne ina bhealach chun sócmhainní comhionanna a ghrúpáil. "MBP 2013", "iPhone 6s", etc.',
-    'deleted'  					        => 'Scriosadh an múnla seo. <a href="/hardware/models/:model_id/restore"> Cliceáil anseo chun é a chur ar ais</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

resources/lang/ga-IE/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Bain Cuideachta Chomhlachais',
     'reports'				=> 'Tuarascálacha',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'Iarrtar',
     'request_canceled'      => 'Iarratas Ar Ceal',
     'save'  				=> 'Sábháil',