diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 2b8eaa362..00084d8e1 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -122,6 +122,25 @@ class Handler extends ExceptionHandler
         }
 
 
+        // This is traaaaash but it handles models that are not found while using route model binding :(
+        // The only alternative is to set that at *each* route, which is crazypants
+        if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
+            $model_name = last(explode('\\', $e->getModel()));
+            $route = str_plural(strtolower(last(explode('\\', $e->getModel())))).'.index';
+
+            // Sigh. Fucking laravel.
+            if ($route == 'assets.index') {
+                $route = 'hardware.index';
+            } elseif ($route == 'reporttemplates.index') {
+                $route = 'reports/custom';
+            } elseif ($route == 'predefinedkits.index') {
+                $route = 'kits.index';
+            }
+
+            return redirect()
+                ->route($route)
+                ->withError(trans('general.generic_model_not_found', ['model' => $model_name]));
+        }
 
 
         if ($this->isHttpException($e) && (isset($statusCode)) && ($statusCode == '404' )) {
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 95a344dce..216245a3d 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -1520,11 +1520,11 @@ class Helper
         if ($redirect_option == 'target') {
             switch ($checkout_to_type) {
                 case 'user':
-                    return route('users.show', ['user' => $request->assigned_user]);
+                    return route('users.show', $request->assigned_user);
                 case 'location':
-                    return route('locations.show', ['location' => $request->assigned_location]);
+                    return route('locations.show', $request->assigned_location);
                 case 'asset':
-                    return route('hardware.show', ['hardware' => $request->assigned_asset]);
+                    return route('hardware.show', $request->assigned_asset);
             }
         }
         return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'));
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 0b243d69a..7c8e2a745 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -59,6 +59,8 @@ class IconHelper
                 return 'fas fa-cog';
             case 'angle-left':
                 return 'fas fa-angle-left';
+            case 'angle-right':
+                return 'fas fa-angle-right';
             case 'warning':
                 return 'fas fa-exclamation-triangle';
             case 'kits':
@@ -184,6 +186,8 @@ class IconHelper
                 return 'fa-regular fa-id-card';
             case 'department' :
                 return 'fa-solid fa-building-user';
+            case 'home' :
+                return 'fa-solid fa-house';
             case 'note':
             case 'notes':
                 return 'fas fa-sticky-note';
diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php
index f7ddd5394..eb004d559 100755
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -95,16 +95,10 @@ class AccessoriesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int $accessoryId
      */
-    public function edit($accessoryId = null) : View | RedirectResponse
+    public function edit(Accessory $accessory) : View | RedirectResponse
     {
-
-        if ($item = Accessory::find($accessoryId)) {
-            $this->authorize($item);
-            return view('accessories.edit', compact('item'))->with('category_type', 'accessory');
-        }
-
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
-
+        $this->authorize('update', Accessory::class);
+        return view('accessories.edit')->with('item', $accessory)->with('category_type', 'accessory');
     }
 
     /**
@@ -114,19 +108,12 @@ class AccessoriesController extends Controller
      * @param int $accessoryId
      * @since [v6.0]
      */
-    public function getClone($accessoryId = null) : View | RedirectResponse
+    public function getClone(Accessory $accessory) : View | RedirectResponse
     {
 
         $this->authorize('create', Accessory::class);
 
-        // Check if the asset exists
-        if (is_null($accessory_to_clone = Accessory::find($accessoryId))) {
-            // Redirect to the asset management page
-            return redirect()->route('accessories.index')
-                ->with('error', trans('admin/accessories/message.does_not_exist', ['id' => $accessoryId]));
-        }
-
-        $accessory = clone $accessory_to_clone;
+        $accessory = clone $accessory;
         $accessory->id = null;
         $accessory->location_id = null;
 
@@ -142,9 +129,9 @@ class AccessoriesController extends Controller
      * @param ImageUploadRequest $request
      * @param  int $accessoryId
      */
-    public function update(ImageUploadRequest $request, $accessoryId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, Accessory $accessory) : RedirectResponse
     {
-        if ($accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessoryId)) {
+        if ($accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessory->id)) {
 
             $this->authorize($accessory);
 
@@ -231,14 +218,10 @@ class AccessoriesController extends Controller
      * @see AccessoriesController::getDataView() method that generates the JSON response
      * @since [v1.0]
      */
-    public function show($accessoryID = null) : View | RedirectResponse
+    public function show(Accessory $accessory) : View | RedirectResponse
     {
-        $accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessoryID);
+        $accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessory->id);
         $this->authorize('view', $accessory);
-        if (isset($accessory->id)) {
-            return view('accessories.view', compact('accessory'));
-        }
-
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist', ['id' => $accessoryID]));
+        return view('accessories.view', compact('accessory'));
     }
 }
diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php
index 360db4526..0d18ae1e1 100644
--- a/app/Http/Controllers/AssetMaintenancesController.php
+++ b/app/Http/Controllers/AssetMaintenancesController.php
@@ -139,19 +139,12 @@ class AssetMaintenancesController extends Controller
     * @version v1.0
     * @since [v1.8]
     */
-    public function edit($assetMaintenanceId = null) : View | RedirectResponse
+    public function edit(AssetMaintenance $maintenance) : View | RedirectResponse
     {
         $this->authorize('update', Asset::class);
-        // Check if the asset maintenance exists
-        $this->authorize('update', Asset::class);
-        // Check if the asset maintenance exists
-        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')->with('error', trans('admin/asset_maintenances/message.not_found'));
-        } elseif ((!$assetMaintenance->asset) || ($assetMaintenance->asset->deleted_at!='')) {
-            // Redirect to the asset maintenance management page
+        if ((!$maintenance->asset) || ($maintenance->asset->deleted_at!='')) {
             return redirect()->route('maintenances.index')->with('error', 'asset does not exist');
-        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+        } elseif (! Company::isCurrentUserHasAccess($maintenance->asset)) {
             return static::getInsufficientPermissionsRedirect();
         }
 
@@ -161,7 +154,7 @@ class AssetMaintenancesController extends Controller
         return view('asset_maintenances/edit')
                    ->with('selectedAsset', null)
                    ->with('assetMaintenanceType', $assetMaintenanceType)
-                   ->with('item', $assetMaintenance);
+                   ->with('item', $maintenance);
     }
 
     /**
@@ -174,24 +167,20 @@ class AssetMaintenancesController extends Controller
      * @version v1.0
      * @since [v1.8]
      */
-    public function update(Request $request, $assetMaintenanceId = null) : View | RedirectResponse
+    public function update(Request $request, AssetMaintenance $maintenance) : View | RedirectResponse
     {
         $this->authorize('update', Asset::class);
-        // Check if the asset maintenance exists
-        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')->with('error', trans('admin/asset_maintenances/message.not_found'));
-        } elseif ((!$assetMaintenance->asset) || ($assetMaintenance->asset->deleted_at!='')) {
-                // Redirect to the asset maintenance management page
+
+       if ((!$maintenance->asset) || ($maintenance->asset->deleted_at!='')) {
                 return redirect()->route('maintenances.index')->with('error', 'asset does not exist');
-        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+        } elseif (! Company::isCurrentUserHasAccess($maintenance->asset)) {
             return static::getInsufficientPermissionsRedirect();
         }
 
-        $assetMaintenance->supplier_id = $request->input('supplier_id');
-        $assetMaintenance->is_warranty = $request->input('is_warranty');
-        $assetMaintenance->cost =  $request->input('cost');
-        $assetMaintenance->notes = $request->input('notes');
+        $maintenance->supplier_id = $request->input('supplier_id');
+        $maintenance->is_warranty = $request->input('is_warranty');
+        $maintenance->cost =  $request->input('cost');
+        $maintenance->notes = $request->input('notes');
 
         $asset = Asset::find(request('asset_id'));
 
@@ -200,39 +189,39 @@ class AssetMaintenancesController extends Controller
         }
 
         // Save the asset maintenance data
-        $assetMaintenance->asset_id = $request->input('asset_id');
-        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
-        $assetMaintenance->title = $request->input('title');
-        $assetMaintenance->start_date = $request->input('start_date');
-        $assetMaintenance->completion_date = $request->input('completion_date');
+        $maintenance->asset_id = $request->input('asset_id');
+        $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $maintenance->title = $request->input('title');
+        $maintenance->start_date = $request->input('start_date');
+        $maintenance->completion_date = $request->input('completion_date');
 
-        if (($assetMaintenance->completion_date == null)
+        if (($maintenance->completion_date == null)
         ) {
-            if (($assetMaintenance->asset_maintenance_time !== 0)
-              || (! is_null($assetMaintenance->asset_maintenance_time))
+            if (($maintenance->asset_maintenance_time !== 0)
+              || (! is_null($maintenance->asset_maintenance_time))
             ) {
-                $assetMaintenance->asset_maintenance_time = null;
+                $maintenance->asset_maintenance_time = null;
             }
         }
 
-        if (($assetMaintenance->completion_date !== null)
-          && ($assetMaintenance->start_date !== '')
-          && ($assetMaintenance->start_date !== '0000-00-00')
+        if (($maintenance->completion_date !== null)
+          && ($maintenance->start_date !== '')
+          && ($maintenance->start_date !== '0000-00-00')
         ) {
-            $startDate = Carbon::parse($assetMaintenance->start_date);
-            $completionDate = Carbon::parse($assetMaintenance->completion_date);
-            $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate);
+            $startDate = Carbon::parse($maintenance->start_date);
+            $completionDate = Carbon::parse($maintenance->completion_date);
+            $maintenance->asset_maintenance_time = $completionDate->diffInDays($startDate);
         }
 
       // Was the asset maintenance created?
-        if ($assetMaintenance->save()) {
+        if ($maintenance->save()) {
 
             // Redirect to the new asset maintenance page
             return redirect()->route('maintenances.index')
-                         ->with('success', trans('admin/asset_maintenances/message.edit.success'));
+                            ->with('success', trans('admin/asset_maintenances/message.edit.success'));
         }
 
-        return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
+        return redirect()->back()->withInput()->withErrors($maintenance->getErrors());
     }
 
     /**
@@ -271,19 +260,13 @@ class AssetMaintenancesController extends Controller
     * @version v1.0
     * @since [v1.8]
     */
-    public function show($assetMaintenanceId) : View | RedirectResponse
+    public function show(AssetMaintenance $maintenance) : View | RedirectResponse
     {
         $this->authorize('view', Asset::class);
-
-        // Check if the asset maintenance exists
-        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')
-                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
-        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+        if (! Company::isCurrentUserHasAccess($maintenance->asset)) {
             return static::getInsufficientPermissionsRedirect();
         }
 
-        return view('asset_maintenances/view')->with('assetMaintenance', $assetMaintenance);
+        return view('asset_maintenances/view')->with('assetMaintenance', $maintenance);
     }
 }
diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index aa083e1ae..f77f718f8 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -109,16 +109,11 @@ class AssetModelsController extends Controller
      * @since [v1.0]
      * @param int $modelId
      */
-    public function edit($modelId = null) : View | RedirectResponse
+    public function edit(AssetModel $model) : View | RedirectResponse
     {
         $this->authorize('update', AssetModel::class);
-        if ($item = AssetModel::find($modelId)) {
-            $category_type = 'asset';
-            return view('models/edit', compact('item', 'category_type'))->with('depreciation_list', Helper::depreciationList());
-
-        }
-
-        return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
+        $category_type = 'asset';
+        return view('models/edit', compact('category_type'))->with('item', $model)->with('depreciation_list', Helper::depreciationList());
     }
 
 
@@ -133,16 +128,11 @@ class AssetModelsController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(StoreAssetModelRequest $request, $modelId) : RedirectResponse
+    public function update(StoreAssetModelRequest $request, AssetModel $model) : RedirectResponse
     {
         $this->authorize('update', AssetModel::class);
 
-        if (is_null($model = AssetModel::find($modelId))) {
-            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
-        }
-
         $model = $request->handleImages($model);
-
         $model->depreciation_id = $request->input('depreciation_id');
         $model->eol = $request->input('eol');
         $model->name = $request->input('name');
@@ -267,16 +257,10 @@ class AssetModelsController extends Controller
      * @since [v1.0]
      * @param int $modelId
      */
-    public function show($modelId = null) : View | RedirectResponse
+    public function show(AssetModel $model) : View | RedirectResponse
     {
         $this->authorize('view', AssetModel::class);
-        $model = AssetModel::withTrashed()->find($modelId);
-
-        if (isset($model->id)) {
-            return view('models/view', compact('model'));
-        }
-
-        return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
+        return view('models/view', compact('model'));
     }
 
     /**
diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.php
index 05b766916..871024029 100644
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -26,17 +26,14 @@ class AssetCheckoutController extends Controller
      * @since [v1.0]
      * @return \Illuminate\Contracts\View\View
      */
-    public function create($assetId) : View | RedirectResponse
+    public function create(Asset $asset) : View | RedirectResponse
     {
-        // Check if the asset exists
-        if (is_null($asset = Asset::with('company')->find(e($assetId)))) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
 
         $this->authorize('checkout', $asset);
 
         if (!$asset->model) {
-            return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
+            return redirect()->route('hardware.show', $asset)
+                ->with('error', trans('admin/hardware/general.model_invalid_fix'));
         }
 
         if ($asset->availableForCheckout()) {
@@ -45,8 +42,8 @@ class AssetCheckoutController extends Controller
                 ->with('table_name', 'Assets');
         }
 
-
-        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkout.not_available'));
+        return redirect()->route('hardware.index')
+            ->with('error', trans('admin/hardware/message.checkout.not_available'));
     }
 
     /**
@@ -68,7 +65,7 @@ class AssetCheckoutController extends Controller
             $this->authorize('checkout', $asset);
 
             if (!$asset->model) {
-                return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
+                return redirect()->route('hardware.show', $asset)->with('error', trans('admin/hardware/general.model_invalid_fix'));
             }
 
             $admin = auth()->user();
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 9cb88cfb9..f3b2de3e7 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -30,6 +30,7 @@ use Illuminate\Http\Response;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use TypeError;
 
 /**
  * This class controls all actions related to assets for
@@ -201,7 +202,7 @@ class AssetsController extends Controller
                     $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', $request->get('name'), $location);
                 }
 
-                $successes[] = "<a href='" . route('hardware.show', ['hardware' => $asset->id]) . "' style='color: white;'>" . e($asset->asset_tag) . "</a>";
+                $successes[] = "<a href='" . route('hardware.show', $asset) . "' style='color: white;'>" . e($asset->asset_tag) . "</a>";
 
             } else {
                 $failures[] = join(",", $asset->getErrors()->all());
@@ -222,7 +223,7 @@ class AssetsController extends Controller
                     //the most common case, keeping it so we don't have to make every use of that translation string be trans_choice'ed
                     //and re-translated
                     return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
-                        ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', ['hardware' => $asset->id]), 'id', 'tag' => e($asset->asset_tag)]));
+                        ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset), 'id', 'tag' => e($asset->asset_tag)]));
                 } else {
                     //multi-success
                     return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
@@ -240,20 +241,14 @@ class AssetsController extends Controller
      * Returns a view that presents a form to edit an existing asset.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param int $assetId
      * @since [v1.0]
      * @return \Illuminate\Contracts\View\View
      */
-    public function edit($assetId = null) : View | RedirectResponse
+    public function edit(Asset $asset) : View | RedirectResponse
     {
-        if (! $item = Asset::find($assetId)) {
-            // Redirect to the asset management page with error
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
-        //Handles company checks and permissions.
-        $this->authorize($item);
-
-        return view('hardware/edit', compact('item'))
+        $this->authorize($asset);
+        return view('hardware/edit')
+            ->with('item', $asset)
             ->with('statuslabel_list', Helper::statusLabelList())
             ->with('statuslabel_types', Helper::statusTypeList());
     }
@@ -267,15 +262,14 @@ class AssetsController extends Controller
      * @since [v1.0]
      * @return \Illuminate\Contracts\View\View
      */
-    public function show($assetId = null) : View | RedirectResponse
+    public function show(Asset $asset) : View | RedirectResponse
     {
-        $asset = Asset::withTrashed()->find($assetId);
         $this->authorize('view', $asset);
         $settings = Setting::getSettings();
 
         if (isset($asset)) {
             $audit_log = Actionlog::where('action_type', '=', 'audit')
-                ->where('item_id', '=', $assetId)
+                ->where('item_id', '=', $asset->id)
                 ->where('item_type', '=', Asset::class)
                 ->orderBy('created_at', 'DESC')->first();
 
@@ -291,7 +285,7 @@ class AssetsController extends Controller
 
             $qr_code = (object) [
                 'display' => $settings->qr_code == '1',
-                'url' => route('qr_code/hardware', $asset->id),
+                'url' => route('qr_code/hardware', $asset),
             ];
 
             return view('hardware/view', compact('asset', 'qr_code', 'settings'))
@@ -308,14 +302,9 @@ class AssetsController extends Controller
      * @since [v1.0]
      * @author [A. Gianotto] [<snipe@snipe.net>]
      */
-    public function update(ImageUploadRequest $request, $assetId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, Asset $asset) : RedirectResponse
     {
 
-        // Check if the asset exists
-        if (! $asset = Asset::find($assetId)) {
-            // Redirect to the asset management page with error
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
         $this->authorize($asset);
 
         $asset->status_id = $request->input('status_id', null);
@@ -430,7 +419,7 @@ class AssetsController extends Controller
         session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
 
         if ($asset->save()) {
-            return redirect()->to(Helper::getRedirectOption($request, $assetId, 'Assets'))
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                 ->with('success', trans('admin/hardware/message.update.success'));
         }
 
@@ -531,12 +520,12 @@ class AssetsController extends Controller
      * @param int $assetId
      * @since [v1.0]
      */
-    public function getQrCode($assetId = null) : Response | BinaryFileResponse | string | bool
+    public function getQrCode(Asset $asset) : Response | BinaryFileResponse | string | bool
     {
         $settings = Setting::getSettings();
 
         if (($settings->qr_code == '1') && ($settings->label2_2d_type !== 'none')) {
-            $asset = Asset::withTrashed()->find($assetId);
+
             if ($asset) {
                 $size = Helper::barcodeDimensions($settings->label2_2d_type);
                 $qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png';
@@ -590,7 +579,7 @@ class AssetsController extends Controller
                         file_put_contents($barcode_file, $barcode_obj->getPngData());
 
                         return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
-                    } catch (\Exception $e) {
+                    } catch (\Exception|TypeError $e) {
                         Log::debug('The barcode format is invalid.');
 
                         return response(file_get_contents(public_path('uploads/barcodes/invalid_barcode.gif')))->header('Content-type', 'image/gif');
@@ -877,12 +866,11 @@ class AssetsController extends Controller
         return view('hardware/quickscan-checkin')->with('statusLabel_list', Helper::statusLabelList());
     }
 
-    public function audit($id)
+    public function audit(Asset $asset)
     {
         $settings = Setting::getSettings();
         $this->authorize('audit', Asset::class);
         $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
-        $asset = Asset::findOrFail($id);
         return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt)->with('locations_list');
     }
 
@@ -901,7 +889,7 @@ class AssetsController extends Controller
     }
 
 
-    public function auditStore(UploadFileRequest $request, $id)
+    public function auditStore(UploadFileRequest $request, Asset $asset)
     {
         $this->authorize('audit', Asset::class);
 
@@ -916,8 +904,6 @@ class AssetsController extends Controller
             return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all()));
         }
 
-        $asset = Asset::findOrFail($id);
-
         /**
          * Even though we do a save() further down, we don't want to log this as a "normal" asset update,
          * which would trigger the Asset Observer and would log an asset *update* log entry (because the
diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php
index 1b42037f3..da8b57a55 100755
--- a/app/Http/Controllers/CategoriesController.php
+++ b/app/Http/Controllers/CategoriesController.php
@@ -88,14 +88,10 @@ class CategoriesController extends Controller
      * @param int $categoryId
      * @since [v1.0]
      */
-    public function edit($categoryId = null) : RedirectResponse | View
+    public function edit(Category $category) : RedirectResponse | View
     {
         $this->authorize('update', Category::class);
-        if (is_null($item = Category::find($categoryId))) {
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
-        }
-
-        return view('categories/edit', compact('item'))
+        return view('categories/edit')->with('item', $category)
         ->with('category_types', Helper::categoryTypeList());
     }
 
@@ -108,19 +104,10 @@ class CategoriesController extends Controller
      * @param int $categoryId
      * @since [v1.0]
      */
-    public function update(ImageUploadRequest $request, $categoryId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, Category $category) : RedirectResponse
     {
         $this->authorize('update', Category::class);
-        if (is_null($category = Category::find($categoryId))) {
-            // Redirect to the categories management page
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
-        }
-
-        // Update the category data
         $category->name = $request->input('name');
-        // If the item count is > 0, we disable the category type in the edit. Disabled items
-        // don't POST, so if the category_type is blank we just set it to the default.
-
 
         // Don't allow the user to change the category_type once it's been created
         if (($request->filled('category_type') && ($category->itemCount() > 0))) {
@@ -181,10 +168,10 @@ class CategoriesController extends Controller
      * @param $id
      * @since [v1.8]
      */
-    public function show($id) : View | RedirectResponse
+    public function show(Category $category) : View | RedirectResponse
     {
         $this->authorize('view', Category::class);
-        if ($category = Category::find($id)) {
+
             if ($category->category_type == 'asset') {
                 $category_type = 'hardware';
                 $category_type_route = 'assets';
@@ -199,8 +186,5 @@ class CategoriesController extends Controller
             return view('categories/view', compact('category'))
                 ->with('category_type', $category_type)
                 ->with('category_type_route', $category_type_route);
-        }
-
-        return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
     }
 }
diff --git a/app/Http/Controllers/CompaniesController.php b/app/Http/Controllers/CompaniesController.php
index 12655cb2a..96a80e87e 100644
--- a/app/Http/Controllers/CompaniesController.php
+++ b/app/Http/Controllers/CompaniesController.php
@@ -80,16 +80,10 @@ final class CompaniesController extends Controller
      * @since [v1.8]
      * @param int $companyId
      */
-    public function edit($companyId) : View | RedirectResponse
+    public function edit(Company $company) : View | RedirectResponse
     {
-        if (is_null($item = Company::find($companyId))) {
-            return redirect()->route('companies.index')
-                ->with('error', trans('admin/companies/message.does_not_exist'));
-        }
-
-        $this->authorize('update', $item);
-
-        return view('companies/edit')->with('item', $item);
+        $this->authorize('update', $company);
+        return view('companies/edit')->with('item', $company);
     }
 
     /**
@@ -100,14 +94,10 @@ final class CompaniesController extends Controller
      * @param ImageUploadRequest $request
      * @param int $companyId
      */
-    public function update(ImageUploadRequest $request, $companyId) : RedirectResponse
+    public function update(ImageUploadRequest $request, Company $company) : RedirectResponse
     {
-        if (is_null($company = Company::find($companyId))) {
-            return redirect()->route('companies.index')->with('error', trans('admin/companies/message.does_not_exist'));
-        }
 
         $this->authorize('update', $company);
-
         $company->name = $request->input('name');
         $company->phone = $request->input('phone');
         $company->fax = $request->input('fax');
@@ -158,15 +148,9 @@ final class CompaniesController extends Controller
             ->with('success', trans('admin/companies/message.delete.success'));
     }
 
-    public function show($id) : View | RedirectResponse
+    public function show(Company $company) : View | RedirectResponse
     {
         $this->authorize('view', Company::class);
-
-        if (is_null($company = Company::find($id))) {
-            return redirect()->route('companies.index')
-                ->with('error', trans('admin/companies/message.not_found'));
-        }
-
         return view('companies/view')->with('company', $company);
     }
 }
diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.php
index 62dc25cf1..d5883c05f 100644
--- a/app/Http/Controllers/Components/ComponentsController.php
+++ b/app/Http/Controllers/Components/ComponentsController.php
@@ -107,15 +107,13 @@ class ComponentsController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($componentId = null)
+    public function edit(Component $component)
     {
-        if ($item = Component::find($componentId)) {
-            $this->authorize('update', $item);
 
-            return view('components/edit', compact('item'))->with('category_type', 'component');
-        }
-
-        return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
+            $this->authorize('update', $component);
+            return view('components/edit')
+                ->with('item', $component)
+                ->with('category_type', 'component');
     }
 
 
@@ -130,11 +128,8 @@ class ComponentsController extends Controller
      * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v3.0]
      */
-    public function update(ImageUploadRequest $request, $componentId = null)
+    public function update(ImageUploadRequest $request, Component $component)
     {
-        if (is_null($component = Component::find($componentId))) {
-            return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
-        }
         $min = $component->numCheckedOut();
         $validator = Validator::make($request->all(), [
             'qty' => "required|numeric|min:$min",
@@ -216,17 +211,9 @@ class ComponentsController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($componentId = null)
+    public function show(Component $component)
     {
-        $component = Component::find($componentId);
-
-        if (isset($component->id)) {
             $this->authorize('view', $component);
-
             return view('components/view', compact('component'));
-        }
-        // Redirect to the user management page
-        return redirect()->route('components.index')
-            ->with('error', trans('admin/components/message.does_not_exist'));
     }
 }
diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php
index 47a9ad71b..c96c2db97 100644
--- a/app/Http/Controllers/Consumables/ConsumablesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesController.php
@@ -104,15 +104,13 @@ class ConsumablesController extends Controller
      * @see ConsumablesController::postEdit() method that stores the form data.
      * @since [v1.0]
      */
-    public function edit($consumableId = null) : View | RedirectResponse
+    public function edit(Consumable $consumable) : View | RedirectResponse
     {
-        if ($item = Consumable::find($consumableId)) {
-            $this->authorize($item);
+            $this->authorize($consumable);
+            return view('consumables/edit')
+                ->with('item', $consumable)
+                ->with('category_type', 'consumable');
 
-            return view('consumables/edit', compact('item'))->with('category_type', 'consumable');
-        }
-
-        return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
     }
 
     /**
@@ -126,11 +124,8 @@ class ConsumablesController extends Controller
      * @see ConsumablesController::getEdit() method that stores the form data.
      * @since [v1.0]
      */
-    public function update(StoreConsumableRequest $request, $consumableId = null)
+    public function update(StoreConsumableRequest $request, Consumable $consumable)
     {
-        if (is_null($consumable = Consumable::find($consumableId))) {
-            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
-        }
 
         $min = $consumable->numCheckedOut();
         $validator = Validator::make($request->all(), [
@@ -202,16 +197,11 @@ class ConsumablesController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($consumableId = null)
+    public function show(Consumable $consumable)
     {
-        $consumable = Consumable::withCount('users as users_consumables')->find($consumableId);
+        $consumable = Consumable::withCount('users as users_consumables')->find($consumable->id);
         $this->authorize($consumable);
-        if (isset($consumable->id)) {
-            return view('consumables/view', compact('consumable'));
-        }
-
-        return redirect()->route('consumables.index')
-            ->with('error', trans('admin/consumables/message.does_not_exist'));
+        return view('consumables/view', compact('consumable'));
     }
 
     public function clone(Consumable $consumable) : View
diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index 53c30b88b..1a5fa80ff 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -193,10 +193,8 @@ class CustomFieldsController extends Controller
      * @param  int $id
      * @since [v4.0]
      */
-    public function edit(Request $request, $id) : View | RedirectResponse
+    public function edit(Request $request, CustomField $field) : View | RedirectResponse
     {
-        if ($field = CustomField::find($id)) {
-
         $this->authorize('update', $field);
         $fieldsets = CustomFieldset::get();
         $customFormat = '';
@@ -210,11 +208,7 @@ class CustomFieldsController extends Controller
             'fieldsets'         => $fieldsets,
             'predefinedFormats' => Helper::predefined_formats(),
         ]);
-        } 
 
-        return redirect()->route("fields.index")
-            ->with("error", trans('admin/custom_fields/message.field.invalid'));
-        
     }
 
 
@@ -229,13 +223,9 @@ class CustomFieldsController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(CustomFieldRequest $request, $id) : RedirectResponse
+    public function update(CustomFieldRequest $request, CustomField $field) : RedirectResponse
     {
-        $field = CustomField::find($id);
-
         $this->authorize('update', $field);
-
-
         $show_in_email = $request->get("show_in_email", 0);
         $display_in_user_view = $request->get("display_in_user_view", 0);
 
diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php
index 1d887db29..fde585ba6 100644
--- a/app/Http/Controllers/CustomFieldsetsController.php
+++ b/app/Http/Controllers/CustomFieldsetsController.php
@@ -35,10 +35,12 @@ class CustomFieldsetsController extends Controller
      * @param int $id
      * @since [v1.8]
      */
-    public function show($id) : View | RedirectResponse
+    public function show(CustomFieldset $fieldset) : View | RedirectResponse
     {
         $cfset = CustomFieldset::with('fields')
-            ->where('id', '=', $id)->orderBy('id', 'ASC')->first();
+            ->where('id', '=', $fieldset->id)
+            ->orderBy('id', 'ASC')
+            ->first();
 
         $this->authorize('view', $cfset);
 
@@ -122,16 +124,10 @@ class CustomFieldsetsController extends Controller
      * @param  int  $id
      * @since [v6.0.14]
      */
-    public function edit($id) : View | RedirectResponse
+    public function edit(CustomFieldset $fieldset) : View | RedirectResponse
     {
         $this->authorize('create', CustomField::class);
-
-        if ($fieldset = CustomFieldset::find($id)) {
-            return view('custom_fields.fieldsets.edit')->with('item', $fieldset);
-        }
-
-        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
-
+        return view('custom_fields.fieldsets.edit')->with('item', $fieldset);
     }
 
     /**
@@ -141,23 +137,18 @@ class CustomFieldsetsController extends Controller
      * @param  int  $id
      * @since [v6.0.14]
      */
-    public function update(Request $request, $id) : RedirectResponse
+    public function update(Request $request, CustomFieldset $fieldset) : RedirectResponse
     {
         $this->authorize('create', CustomField::class);
 
-        if ($fieldset = CustomFieldset::find($id)) {
-
-            $fieldset->name = $request->input('name');
-
-            if ($fieldset->save()) {
-                return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/general.fieldset_updated'));
-            }
-
-            return redirect()->back()->withInput()->withErrors($fieldset->getErrors());
+        $fieldset->name = $request->input('name');
 
+        if ($fieldset->save()) {
+            return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/general.fieldset_updated'));
         }
 
-        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
+        return redirect()->back()->withInput()->withErrors($fieldset->getErrors());
+
     }
 
     /**
diff --git a/app/Http/Controllers/DepartmentsController.php b/app/Http/Controllers/DepartmentsController.php
index fe90162c4..f49242127 100644
--- a/app/Http/Controllers/DepartmentsController.php
+++ b/app/Http/Controllers/DepartmentsController.php
@@ -73,17 +73,10 @@ class DepartmentsController extends Controller
      * @param int $id
      * @since [v4.0]
      */
-    public function show($id) : View | RedirectResponse
+    public function show(Department $department) : View | RedirectResponse
     {
-        $department = Department::find($id);
-
         $this->authorize('view', $department);
-
-        if (isset($department->id)) {
-            return view('departments/view', compact('department'));
-        }
-
-        return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist'));
+        return view('departments/view', compact('department'));
     }
 
     /**
@@ -139,15 +132,10 @@ class DepartmentsController extends Controller
      * @param int $departmentId
      * @since [v1.0]
      */
-    public function edit($departmentId = null) : View | RedirectResponse
+    public function edit(Department $department) : View | RedirectResponse
     {
-        if (is_null($item = Department::find($departmentId))) {
-            return redirect()->back()->with('error', trans('admin/locations/message.does_not_exist'));
-        }
-
-        $this->authorize('update', $item);
-
-        return view('departments/edit', compact('item'));
+        $this->authorize('update', $department);
+        return view('departments/edit')->with('item', $department);
     }
 
     /**
@@ -158,11 +146,8 @@ class DepartmentsController extends Controller
      * @param int $departmentId
      * @since [v1.0]
      */
-    public function update(ImageUploadRequest $request, $id) : RedirectResponse
+    public function update(ImageUploadRequest $request, Department $department) : RedirectResponse
     {
-        if (is_null($department = Department::find($id))) {
-            return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist'));
-        }
 
         $this->authorize('update', $department);
 
diff --git a/app/Http/Controllers/DepreciationsController.php b/app/Http/Controllers/DepreciationsController.php
index 5f4a5ca10..2c98e240b 100755
--- a/app/Http/Controllers/DepreciationsController.php
+++ b/app/Http/Controllers/DepreciationsController.php
@@ -95,17 +95,11 @@ class DepreciationsController extends Controller
      * @param int $depreciationId
      * @since [v1.0]
      */
-    public function edit($depreciationId = null) : RedirectResponse | View
+    public function edit(Depreciation $depreciation) : RedirectResponse | View
     {
-        // Check if the depreciation exists
-        if (is_null($item = Depreciation::find($depreciationId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
-        }
 
-        $this->authorize('update', $item);
-
-        return view('depreciations/edit', compact('item'));
+        $this->authorize('update', $depreciation);
+        return view('depreciations/edit')->with('item', $depreciation);
     }
 
     /**
@@ -117,17 +111,10 @@ class DepreciationsController extends Controller
      * @param int $depreciationId
      * @since [v1.0]
      */
-    public function update(Request $request, $depreciationId = null) : RedirectResponse
+    public function update(Request $request, Depreciation $depreciation) : RedirectResponse
     {
-        // Check if the depreciation exists
-        if (is_null($depreciation = Depreciation::find($depreciationId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
-        }
 
         $this->authorize('update', $depreciation);
-
-        // Depreciation data
         $depreciation->name             = $request->input('name');
         $depreciation->months           = $request->input('months');
 
@@ -191,12 +178,12 @@ class DepreciationsController extends Controller
      * @param int $depreciationId
      * @since [v1.0]
      */
-    public function show($id) : View | RedirectResponse
+    public function show(Depreciation $depreciation) : View | RedirectResponse
     {
         $depreciation = Depreciation::withCount('assets as assets_count')
             ->withCount('models as models_count')
             ->withCount('licenses as licenses_count')
-            ->find($id);
+            ->find($depreciation->id);
 
         $this->authorize('view', $depreciation);
 
diff --git a/app/Http/Controllers/GroupsController.php b/app/Http/Controllers/GroupsController.php
index 6aaf58ebd..524004335 100755
--- a/app/Http/Controllers/GroupsController.php
+++ b/app/Http/Controllers/GroupsController.php
@@ -79,19 +79,12 @@ class GroupsController extends Controller
      * @param int $id
      * @since [v1.0]
      */
-    public function edit($id) : View | RedirectResponse
+    public function edit(Group $group) : View | RedirectResponse
     {
-        $group = Group::find($id);
-
-        if ($group) {
-            $permissions = config('permissions');
-            $groupPermissions = $group->decodePermissions();
-            $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-
-            return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
-        }
-
-        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
+        $permissions = config('permissions');
+        $groupPermissions = $group->decodePermissions();
+        $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
+        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
     }
 
     /**
@@ -102,11 +95,8 @@ class GroupsController extends Controller
      * @param int $id
      * @since [v1.0]
      */
-    public function update(Request $request, $id = null) : RedirectResponse
+    public function update(Request $request, Group $group) : RedirectResponse
     {
-        if (! $group = Group::find($id)) {
-            return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
-        }
         $group->name = $request->input('name');
         $group->permissions = json_encode($request->input('permission'));
         $group->notes = $request->input('notes');
@@ -151,14 +141,8 @@ class GroupsController extends Controller
      * @param $id
      * @since [v4.0.11]
      */
-    public function show($id) : View | RedirectResponse
+    public function show(Group $group) : View | RedirectResponse
     {
-        $group = Group::find($id);
-
-        if ($group) {
-            return view('groups/view', compact('group'));
-        }
-
-        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
+      return view('groups/view', compact('group'));
     }
 }
diff --git a/app/Http/Controllers/Kits/CheckoutKitController.php b/app/Http/Controllers/Kits/CheckoutKitController.php
index bf4f64a8d..f34dbdc2c 100644
--- a/app/Http/Controllers/Kits/CheckoutKitController.php
+++ b/app/Http/Controllers/Kits/CheckoutKitController.php
@@ -4,10 +4,8 @@ namespace App\Http\Controllers\Kits;
 
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
-use App\Models\PredefinedKit;
 use App\Models\Asset;
-use App\Models\PredefinedLicence;
-use App\Models\PredefinedModel;
+use App\Models\PredefinedKit;
 use App\Models\User;
 use App\Services\PredefinedKitCheckoutService;
 use Illuminate\Http\Request;
@@ -35,12 +33,9 @@ class CheckoutKitController extends Controller
      * @author [D. Minaev.] [<dmitriy.minaev.v@gmail.com>]
      * @return \Illuminate\Contracts\View\View View to checkout
      */
-    public function showCheckout($kit_id)
+    public function showCheckout(PredefinedKit $kit)
     {
         $this->authorize('checkout', Asset::class);
-
-        $kit = PredefinedKit::findOrFail($kit_id);
-
         return view('kits/checkout')->with('kit', $kit);
     }
 
diff --git a/app/Http/Controllers/Kits/PredefinedKitsController.php b/app/Http/Controllers/Kits/PredefinedKitsController.php
index 54f751451..96e4ec4b0 100644
--- a/app/Http/Controllers/Kits/PredefinedKitsController.php
+++ b/app/Http/Controllers/Kits/PredefinedKitsController.php
@@ -76,17 +76,15 @@ class PredefinedKitsController extends Controller
      * @param int $kit_id
      * @return \Illuminate\Contracts\View\View
      */
-    public function edit($kit_id = null)
+    public function edit(PredefinedKit $kit)
     {
         $this->authorize('update', PredefinedKit::class);
-        if ($kit = PredefinedKit::find($kit_id)) {
+
             return view('kits/edit')
                 ->with('item', $kit)
                 ->with('models', $kit->models)
                 ->with('licenses', $kit->licenses);
-        }
 
-        return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
     }
 
     /**
@@ -98,15 +96,9 @@ class PredefinedKitsController extends Controller
      * @param int $kit_id
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(ImageUploadRequest $request, $kit_id = null)
+    public function update(ImageUploadRequest $request, PredefinedKit $kit)
     {
         $this->authorize('update', PredefinedKit::class);
-        // Check if the kit exists
-        if (is_null($kit = PredefinedKit::find($kit_id))) {
-            // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
-        }
-
         $kit->name = $request->input('name');
 
         if ($kit->save()) {
@@ -153,9 +145,9 @@ class PredefinedKitsController extends Controller
      * @param int $modelId
      * @return \Illuminate\Contracts\View\View
      */
-    public function show($kit_id = null)
+    public function show(PredefinedKit $kit)
     {
-        return $this->edit($kit_id);
+        return $this->edit($kit);
     }
 
     /**
diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php
index 373a16764..4197cf771 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -28,16 +28,11 @@ class LicenseCheckinController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($seatId = null, $backTo = null)
+    public function create(LicenseSeat $licenseSeat, $backTo = null)
     {
         // Check if the asset exists
-        if (is_null($licenseSeat = LicenseSeat::find($seatId)) || is_null($license = License::find($licenseSeat->license_id))) {
-            // Redirect to the asset management page with error
-            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
-        }
-
+        $license = License::find($licenseSeat->license_id);
         $this->authorize('checkout', $license);
-
         return view('licenses/checkin', compact('licenseSeat'))->with('backto', $backTo);
     }
 
diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index 0f31db144..564ce97a8 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -28,33 +28,24 @@ class LicenseCheckoutController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($id)
+    public function create(License $license)
     {
+        $this->authorize('checkout', $license);
 
-        if ($license = License::find($id)) {
+        if ($license->category) {
 
-            $this->authorize('checkout', $license);
-
-            if ($license->category) {
-
-                // Make sure there is at least one available to checkout
-                if ($license->availCount()->count() < 1){
-                    return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));
-                }
-
-                // Return the checkout view
-                return view('licenses/checkout', compact('license'));
+            // Make sure there is at least one available to checkout
+            if ($license->availCount()->count() < 1) {
+                return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));
             }
 
-            // Invalid category
-            return redirect()->route('licenses.edit', ['license' => $license->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.license')]));
-
+            // Return the checkout view
+            return view('licenses/checkout', compact('license'));
         }
 
-        // Not found
-        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
-
+        // Invalid category
+        return redirect()->route('licenses.edit', ['license' => $license->id])
+            ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.license')]));
 
     }
 
diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php
index 6098423ba..ab1e3868d 100755
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -121,13 +121,10 @@ class LicensesController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($licenseId = null)
+    public function edit(License $license)
     {
-        if (is_null($item = License::find($licenseId))) {
-            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
-        }
 
-        $this->authorize('update', $item);
+        $this->authorize('update', $license);
 
         $maintained_list = [
             '' => 'Maintained',
@@ -135,7 +132,8 @@ class LicensesController extends Controller
             '0' => 'No',
         ];
 
-        return view('licenses/edit', compact('item'))
+        return view('licenses/edit')
+            ->with('item', $license)
             ->with('depreciation_list', Helper::depreciationList())
             ->with('maintained_list', $maintained_list);
     }
@@ -153,11 +151,9 @@ class LicensesController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(Request $request, $licenseId = null)
+    public function update(Request $request, License $license)
     {
-        if (is_null($license = License::find($licenseId))) {
-            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
-        }
+
 
         $this->authorize('update', $license);
 
@@ -201,10 +197,10 @@ class LicensesController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($licenseId)
+    public function destroy(License $license)
     {
         // Check if the license exists
-        if (is_null($license = License::find($licenseId))) {
+        if (is_null($license = License::find($license->id))) {
             // Redirect to the license management page
             return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
         }
@@ -238,14 +234,9 @@ class LicensesController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($licenseId = null)
+    public function show(License $license)
     {
-        $license = License::with('assignedusers')->find($licenseId);
-
-        if (!$license) {
-            return redirect()->route('licenses.index')
-            ->with('error', trans('admin/licenses/message.does_not_exist'));
-        }
+        $license = License::with('assignedusers')->find($license->id);
 
         $users_count = User::where('autoassign_licenses', '1')->count();
         $total_seats_count = $license->totalSeatsByLicenseID();
@@ -267,10 +258,10 @@ class LicensesController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $licenseId
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse | \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function getClone($licenseId = null)
+    public function getClone($licenseId = null) : \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse
     {
         if (is_null($license_to_clone = License::find($licenseId))) {
             return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
index e250e5cfa..7cf44d604 100755
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -97,15 +97,10 @@ class LocationsController extends Controller
      * @param int $locationId
      * @since [v1.0]
      */
-    public function edit($locationId = null) : View | RedirectResponse
+    public function edit(Location $location) : View | RedirectResponse
     {
         $this->authorize('update', Location::class);
-        // Check if the location exists
-        if (is_null($item = Location::find($locationId))) {
-            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
-        }
-
-        return view('locations/edit', compact('item'));
+        return view('locations/edit');
     }
 
     /**
@@ -117,15 +112,10 @@ class LocationsController extends Controller
      * @param int $locationId
      * @since [v1.0]
      */
-    public function update(ImageUploadRequest $request, $locationId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, Location $location) : RedirectResponse
     {
         $this->authorize('update', Location::class);
-        // Check if the location exists
-        if (is_null($location = Location::find($locationId))) {
-            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
-        }
 
-        // Update the location data
         $location->name = $request->input('name');
         $location->parent_id = $request->input('parent_id', null);
         $location->currency = $request->input('currency', '$');
@@ -194,7 +184,7 @@ class LocationsController extends Controller
      * @param int $id
      * @since [v1.0]
      */
-    public function show($id = null) : View | RedirectResponse
+    public function show(Location $location) : View | RedirectResponse
     {
         $location = Location::withCount('assignedAssets as assigned_assets_count')
             ->withCount('assets as assets_count')
@@ -202,7 +192,7 @@ class LocationsController extends Controller
             ->withCount('children as children_count')
             ->withCount('users as users_count')
             ->withTrashed()
-            ->find($id);
+            ->find($location->id);
 
         if (isset($location->id)) {
             return view('locations/view', compact('location'));
diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php
index eb8c80d87..985ec769f 100755
--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -85,18 +85,10 @@ class ManufacturersController extends Controller
      * @param int $manufacturerId
      * @since [v1.0]
      */
-    public function edit($manufacturerId = null) : View | RedirectResponse
+    public function edit(Manufacturer $manufacturer) : View | RedirectResponse
     {
-        // Handles manufacturer checks and permissions.
         $this->authorize('update', Manufacturer::class);
-
-        // Check if the manufacturer exists
-        if (! $item = Manufacturer::find($manufacturerId)) {
-            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
-        }
-
-        // Show the page
-        return view('manufacturers/edit', compact('item'));
+        return view('manufacturers/edit')->with('item', $manufacturer);
     }
 
     /**
@@ -108,16 +100,10 @@ class ManufacturersController extends Controller
      * @param int $manufacturerId
      * @since [v1.0]
      */
-    public function update(ImageUploadRequest $request, $manufacturerId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, Manufacturer $manufacturer) : RedirectResponse
     {
         $this->authorize('update', Manufacturer::class);
-        // Check if the manufacturer exists
-        if (is_null($manufacturer = Manufacturer::find($manufacturerId))) {
-            // Redirect to the manufacturer  page
-            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
-        }
 
-        // Save the data
         $manufacturer->name = $request->input('name');
         $manufacturer->url = $request->input('url');
         $manufacturer->support_url = $request->input('support_url');
@@ -185,18 +171,10 @@ class ManufacturersController extends Controller
      * @param int $manufacturerId
      * @since [v1.0]
      */
-    public function show($manufacturerId = null) : View | RedirectResponse
+    public function show(Manufacturer $manufacturer) : View | RedirectResponse
     {
         $this->authorize('view', Manufacturer::class);
-        $manufacturer = Manufacturer::find($manufacturerId);
-
-        if (isset($manufacturer->id)) {
-            return view('manufacturers/view', compact('manufacturer'));
-        }
-
-        $error = trans('admin/manufacturers/message.does_not_exist');
-        // Redirect to the user management page
-        return redirect()->route('manufacturers.index')->with('error', $error);
+        return view('manufacturers/view', compact('manufacturer'));
     }
 
     /**
diff --git a/app/Http/Controllers/StatuslabelsController.php b/app/Http/Controllers/StatuslabelsController.php
index 21a7c798b..6fd261206 100755
--- a/app/Http/Controllers/StatuslabelsController.php
+++ b/app/Http/Controllers/StatuslabelsController.php
@@ -26,14 +26,10 @@ class StatuslabelsController extends Controller
         return view('statuslabels.index');
     }
 
-    public function show($id) : View | RedirectResponse
+    public function show(Statuslabel $statuslabel) : View | RedirectResponse
     {
         $this->authorize('view', Statuslabel::class);
-        if ($statuslabel = Statuslabel::find($id)) {
-            return view('statuslabels.view')->with('statuslabel', $statuslabel);
-        }
-
-        return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
+        return view('statuslabels.view')->with('statuslabel', $statuslabel);
     }
 
     /**
@@ -91,20 +87,15 @@ class StatuslabelsController extends Controller
      *
      * @param  int $statuslabelId
      */
-    public function edit($statuslabelId = null) : View | RedirectResponse
+    public function edit(Statuslabel $statuslabel) : View | RedirectResponse
     {
         $this->authorize('update', Statuslabel::class);
-        // Check if the Statuslabel exists
-        if (is_null($item = Statuslabel::find($statuslabelId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
-        }
-
-        $use_statuslabel_type = $item->getStatuslabelType();
 
         $statuslabel_types = ['' => trans('admin/hardware/form.select_statustype')] + ['undeployable' => trans('admin/hardware/general.undeployable')] + ['pending' => trans('admin/hardware/general.pending')] + ['archived' => trans('admin/hardware/general.archived')] + ['deployable' => trans('admin/hardware/general.deployable')];
 
-        return view('statuslabels/edit', compact('item', 'statuslabel_types'))->with('use_statuslabel_type', $use_statuslabel_type);
+        return view('statuslabels/edit', compact('statuslabel_types'))
+            ->with('item', $statuslabel)
+            ->with('use_statuslabel_type', $statuslabel);
     }
 
     /**
@@ -112,14 +103,9 @@ class StatuslabelsController extends Controller
      *
      * @param  int $statuslabelId
      */
-    public function update(Request $request, $statuslabelId = null) : RedirectResponse
+    public function update(Request $request, Statuslabel $statuslabel) : RedirectResponse
     {
         $this->authorize('update', Statuslabel::class);
-        // Check if the Statuslabel exists
-        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
-        }
 
         if (! $request->filled('statuslabel_types')) {
             return redirect()->back()->withInput()->withErrors(['statuslabel_types' => trans('validation.statuslabel_type')]);
diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php
index 605bb66f6..d96031a9a 100755
--- a/app/Http/Controllers/SuppliersController.php
+++ b/app/Http/Controllers/SuppliersController.php
@@ -77,17 +77,10 @@ class SuppliersController extends Controller
      *
      * @param  int $supplierId
      */
-    public function edit($supplierId = null) : View | RedirectResponse
+    public function edit(Supplier $supplier) : View | RedirectResponse
     {
         $this->authorize('update', Supplier::class);
-        // Check if the supplier exists
-        if (is_null($item = Supplier::find($supplierId))) {
-            // Redirect to the supplier  page
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
-        }
-
-        // Show the page
-        return view('suppliers/edit', compact('item'));
+        return view('suppliers/edit')->with('item',  $supplier);
     }
 
     /**
@@ -95,14 +88,9 @@ class SuppliersController extends Controller
      *
      * @param  int $supplierId
      */
-    public function update($supplierId, ImageUploadRequest $request) : RedirectResponse
+    public function update(ImageUploadRequest $request, Supplier $supplier) : RedirectResponse
     {
         $this->authorize('update', Supplier::class);
-
-        if (is_null($supplier = Supplier::find($supplierId))) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
-        }
-
         // Save the  data
         $supplier->name = request('name');
         $supplier->address = request('address');
@@ -163,15 +151,10 @@ class SuppliersController extends Controller
      * @param null $supplierId
      * @internal param int $assetId
      */
-    public function show($supplierId = null) : View | RedirectResponse
+    public function show(Supplier $supplier) : View | RedirectResponse
     {
         $this->authorize('view', Supplier::class);
-        $supplier = Supplier::find($supplierId);
+        return view('suppliers/view', compact('supplier'));
 
-        if (isset($supplier->id)) {
-            return view('suppliers/view', compact('supplier'));
-        }
-
-        return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
     }
 }
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 397bfd16d..a3f001a76 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -182,11 +182,11 @@ class UsersController extends Controller
      * @internal param int $id
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($id)
+    public function edit(User $user)
     {
 
         $this->authorize('update', User::class);
-        $user = User::with(['assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc'])->withTrashed()->find($id);
+        $user = User::with(['assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc'])->withTrashed()->find($user->id);
 
         if ($user) {
 
@@ -198,7 +198,7 @@ class UsersController extends Controller
             $userPermissions = Helper::selectedPermissionsArray($permissions, $user->permissions);
             $permissions = $this->filterDisplayable($permissions);
 
-            return view('users/edit', compact('user', 'groups', 'userGroups', 'permissions', 'userPermissions'))->with('item', $user);
+            return view('users/edit', compact('user', 'groups', 'userGroups', 'permissions', 'userPermissions'));
         }
 
         return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
@@ -324,7 +324,7 @@ class UsersController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy(DeleteUserRequest $request, $id = null)
+    public function destroy(DeleteUserRequest $request, $id)
     {
         $this->authorize('delete', User::class);
 
@@ -398,23 +398,18 @@ class UsersController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($userId = null)
+    public function show(User $user)
     {
         // Make sure the user can view users at all
         $this->authorize('view', User::class);
 
-        $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($userId);
+        $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($user->id);
 
         // Make sure they can view this particular user
         $this->authorize('view', $user);
 
-        if ($user) {
             $userlog = $user->userlog->load('item');
             return view('users/view', compact('user', 'userlog'))->with('settings', Setting::getSettings());
-        }
-
-        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', ['id' => $userId]));
-
     }
 
 
@@ -428,7 +423,7 @@ class UsersController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function getClone(Request $request, $id = null)
+    public function getClone(Request $request, User $user)
     {
         $this->authorize('create', User::class);
 
@@ -438,7 +433,7 @@ class UsersController extends Controller
         app('request')->request->set('permissions', $permissions);
 
 
-        $user_to_clone = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($id);
+        $user_to_clone = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($user->id);
         // Make sure they can view this particular user
         $this->authorize('view', $user_to_clone);
 
diff --git a/app/Http/Requests/DeleteUserRequest.php b/app/Http/Requests/DeleteUserRequest.php
index 99574950d..6d387917c 100644
--- a/app/Http/Requests/DeleteUserRequest.php
+++ b/app/Http/Requests/DeleteUserRequest.php
@@ -24,7 +24,7 @@ class DeleteUserRequest extends FormRequest
 
     public function prepareForValidation(): void
     {
-        $user_to_delete = User::withTrashed()->find(request()->route('user'));
+        $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user'));
 
         if ($user_to_delete) {
             $this->merge([
@@ -61,7 +61,8 @@ class DeleteUserRequest extends FormRequest
     public function messages(): array
     {
 
-        $user_to_delete = User::withTrashed()->find(request()->route('user'));
+        $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user'));
+
         $messages = [];
 
         if ($user_to_delete) {
diff --git a/app/Presenters/AssetMaintenancesPresenter.php b/app/Presenters/AssetMaintenancesPresenter.php
index ca49c931a..a9640790d 100644
--- a/app/Presenters/AssetMaintenancesPresenter.php
+++ b/app/Presenters/AssetMaintenancesPresenter.php
@@ -22,6 +22,15 @@ class AssetMaintenancesPresenter extends Presenter
                 'title' => trans('general.id'),
                 'visible' => false,
             ], [
+                'field' => 'title',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.name'),
+                'visible' => true,
+                'formatter' => 'maintenancesLinkFormatter',
+            ],
+            [
                 'field' => 'company',
                 'searchable' => true,
                 'sortable' => true,
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 19bd2985e..abd6769d3 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -35,7 +35,7 @@ class AssetPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('general.company'),
                 'visible' => false,
-                'formatter' => 'assetCompanyObjFilterFormatter',
+                'formatter' => 'companiesLinkObjFormatter',
             ], [
                 'field' => 'name',
                 'searchable' => true,
diff --git a/app/Presenters/StatusLabelPresenter.php b/app/Presenters/StatusLabelPresenter.php
index 2e4340004..5bc4bd883 100644
--- a/app/Presenters/StatusLabelPresenter.php
+++ b/app/Presenters/StatusLabelPresenter.php
@@ -28,7 +28,7 @@ class StatusLabelPresenter extends Presenter
                 'switchable' => false,
                 'title' => trans('general.name'),
                 'visible' => true,
-                'formatter' => 'statuslabelsAssetLinkFormatter',
+                'formatter' => 'statuslabelsLinkFormatter',
             ],[
                 'field' => 'type',
                 'searchable' => false,
diff --git a/app/Providers/BreadcrumbsServiceProvider.php b/app/Providers/BreadcrumbsServiceProvider.php
new file mode 100644
index 000000000..da44e7142
--- /dev/null
+++ b/app/Providers/BreadcrumbsServiceProvider.php
@@ -0,0 +1,539 @@
+<?php namespace App\Providers;
+
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\AssetMaintenance;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\CustomField;
+use App\Models\CustomFieldset;
+use App\Models\Department;
+use App\Models\Depreciation;
+use App\Models\Group;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\PredefinedKit;
+use App\Models\Statuslabel;
+use App\Models\Supplier;
+use App\Models\User;
+use Illuminate\Support\ServiceProvider;
+use Tabuna\Breadcrumbs\Breadcrumbs;
+use Tabuna\Breadcrumbs\Trail;
+
+class BreadcrumbsServiceProvider extends ServiceProvider
+{
+/**
+* Handles the resource routes for first-class objects
+*
+* @return void
+*/
+    public function boot()
+    {
+
+        // Default home
+        Breadcrumbs::for('home', fn (Trail $trail) =>
+        $trail->push('<x-icon type="home" /><span class="sr-only">'.trans('general.dashboard').'</span>', route('home'))
+        );
+
+        /**
+         * Asset Breadcrumbs
+         */
+
+
+            if ((request()->is('hardware*')) && (request()->status!='')) {
+                Breadcrumbs::for('hardware.index', fn (Trail $trail) =>
+                $trail->parent('home', route('home'))
+                    ->push(trans('general.assets'), route('hardware.index'))
+                    ->push(request()->status.' Assets', route('hardware.index', ['status' => request()->status]))
+                );
+
+            } else {
+                Breadcrumbs::for('hardware.index', fn (Trail $trail) =>
+                $trail->parent('home', route('home'))
+                    ->push(trans('general.assets'), route('hardware.index'))
+                );
+            }
+
+
+
+
+        Breadcrumbs::for('hardware.create', fn (Trail $trail) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+        ->push(trans('general.create'), route('hardware.create'))
+        );
+
+        Breadcrumbs::for('hardware.show', fn (Trail $trail, Asset $asset) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+            ->push($asset->present()->fullName(), route('hardware.show', $asset))
+        );
+
+        Breadcrumbs::for('hardware.edit', fn (Trail $trail, Asset $asset) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $asset->asset_tag]), route('hardware.edit', $asset))
+        );
+
+
+        /**
+         * Asset Model Breadcrumbs
+         */
+        Breadcrumbs::for('models.index', fn (Trail $trail) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+            ->push(trans('general.asset_models'), route('models.index'))
+        );
+
+        Breadcrumbs::for('models.create', fn (Trail $trail) =>
+        $trail->parent('models.index', route('models.index'))
+            ->push(trans('general.create'), route('models.create'))
+        );
+
+        Breadcrumbs::for('models.show', fn (Trail $trail, AssetModel $model) =>
+        $trail->parent('models.index', route('models.index'))
+            ->push($model->name, route('models.show', $model))
+        );
+
+        Breadcrumbs::for('models.edit', fn (Trail $trail, AssetModel $model) =>
+        $trail->parent('models.index', route('models.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $model->name]), route('models.edit', $model))
+        );
+
+
+        /**
+         * Accessories Breadcrumbs
+         */
+        Breadcrumbs::for('accessories.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.accessories'), route('accessories.index'))
+        );
+
+        Breadcrumbs::for('accessories.create', fn (Trail $trail) =>
+        $trail->parent('accessories.index', route('accessories.index'))
+            ->push(trans('general.create'), route('accessories.create'))
+        );
+
+        Breadcrumbs::for('accessories.show', fn (Trail $trail, Accessory $accessory) =>
+        $trail->parent('accessories.index', route('accessories.index'))
+            ->push($accessory->name, route('accessories.show', $accessory))
+        );
+
+        Breadcrumbs::for('accessories.edit', fn (Trail $trail, Accessory $accessory) =>
+        $trail->parent('accessories.index', route('accessories.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $accessory->name]), route('accessories.edit', $accessory))
+        );
+
+
+        /**
+         * Categories Breadcrumbs
+         */
+        Breadcrumbs::for('categories.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.categories'), route('categories.index'))
+        );
+
+        Breadcrumbs::for('categories.create', fn (Trail $trail) =>
+        $trail->parent('categories.index', route('categories.index'))
+            ->push(trans('general.create'), route('categories.create'))
+        );
+
+        Breadcrumbs::for('categories.show', fn (Trail $trail, Category $category) =>
+        $trail->parent('categories.index', route('categories.index'))
+            ->push($category->name, route('categories.show', $category))
+        );
+
+        Breadcrumbs::for('categories.edit', fn (Trail $trail, Category $category) =>
+        $trail->parent('categories.index', route('categories.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $category->name]), route('categories.edit', $category))
+        );
+
+
+
+        /**
+         * Company Breadcrumbs
+         */
+        Breadcrumbs::for('companies.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.companies'), route('companies.index'))
+        );
+
+        Breadcrumbs::for('companies.create', fn (Trail $trail) =>
+        $trail->parent('companies.index', route('companies.index'))
+            ->push(trans('general.create'), route('companies.create'))
+        );
+
+        Breadcrumbs::for('companies.show', fn (Trail $trail, Company $company) =>
+        $trail->parent('companies.index', route('companies.index'))
+            ->push($company->name, route('companies.show', $company))
+        );
+
+        Breadcrumbs::for('companies.edit', fn (Trail $trail, Company $company) =>
+        $trail->parent('companies.index', route('companies.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $company->name]), route('companies.edit', $company))
+        );
+
+
+        /**
+         * Components Breadcrumbs
+         */
+        Breadcrumbs::for('components.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.components'), route('components.index'))
+        );
+
+        Breadcrumbs::for('components.create', fn (Trail $trail) =>
+        $trail->parent('components.index', route('components.index'))
+            ->push(trans('general.create'), route('components.create'))
+        );
+
+        Breadcrumbs::for('components.show', fn (Trail $trail, Component $component) =>
+        $trail->parent('components.index', route('components.index'))
+            ->push($component->name, route('components.show', $component))
+        );
+
+        Breadcrumbs::for('components.edit', fn (Trail $trail, Component $component) =>
+        $trail->parent('components.index', route('components.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $component->name]), route('components.edit', $component))
+        );
+
+
+        /**
+         * Consumables Breadcrumbs
+         */
+        Breadcrumbs::for('consumables.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.consumables'), route('consumables.index'))
+        );
+
+        Breadcrumbs::for('consumables.create', fn (Trail $trail) =>
+        $trail->parent('consumables.index', route('consumables.index'))
+            ->push(trans('general.create'), route('consumables.create'))
+        );
+
+        Breadcrumbs::for('consumables.show', fn (Trail $trail, Consumable $consumable) =>
+        $trail->parent('consumables.index', route('consumables.index'))
+            ->push($consumable->name, route('consumables.show', $consumable))
+        );
+
+        Breadcrumbs::for('consumables.edit', fn (Trail $trail, Consumable $consumable) =>
+        $trail->parent('consumables.index', route('consumables.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $consumable->name]), route('consumables.edit', $consumable))
+        );
+
+        /**
+         * Custom fields Breadcrumbs
+         */
+        Breadcrumbs::for('fields.index', fn (Trail $trail) =>
+        $trail->parent('models.index', route('models.index'))
+            ->push(trans('admin/custom_fields/general.custom_fields'), route('fields.index'))
+        );
+
+        Breadcrumbs::for('fields.create', fn (Trail $trail) =>
+        $trail->parent('fields.index', route('fields.index'))
+            ->push(trans('general.create'), route('fields.create'))
+        );
+
+        Breadcrumbs::for('fields.edit', fn (Trail $trail, CustomField $field) =>
+        $trail->parent('fields.index', route('fields.index'))
+            ->push($field->name, route('fields.edit', $field))
+        );
+
+        /**
+         * Custom fieldsets Breadcrumbs
+         */
+
+        Breadcrumbs::for('fieldsets.create', fn (Trail $trail) =>
+        $trail->parent('fields.index', route('fields.index'))
+            ->push(trans('general.create'), route('fieldsets.create'))
+        );
+
+        Breadcrumbs::for('fieldsets.show', fn (Trail $trail, CustomFieldset $fieldset) =>
+        $trail->parent('fields.index', route('fields.index'))
+            ->push($fieldset->name, route('fields.index'))
+        );
+
+        Breadcrumbs::for('fieldsets.edit', fn (Trail $trail, CustomFieldset $fieldset) =>
+        $trail->parent('fields.index', route('fields.index'))
+            ->push($fieldset->name, route('fieldsets.edit', $fieldset))
+        );
+
+        /**
+         * Department Breadcrumbs
+         */
+        Breadcrumbs::for('departments.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.departments'), route('departments.index'))
+        );
+
+        Breadcrumbs::for('departments.create', fn (Trail $trail) =>
+        $trail->parent('departments.index', route('departments.index'))
+            ->push(trans('general.create'), route('departments.create'))
+        );
+
+        Breadcrumbs::for('departments.show', fn (Trail $trail, Department $department) =>
+        $trail->parent('departments.index', route('departments.index'))
+            ->push($department->name, route('home'))
+        );
+
+        Breadcrumbs::for('departments.edit', fn (Trail $trail, Department $department) =>
+        $trail->parent('departments.index', route('departments.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $department->name]), route('departments.edit', $department))
+        );
+
+
+        /**
+         * Department Breadcrumbs
+         */
+        Breadcrumbs::for('depreciations.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.depreciations'), route('depreciations.index'))
+        );
+
+        Breadcrumbs::for('depreciations.create', fn (Trail $trail) =>
+        $trail->parent('depreciations.index', route('depreciations.index'))
+            ->push(trans('general.create'), route('depreciations.create'))
+        );
+
+        Breadcrumbs::for('depreciations.show', fn (Trail $trail, Depreciation $depreciation) =>
+        $trail->parent('depreciations.index', route('depreciations.index'))
+            ->push($depreciation->name, route('depreciations.show', $depreciation))
+        );
+
+        Breadcrumbs::for('depreciations.edit', fn (Trail $trail, Depreciation $depreciation) =>
+        $trail->parent('depreciations.index', route('depreciations.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $depreciation->name]), route('depreciations.edit', $depreciation))
+        );
+
+        /**
+         * Groups Breadcrumbs
+         */
+        Breadcrumbs::for('groups.index', fn (Trail $trail) =>
+        $trail->parent('settings.index', route('settings.index'))
+            ->push(trans('general.groups'), route('groups.index'))
+        );
+
+        Breadcrumbs::for('groups.create', fn (Trail $trail) =>
+        $trail->parent('groups.index', route('groups.index'))
+            ->push(trans('general.create'), route('groups.create'))
+        );
+
+        Breadcrumbs::for('groups.show', fn (Trail $trail, Group $group) =>
+        $trail->parent('groups.index', route('groups.index'))
+            ->push($group->name, route('groups.show', $group))
+        );
+
+        Breadcrumbs::for('groups.edit', fn (Trail $trail, Group $group) =>
+        $trail->parent('groups.index', route('groups.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $group->name]), route('groups.edit', $group))
+        );
+
+
+        /**
+         * Licenses Breadcrumbs
+         */
+        Breadcrumbs::for('licenses.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.licenses'), route('licenses.index'))
+        );
+
+        Breadcrumbs::for('licenses.create', fn (Trail $trail) =>
+        $trail->parent('licenses.index', route('licenses.index'))
+            ->push(trans('general.create'), route('licenses.create'))
+        );
+
+        Breadcrumbs::for('licenses.show', fn (Trail $trail, License $license) =>
+        $trail->parent('licenses.index', route('licenses.index'))
+            ->push($license->name, route('licenses.show', $license))
+        );
+
+        Breadcrumbs::for('licenses.edit', fn (Trail $trail, License $license) =>
+        $trail->parent('licenses.index', route('licenses.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $license->name]), route('licenses.edit', $license))
+        );
+
+
+        /**
+         * Locations Breadcrumbs
+         */
+        Breadcrumbs::for('locations.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.locations'), route('locations.index'))
+        );
+
+        Breadcrumbs::for('locations.create', fn (Trail $trail) =>
+        $trail->parent('locations.index', route('locations.index'))
+            ->push(trans('general.create'), route('locations.create'))
+        );
+
+        Breadcrumbs::for('locations.show', fn (Trail $trail, Location $location) =>
+        $trail->parent('locations.index', route('locations.index'))
+            ->push($location->name, route('locations.show', $location))
+        );
+
+        Breadcrumbs::for('locations.edit', fn (Trail $trail, Location $location) =>
+        $trail->parent('locations.index', route('locations.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $location->name]), route('locations.edit', $location))
+        );
+
+        /**
+         * Maintenances Breadcrumbs
+         */
+        Breadcrumbs::for('maintenances.index', fn (Trail $trail) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+            ->push(trans('general.maintenances'), route('maintenances.index'))
+        );
+
+        Breadcrumbs::for('maintenances.create', fn (Trail $trail) =>
+        $trail->parent('maintenances.index', route('maintenances.index'))
+            ->push(trans('general.create'), route('maintenances.create'))
+        );
+
+        Breadcrumbs::for('maintenances.show', fn (Trail $trail, AssetMaintenance $maintenance) =>
+        $trail->parent('maintenances.index', route('locations.index'))
+            ->push($maintenance->title, route('maintenances.show', $maintenance))
+        );
+
+        Breadcrumbs::for('manufacturers.edit', fn (Trail $trail, Manufacturer $manufacturer) =>
+        $trail->parent('manufacturers.index', route('manufacturers.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $manufacturer->name]), route('manufacturers.edit', $manufacturer))
+        );
+
+
+        /**
+         * Manufacturers Breadcrumbs
+         */
+        Breadcrumbs::for('manufacturers.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.manufacturers'), route('manufacturers.index'))
+        );
+
+        Breadcrumbs::for('manufacturers.create', fn (Trail $trail) =>
+        $trail->parent('manufacturers.index', route('manufacturers.index'))
+            ->push(trans('general.create'), route('manufacturers.create'))
+        );
+
+        Breadcrumbs::for('manufacturers.show', fn (Trail $trail, Manufacturer $manufacturer) =>
+        $trail->parent('manufacturers.index', route('manufacturers.index'))
+            ->push($manufacturer->name, route('home'))
+        );
+
+        Breadcrumbs::for('manufacturers.edit', fn (Trail $trail, Manufacturer $manufacturer) =>
+        $trail->parent('manufacturers.index', route('manufacturers.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $manufacturer->name]), route('manufacturers.edit', $manufacturer))
+        );
+
+
+        /**
+         * Predefined Kits Breadcrumbs
+         */
+        Breadcrumbs::for('kits.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.kits'), route('kits.index'))
+        );
+
+        Breadcrumbs::for('kits.create', fn (Trail $trail) =>
+        $trail->parent('kits.index', route('kits.index'))
+            ->push(trans('general.create'), route('kits.create'))
+        );
+
+        Breadcrumbs::for('kits.show', fn (Trail $trail, PredefinedKit $kit) =>
+        $trail->parent('kits.index', route('kits.index'))
+            ->push($kit->name, route('kits.show', $kit))
+        );
+
+        Breadcrumbs::for('kits.edit', fn (Trail $trail, PredefinedKit $kit) =>
+        $trail->parent('kits.index', route('kits.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $kit->name]), route('kits.edit', $kit))
+        );
+
+
+        /**
+         * Status Labels Breadcrumbs
+         */
+        Breadcrumbs::for('statuslabels.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.status_labels'), route('statuslabels.index'))
+        );
+
+        Breadcrumbs::for('statuslabels.create', fn (Trail $trail) =>
+        $trail->parent('statuslabels.index', route('statuslabels.index'))
+            ->push(trans('general.create'), route('statuslabels.create'))
+        );
+
+        Breadcrumbs::for('statuslabels.show', fn (Trail $trail, Statuslabel $statuslabel) =>
+        $trail->parent('statuslabels.index', route('statuslabels.index'))
+            ->push($statuslabel->name, route('statuslabels.show', $statuslabel))
+        );
+
+        Breadcrumbs::for('statuslabels.edit', fn (Trail $trail, Statuslabel $statuslabel) =>
+        $trail->parent('statuslabels.index', route('statuslabels.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $statuslabel->name]), route('statuslabels.edit', $statuslabel))
+        );
+
+
+        /**
+         * Settings Breadcrumbs
+         */
+        Breadcrumbs::for('settings.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.admin'), route('settings.index'))
+        );
+
+
+
+        /**
+         * Suppliers Breadcrumbs
+         */
+        Breadcrumbs::for('suppliers.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.suppliers'), route('suppliers.index'))
+        );
+
+        Breadcrumbs::for('suppliers.create', fn (Trail $trail) =>
+        $trail->parent('suppliers.index', route('suppliers.index'))
+            ->push(trans('general.create'), route('suppliers.create'))
+        );
+
+        Breadcrumbs::for('suppliers.show', fn (Trail $trail, Supplier $supplier) =>
+        $trail->parent('suppliers.index', route('suppliers.index'))
+            ->push($supplier->name, route('home'))
+        );
+
+        Breadcrumbs::for('suppliers.edit', fn (Trail $trail, Supplier $supplier) =>
+        $trail->parent('suppliers.index', route('suppliers.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $supplier->name]), route('suppliers.edit', $supplier))
+        );
+
+
+
+        /**
+         * Users Breadcrumbs
+         */
+        Breadcrumbs::for('users.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.users'), route('users.index'))
+        );
+
+        Breadcrumbs::for('users.create', fn (Trail $trail) =>
+        $trail->parent('users.index', route('users.index'))
+            ->push(trans('general.create'), route('users.create'))
+        );
+
+        Breadcrumbs::for('users.show', fn (Trail $trail, User $user) =>
+        $trail->parent('users.index', route('users.index'))
+            ->push($user->username, route('users.show', $user))
+        );
+
+        Breadcrumbs::for('users.edit', fn (Trail $trail, User $user) =>
+        $trail->parent('users.index', route('users.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $user->name]), route('users.edit', $user))
+        );
+
+
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Providers/SamlServiceProvider.php b/app/Providers/SamlServiceProvider.php
index 18b93cf56..c9e50dafe 100644
--- a/app/Providers/SamlServiceProvider.php
+++ b/app/Providers/SamlServiceProvider.php
@@ -49,10 +49,6 @@ class SamlServiceProvider extends ServiceProvider
                     'uses' => 'Auth\SamlController@login', ]
             );
 
-            Route::group(['prefix' => 'admin', 'middleware' => ['web', 'auth', 'authorize:superuser']], function () {
-                Route::get('saml', ['as' => 'settings.saml.index', 'uses' => 'SettingsController@getSamlSettings']);
-                Route::post('saml', ['as' => 'settings.saml.save', 'uses' => 'SettingsController@postSamlSettings']);
-            });
         });
     }
 
diff --git a/composer.json b/composer.json
index 3040dc424..cff5374c3 100644
--- a/composer.json
+++ b/composer.json
@@ -66,6 +66,7 @@
     "rollbar/rollbar-laravel": "^8.0",
     "spatie/laravel-backup": "^8.8",
     "spatie/laravel-ignition": "^2.0",
+    "tabuna/breadcrumbs": "^4.2",
     "tecnickcom/tc-lib-barcode": "^1.15",
     "tecnickcom/tcpdf": "^6.5",
     "unicodeveloper/laravel-password": "^1.0",
diff --git a/composer.lock b/composer.lock
index b8e67655d..bd35f975d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2a6e7f5e039ee2f40605aefc5c5baf08",
+    "content-hash": "8966b3d72c2db545cd54772d7f049804",
     "packages": [
         {
             "name": "alek13/slack",
@@ -10938,6 +10938,72 @@
             ],
             "time": "2024-11-08T15:28:48+00:00"
         },
+        {
+            "name": "tabuna/breadcrumbs",
+            "version": "4.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tabuna/breadcrumbs.git",
+                "reference": "1d9047306f67e7fcc86fc7e608f1432f247636da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tabuna/breadcrumbs/zipball/1d9047306f67e7fcc86fc7e608f1432f247636da",
+                "reference": "1d9047306f67e7fcc86fc7e608f1432f247636da",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "laravel/framework": "^10.0|^11.0",
+                "laravel/serializable-closure": "^1.0|^2.0",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^8.0|^9.0",
+                "phpunit/php-code-coverage": "^10.|^11.0",
+                "phpunit/phpunit": "^10.5|^11.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "aliases": {
+                        "Breadcrumbs": "Tabuna\\Breadcrumbs\\Breadcrumbs"
+                    },
+                    "providers": [
+                        "Tabuna\\Breadcrumbs\\BreadcrumbsServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Tabuna\\Breadcrumbs\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alexandr Chernyaev",
+                    "email": "bliz48rus@gmail.com"
+                },
+                {
+                    "name": "Dwight Watson",
+                    "email": "dwight@studentservices.com.au"
+                },
+                {
+                    "name": "Dave James Miller",
+                    "email": "dave@davejamesmiller.com"
+                }
+            ],
+            "description": "An easy way to add breadcrumbs to your Laravel app.",
+            "support": {
+                "issues": "https://github.com/tabuna/breadcrumbs/issues",
+                "source": "https://github.com/tabuna/breadcrumbs/tree/4.2.1"
+            },
+            "time": "2024-11-26T12:21:27+00:00"
+        },
         {
             "name": "tecnickcom/tc-lib-barcode",
             "version": "1.18.4",
diff --git a/config/app.php b/config/app.php
index 39898ff43..a09c92693 100755
--- a/config/app.php
+++ b/config/app.php
@@ -316,6 +316,7 @@ return [
         App\Providers\LivewireServiceProvider::class,
         App\Providers\MacroServiceProvider::class,
         App\Providers\SamlServiceProvider::class,
+        App\Providers\BreadcrumbsServiceProvider::class,
 
     ],
 
diff --git a/resources/lang/aa-ER/admin/settings/general.php b/resources/lang/aa-ER/admin/settings/general.php
index 486d8aa44..57dc9608c 100644
--- a/resources/lang/aa-ER/admin/settings/general.php
+++ b/resources/lang/aa-ER/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'crwdns1453:0crwdne1453:0',
     'ldap_basedn'               => 'crwdns1454:0crwdne1454:0',
     'ldap_filter'               => 'crwdns1455:0crwdne1455:0',
-    'ldap_pw_sync'              => 'crwdns1692:0crwdne1692:0',
-    'ldap_pw_sync_help'         => 'crwdns1693:0crwdne1693:0',
+    'ldap_pw_sync'              => 'crwdns12882:0crwdne12882:0',
+    'ldap_pw_sync_help'         => 'crwdns12884:0crwdne12884:0',
     'ldap_username_field'       => 'crwdns1456:0crwdne1456:0',
     'ldap_lname_field'          => 'crwdns1457:0crwdne1457:0',
     'ldap_fname_field'          => 'crwdns1458:0crwdne1458:0',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'crwdns6469:0crwdne6469:0',
     'ldap_extension_warning' => 'crwdns6471:0crwdne6471:0',
     'ldap_ad' => 'crwdns6473:0crwdne6473:0',
+    'ldap_test_label' => 'crwdns12892:0crwdne12892:0',
+    'ldap_test_login' => 'crwdns12894:0crwdne12894:0',
+    'ldap_username_placeholder' => 'crwdns12896:0crwdne12896:0',
+    'ldap_password_placeholder' => 'crwdns12898:0crwdne12898:0',
     'employee_number' => 'crwdns6475:0crwdne6475:0',
     'create_admin_user' => 'crwdns6477:0crwdne6477:0',
     'create_admin_success' => 'crwdns6479:0crwdne6479:0',
diff --git a/resources/lang/aa-ER/admin/settings/message.php b/resources/lang/aa-ER/admin/settings/message.php
index 6ea3f0ca3..364e54b16 100644
--- a/resources/lang/aa-ER/admin/settings/message.php
+++ b/resources/lang/aa-ER/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'crwdns6729:0crwdne6729:0',
         'authentication_success' => 'crwdns6731:0crwdne6731:0'
     ],
+    'labels' => [
+        'null_template' => 'crwdns12900:0crwdne12900:0',
+        ],
     'webhook' => [
         'sending' => 'crwdns11373:0crwdne11373:0',
         'success' => 'crwdns11841:0crwdne11841:0',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'crwdns11843:0crwdne11843:0',
         'error_misc' => 'crwdns11383:0crwdne11383:0',
         'webhook_fail' => 'crwdns12830:0crwdne12830:0',
+        'webhook_channel_not_found' => 'crwdns12876:0crwdne12876:0'
     ]
 ];
diff --git a/resources/lang/aa-ER/general.php b/resources/lang/aa-ER/general.php
index 625d52f40..72a0616d7 100644
--- a/resources/lang/aa-ER/general.php
+++ b/resources/lang/aa-ER/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'crwdns6115:0crwdne6115:0',
     'custom_report'         => 'crwdns1139:0crwdne1139:0',
     'dashboard'				=> 'crwdns1202:0crwdne1202:0',
+    'data_source'           => 'crwdns12886:0crwdne12886:0',
     'days'      			=> 'crwdns1917:0crwdne1917:0',
     'days_to_next_audit'    => 'crwdns1918:0crwdne1918:0',
     'date'					=> 'crwdns1045:0crwdne1045:0',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'crwdns1995:0crwdne1995:0',
     'lastnamefirstinitial_format' =>  'crwdns1999:0crwdne1999:0',
     'firstintial_dot_lastname_format' => 'crwdns5948:0crwdne5948:0',
+    'lastname_dot_firstinitial_format' => 'crwdns12880:0crwdne12880:0',
     'firstname_lastname_display'	=> 'crwdns11779:0crwdne11779:0',
     'lastname_firstname_display'	=> 'crwdns11781:0crwdne11781:0',
     'name_display_format'	=> 'crwdns11783:0crwdne11783:0',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'crwdns1075:0crwdne1075:0',
     'notes'  				=> 'crwdns1076:0crwdne1076:0',
     'note_added'            => 'crwdns12858:0crwdne12858:0',
+    'options'				=> 'crwdns12888:0crwdne12888:0',
+    'preview'				=> 'crwdns12890:0crwdne12890:0',
     'add_note'              => 'crwdns12860:0crwdne12860:0',
     'note_edited'            => 'crwdns12862:0crwdne12862:0',
     'edit_note'              => 'crwdns12864:0crwdne12864:0',
@@ -560,6 +564,7 @@ return [
         'consumables'  => 'crwdns12144:0crwdne12144:0',
         'components'  => 'crwdns12146:0crwdne12146:0',
     ],
+
     'more_info' => 'crwdns12288:0crwdne12288:0',
     'quickscan_bulk_help' => 'crwdns12290:0crwdne12290:0',
     'whoops' => 'crwdns12304:0crwdne12304:0',
@@ -576,4 +581,9 @@ return [
     'user_managed_passwords_disallow' => 'crwdns12872:0crwdne12872:0',
     'user_managed_passwords_allow' => 'crwdns12874:0crwdne12874:0',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'crwdns12878:0crwdne12878:0',
+    ],
+
 ];
diff --git a/resources/lang/af-ZA/admin/settings/general.php b/resources/lang/af-ZA/admin/settings/general.php
index 8ac7f5678..1af1d999b 100644
--- a/resources/lang/af-ZA/admin/settings/general.php
+++ b/resources/lang/af-ZA/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP-koppel wagwoord',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP-wagwoordsynkronisering',
-    'ldap_pw_sync_help'         => 'Verwyder hierdie vinkje as u nie LDAP-wagwoorde wil laat sinkroniseer met plaaslike wagwoorde nie. As u hierdie opsie uitskakel, beteken dit dat u gebruikers dalk nie kan aanmeld as u LDAP-bediener om een ​​of ander rede onbereikbaar is nie.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Gebruikernaam',
     'ldap_lname_field'          => 'Van',
     'ldap_fname_field'          => 'LDAP Voornaam',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Verwyder verwyderde rekords',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/af-ZA/admin/settings/message.php b/resources/lang/af-ZA/admin/settings/message.php
index 07ff4e44a..6fbea3051 100644
--- a/resources/lang/af-ZA/admin/settings/message.php
+++ b/resources/lang/af-ZA/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/af-ZA/general.php b/resources/lang/af-ZA/general.php
index a56402945..5c7ce88fb 100644
--- a/resources/lang/af-ZA/general.php
+++ b/resources/lang/af-ZA/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Aangepaste bateverslag',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dae',
     'days_to_next_audit'    => 'Dae na Volgende Oudit',
     'date'					=> 'datum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Geen',
     'notes'  				=> 'notas',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Meer inligting',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/am-ET/admin/settings/general.php b/resources/lang/am-ET/admin/settings/general.php
index 97567df8d..ad21bbb64 100644
--- a/resources/lang/am-ET/admin/settings/general.php
+++ b/resources/lang/am-ET/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/am-ET/admin/settings/message.php b/resources/lang/am-ET/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/am-ET/admin/settings/message.php
+++ b/resources/lang/am-ET/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/am-ET/general.php b/resources/lang/am-ET/general.php
index e91979b76..7d4e119a3 100644
--- a/resources/lang/am-ET/general.php
+++ b/resources/lang/am-ET/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/ar-SA/admin/settings/general.php b/resources/lang/ar-SA/admin/settings/general.php
index e349eaa8e..c8fa3d31c 100644
--- a/resources/lang/ar-SA/admin/settings/general.php
+++ b/resources/lang/ar-SA/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'لداب ربط كلمة المرور',
     'ldap_basedn'               => 'قاعدة ربط دن',
     'ldap_filter'               => 'فلتر لداب',
-    'ldap_pw_sync'              => 'مزامنة كلمة مرور لداب',
-    'ldap_pw_sync_help'         => 'ألغ تحديد هذا المربع إذا كنت لا ترغب في الاحتفاظ بكلمات مرور لداب التي تمت مزامنتها مع كلمات المرور المحلية. ويعني تعطيل هذا أن المستخدمين قد لا يتمكنون من تسجيل الدخول إذا تعذر الوصول إلى خادم لداب لسبب ما.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'حقل اسم المستخدم',
     'ldap_lname_field'          => 'الكنية',
     'ldap_fname_field'          => 'لداب الاسم الأول',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'تطهير السجلات المحذوفة',
     'ldap_extension_warning' => 'لا يبدو أن ملحق LDAP مثبت أو مفعّل على هذا الخادم. لا يزال بإمكانك حفظ الإعدادات الخاصة بك، ولكن ستحتاج إلى تمكين ملحق LDAP لـ PHP قبل أن تعمل مزامنة LDAP أو تسجيل الدخول.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'رقم الموظف',
     'create_admin_user' => 'إنشاء مستخدم ::',
     'create_admin_success' => 'نجاح! تم إضافة مستخدم المشرف الخاص بك!',
diff --git a/resources/lang/ar-SA/admin/settings/message.php b/resources/lang/ar-SA/admin/settings/message.php
index 6c9c50748..1aa1fb9f0 100644
--- a/resources/lang/ar-SA/admin/settings/message.php
+++ b/resources/lang/ar-SA/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'اختبار مصادقة LDAP...',
         'authentication_success' => 'تمت المصادقة على المستخدم ضد LDAP بنجاح!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'إرسال رسالة اختبار :app ...',
         'success' => 'يعمل تكامل :webhook_name الخاص بك!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'خطأ: 301/302 :endpoint يرجع إعادة توجيه. لأسباب أمنية، نحن لا نتابع إعادة التوجيه. الرجاء استخدام نقطة النهاية الفعلية.',
         'error_misc' => 'حدث خطأ ما. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ar-SA/general.php b/resources/lang/ar-SA/general.php
index 8e05a77dc..19d6ed14f 100644
--- a/resources/lang/ar-SA/general.php
+++ b/resources/lang/ar-SA/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'تخصيص التقرير',
     'custom_report'         => 'تقرير مخصص للأصول',
     'dashboard'				=> 'لوحة القيادة',
+    'data_source'           => 'Data Source',
     'days'      			=> 'أيام',
     'days_to_next_audit'    => 'أيام إلى التدقيق التالي',
     'date'					=> 'التاريخ',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'الاسم الأول الاسم الأخير (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'اللقب والحرف الاول من الاسم (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'الاسم الأخير الأول (jsmith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'الاسم الأول الاسم الأخير (جين سميث)',
     'lastname_firstname_display'	=> 'اسم العائلة الأول (ميث جاني)',
     'name_display_format'	=> 'تنسيق عرض الاسم',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'لا',
     'notes'  				=> 'مُلاحظات',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count مستهلكة<unk> :count مستهلك',
         'components'  => ':count مكون<unk> :count مكونات',
     ],
+
     'more_info' => 'المزيد من المعلومات',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/bg-BG/admin/settings/general.php b/resources/lang/bg-BG/admin/settings/general.php
index 4a9106ce1..1eb9dc3b8 100644
--- a/resources/lang/bg-BG/admin/settings/general.php
+++ b/resources/lang/bg-BG/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP парола на потребител за връзка',
     'ldap_basedn'               => 'Базов DN',
     'ldap_filter'               => 'LDAP филтър',
-    'ldap_pw_sync'              => 'LADP Password SYNC',
-    'ldap_pw_sync_help'         => 'Премахнете отметката в тази клетка ако не желаете да запазите LDAP паролите синхронизирани с локални пароли. Деактивиране на това означава, че вашите потребители може да не успеят да влязат използвайки LDAP сървъри ако са недостижими по някаква причина.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Поле за потребителско име',
     'ldap_lname_field'          => 'Фамилия',
     'ldap_fname_field'          => 'LDAP собствено име',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Пречисти изтрити записи',
     'ldap_extension_warning' => 'Изглежда, че нямате инсталирани LDAP разширения или не са пуснати на сървъра. Вие можете все пак да запишите настройките, но ще трябва да включите LDAP разширенията за PHP преди да синхронизирате с LDAP, в противен случай няма да можете да се логнете.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Номер на служител',
     'create_admin_user' => 'Нов потребител ::',
     'create_admin_success' => 'Готово! Вашият админ потребител беше добавен!',
diff --git a/resources/lang/bg-BG/admin/settings/message.php b/resources/lang/bg-BG/admin/settings/message.php
index 593fb56f6..8a2127e84 100644
--- a/resources/lang/bg-BG/admin/settings/message.php
+++ b/resources/lang/bg-BG/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Тест LDAP Автентификация...',
         'authentication_success' => 'Потребителска Автентификация към LDAP успешна!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Изпращане :app тест съобщение...',
         'success' => 'Вашата :webhook_name интеграция работи!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'Грешка 301/302 :endpoint върна пренасочване. От съображения за сигурност, ние не отваряме пренасочванията. Моля ползвайте действителната крайна точка.',
         'error_misc' => 'Възникна грешка. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/bg-BG/general.php b/resources/lang/bg-BG/general.php
index fbd52a06c..32aa366d7 100644
--- a/resources/lang/bg-BG/general.php
+++ b/resources/lang/bg-BG/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Персонализиран отчет',
     'custom_report'         => 'Потребителски справки за активи',
     'dashboard'				=> 'Табло',
+    'data_source'           => 'Data Source',
     'days'      			=> 'дни',
     'days_to_next_audit'    => 'Дни до следващия одит',
     'date'					=> 'Дата',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Име Фамилия (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  'Фамилно име Инициал на собствено (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Първа буква от името и Фамилия (i.ivanov@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Име Фамилия (Иван Иванов)',
     'lastname_firstname_display'	=> 'Фамилия Име (Иванов Иван)',
     'name_display_format'	=> 'Формат на показване на името',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Не',
     'notes'  				=> 'Бележки',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Консуматив|:count Консумативи',
         'components'  => ':count Компонент|:count Компоненти',
     ],
+
     'more_info' => 'Повече информация',
     'quickscan_bulk_help' => 'Поставянето на отметка в това квадратче ще редактира записа на актива, за да отрази това ново местоположение. Оставянето му без отметка просто ще отбележи местоположението в журнала за проверка. Обърнете внимание, че ако този актив бъде извлечен, той няма да промени местоположението на лицето, актива или местоположението, към които е извлечен.',
     'whoops' => 'Упс!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/ca-ES/admin/settings/general.php b/resources/lang/ca-ES/admin/settings/general.php
index 97567df8d..ad21bbb64 100644
--- a/resources/lang/ca-ES/admin/settings/general.php
+++ b/resources/lang/ca-ES/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/ca-ES/admin/settings/message.php b/resources/lang/ca-ES/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/ca-ES/admin/settings/message.php
+++ b/resources/lang/ca-ES/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ca-ES/general.php b/resources/lang/ca-ES/general.php
index 3c4b9aaf9..8684e37a7 100644
--- a/resources/lang/ca-ES/general.php
+++ b/resources/lang/ca-ES/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Informe de Recursos Personalitzat',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/chr-US/admin/settings/general.php b/resources/lang/chr-US/admin/settings/general.php
index 97567df8d..ad21bbb64 100644
--- a/resources/lang/chr-US/admin/settings/general.php
+++ b/resources/lang/chr-US/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/chr-US/admin/settings/message.php b/resources/lang/chr-US/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/chr-US/admin/settings/message.php
+++ b/resources/lang/chr-US/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/chr-US/general.php b/resources/lang/chr-US/general.php
index 77670b5a7..53482e853 100644
--- a/resources/lang/chr-US/general.php
+++ b/resources/lang/chr-US/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/cs-CZ/admin/settings/general.php b/resources/lang/cs-CZ/admin/settings/general.php
index c48f9014f..b3699ea48 100644
--- a/resources/lang/cs-CZ/admin/settings/general.php
+++ b/resources/lang/cs-CZ/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP heslo připojení',
     'ldap_basedn'               => 'Základní svázání DN',
     'ldap_filter'               => 'LDAP filtr',
-    'ldap_pw_sync'              => 'LDAP heslo synchronizace',
-    'ldap_pw_sync_help'         => 'Zrušte zaškrtnutí tohoto políčka, pokud si nepřejete zachovat hesla LDAP synchronizovaná s lokálními hesly. Pokud to zakážete znamená to, že se uživatelé nemusí přihlásit, pokud je váš LDAP server z nějakého důvodu nedostupný.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Pole uživatelského jména',
     'ldap_lname_field'          => 'Příjmení',
     'ldap_fname_field'          => 'LDAP jméno',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Vymazat smazané záznamy',
     'ldap_extension_warning' => 'Nevypadá to, že LDAP rozšíření je nainstalováno nebo povoleno na tomto serveru. Stále můžete uložit vaše nastavení, ale budete muset povolit LDAP rozšíření pro PHP, než bude fungovat LDAP synchronizace nebo přihlášení.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Osobní číslo',
     'create_admin_user' => 'Vytvořit uživatele ::',
     'create_admin_success' => 'Úspěch! Administrátorský účet byl přidán!',
diff --git a/resources/lang/cs-CZ/admin/settings/message.php b/resources/lang/cs-CZ/admin/settings/message.php
index 07d2d4a26..60b0f30c9 100644
--- a/resources/lang/cs-CZ/admin/settings/message.php
+++ b/resources/lang/cs-CZ/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testování LDAP ověření...',
         'authentication_success' => 'Uživatel byl úspěšně ověřen přes LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Odesílání testovací zprávy :app...',
         'success' => 'Vaše integrace :webhook_name funguje!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'CHYBA: 301/302 :endpoint vrací přesměrování. Z bezpečnostních důvodů nesledujeme přesměrování. Použijte prosím skutečný koncový bod.',
         'error_misc' => 'Něco se nepovedlo.',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/cs-CZ/general.php b/resources/lang/cs-CZ/general.php
index 5197c5611..c2ae70c0b 100644
--- a/resources/lang/cs-CZ/general.php
+++ b/resources/lang/cs-CZ/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Přizpůsobit report',
     'custom_report'         => 'Vlastní report majetku',
     'dashboard'				=> 'Nástěnka',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dnů',
     'days_to_next_audit'    => 'Dny k dalšímu auditu',
     'date'					=> 'Datum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Jméno Příjmení (jan_novak@example.com)',
     'lastnamefirstinitial_format' =>  'Příjmení první písmeno ze jména (novakj@example.com)',
     'firstintial_dot_lastname_format' => 'Iniciál Príjmení (j.novak@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Jméno příjmení (Jane Smith)',
     'lastname_firstname_display'	=> 'Příjmení (Smith Jane)',
     'name_display_format'	=> 'Formát zobrazení jména',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Ne',
     'notes'  				=> 'Poznámky',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Spotřební materiál|:count Spotřební materiál',
         'components'  => ':count komponenta|:count komponenty',
     ],
+
     'more_info' => 'Více informací',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/cy-GB/admin/settings/general.php b/resources/lang/cy-GB/admin/settings/general.php
index 0910e8249..3f935c578 100644
--- a/resources/lang/cy-GB/admin/settings/general.php
+++ b/resources/lang/cy-GB/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Cyfrinair i cysylltu trwy LDAP',
     'ldap_basedn'               => 'DN Cyswllt Sylfaenol',
     'ldap_filter'               => 'Hidlydd LDAP',
-    'ldap_pw_sync'              => 'Sync cyfrinair LDAP',
-    'ldap_pw_sync_help'         => 'Tynnwch y tic o\'r focs yma os nad ydych am cadw cyfrineiriau LDAP mewn sync a cyfrineiriau lleol. Mae an-alluogi hyn yn feddwl ni ellith defnyddywr mewngofnodi os oes problem hefo\'r server LDAP.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Maes Enw Defnyddiwr',
     'ldap_lname_field'          => 'Enw Olaf',
     'ldap_fname_field'          => 'Enw Cyntaf LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Clirio cofnodion sydd wedi\'i dileu',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/cy-GB/admin/settings/message.php b/resources/lang/cy-GB/admin/settings/message.php
index 97d7ddeea..9ccd2433d 100644
--- a/resources/lang/cy-GB/admin/settings/message.php
+++ b/resources/lang/cy-GB/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/cy-GB/general.php b/resources/lang/cy-GB/general.php
index 34ad580c6..fee12e50b 100644
--- a/resources/lang/cy-GB/general.php
+++ b/resources/lang/cy-GB/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Adroddiad Asedau Addasedig',
     'dashboard'				=> 'Dashfwrdd',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dyddiau',
     'days_to_next_audit'    => 'Dyddiau tan yr awdit nesaf',
     'date'					=> 'Dyddiad',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Enw Cyntaf Enw Olaf (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  'Enw Olaf Llythyren Cyntaf Enw Cyntaf (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Llythyren Cyntaf Enw Cyntaf Cyfenw (jsmith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Na',
     'notes'  				=> 'Nodiadau',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Mwy o wybodaeth',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/da-DK/admin/settings/general.php b/resources/lang/da-DK/admin/settings/general.php
index 63152f4f5..ebb2be5c5 100644
--- a/resources/lang/da-DK/admin/settings/general.php
+++ b/resources/lang/da-DK/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP-bindingsadgangskode',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP-filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Fjern markeringen i dette felt, hvis du ikke vil beholde LDAP-adgangskoder synkroniseret med lokale adgangskoder. Deaktivering dette betyder, at dine brugere muligvis ikke kan logge ind, hvis din LDAP-server ikke er tilgængelig af en eller anden grund.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Brugernavn felt',
     'ldap_lname_field'          => 'Efternavn',
     'ldap_fname_field'          => 'LDAP fornavn',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Ryd slettet poster',
     'ldap_extension_warning' => 'Det ser ikke ud som om LDAP- udvidelsen er installeret eller aktiveret på denne server. Du kan stadig gemme dine indstillinger, men du bliver nødt til at aktivere LDAP-udvidelsen til PHP, før LDAP-synkronisering eller login vil virke.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Medarbejdernummer',
     'create_admin_user' => 'Opret en bruger ::',
     'create_admin_success' => 'Succes! Din admin bruger er blevet tilføjet!',
diff --git a/resources/lang/da-DK/admin/settings/message.php b/resources/lang/da-DK/admin/settings/message.php
index d66be0559..c47613cf6 100644
--- a/resources/lang/da-DK/admin/settings/message.php
+++ b/resources/lang/da-DK/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Test LDAP Autentificering...',
         'authentication_success' => 'Bruger godkendt mod LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sender :app test besked...',
         'success' => 'Dine :webhook_name Integration virker!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'FEJL: 301/302: endpoint returnerer en omdirigering. Af sikkerhedsmæssige årsager følger vi ikke omdirigeringer. Brug det faktiske slutpunkt.',
         'error_misc' => 'Noget gik galt. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/da-DK/general.php b/resources/lang/da-DK/general.php
index d63b69297..35fd5fd8d 100644
--- a/resources/lang/da-DK/general.php
+++ b/resources/lang/da-DK/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Tilpas rapport',
     'custom_report'         => 'Tilpasset Aktiv Rapport',
     'dashboard'				=> 'Oversigtspanel',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dage',
     'days_to_next_audit'    => 'Dage til næste revision',
     'date'					=> 'Dato',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Fornavn Efternavn (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Efternavn Første initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Første bogstav i fornavn efternavn (jsmith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Fornavn Efternavn (Jane Smith)',
     'lastname_firstname_display'	=> 'Efternavn Fornavn (Smith Jane)',
     'name_display_format'	=> 'Navn Visningsformat',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Nej',
     'notes'  				=> 'Noter',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Forbrugsparti:count Forbrugsvarer',
         'components'  => ':count Komponent:count Komponenter',
     ],
+
     'more_info' => 'Mere Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/de-DE/admin/licenses/message.php b/resources/lang/de-DE/admin/licenses/message.php
index d9ef93760..24cc2310e 100644
--- a/resources/lang/de-DE/admin/licenses/message.php
+++ b/resources/lang/de-DE/admin/licenses/message.php
@@ -50,7 +50,7 @@ return array(
 
     'checkin' => array(
         'error'   => 'Lizenz wurde nicht zurückgenommen, bitte versuchen Sie es erneut.',
-        'not_reassignable' => 'License not reassignable',
+        'not_reassignable' => 'Lizenz nicht neu zuweisbar',
         'success' => 'Die Lizenz wurde erfolgreich zurückgenommen'
     ),
 
diff --git a/resources/lang/de-DE/admin/reports/general.php b/resources/lang/de-DE/admin/reports/general.php
index 677989708..d381499dd 100644
--- a/resources/lang/de-DE/admin/reports/general.php
+++ b/resources/lang/de-DE/admin/reports/general.php
@@ -14,9 +14,9 @@ return [
         'user_country' => 'Land des Benutzers',
         'user_zip' => 'Postleitzahl des Benutzers'
     ],
-    'open_saved_template' => 'Open Saved Template',
-    'save_template' =>  'Save Template',
-    'select_a_template' => 'Select a Template',
-    'template_name' => 'Template Name',
-    'update_template' => 'Update Template',
+    'open_saved_template' => 'Gespeicherte Vorlage öffnen',
+    'save_template' =>  'Vorlage speichern',
+    'select_a_template' => 'Wählen Sie eine Vorlage aus',
+    'template_name' => 'Vorlagenname',
+    'update_template' => 'Vorlage aktualisieren',
 ];
diff --git a/resources/lang/de-DE/admin/reports/message.php b/resources/lang/de-DE/admin/reports/message.php
index 2800bbdf0..dfc487b00 100644
--- a/resources/lang/de-DE/admin/reports/message.php
+++ b/resources/lang/de-DE/admin/reports/message.php
@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'about_templates' => 'About Saved Templates',
-    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'about_templates' => 'Über gespeicherte Vorlagen',
+    'saving_templates_description' => 'Wählen Sie Ihre Optionen aus, geben Sie dann den Namen Ihrer Vorlage in das Feld oben ein und klicken Sie auf die Schaltfläche „Vorlage speichern“. Verwenden Sie das Dropdown-Menü, um eine zuvor gespeicherte Vorlage auszuwählen.',
     'create'  => [
-        'success' => 'Template saved successfully',
+        'success' => 'Vorlage erfolgreich gespeichert',
     ],
     'update' => [
-        'success' => 'Template updated successfully',
+        'success' => 'Vorlage erfolgreich aktualisiert',
     ],
     'delete' => [
-        'success' => 'Template deleted',
-        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+        'success' => 'Vorlage gelöscht',
+        'no_delete_permission' => 'Die Vorlage existiert nicht oder Sie sind nicht berechtigt, sie zu löschen.',
     ],
 ];
diff --git a/resources/lang/de-DE/admin/settings/general.php b/resources/lang/de-DE/admin/settings/general.php
index 4e3d764b5..6657fbd9a 100644
--- a/resources/lang/de-DE/admin/settings/general.php
+++ b/resources/lang/de-DE/admin/settings/general.php
@@ -55,7 +55,7 @@ return [
     'display_asset_name'        => 'Zeige Assetname an',
     'display_checkout_date'     => 'Zeige Herausgabedatum',
     'display_eol'               => 'Zeige EOL in der Tabellenansicht',
-    'display_qr'                => 'Zeige 2D Barcode',
+    'display_qr'                => '2D-Barcode anzeigen',
     'display_alt_barcode'		=> 'Zeige 1D Barcode an',
     'email_logo'                => 'E-Mail-Logo',
     'barcode_type'				=> '2D Barcode Typ',
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Passwort',
     'ldap_basedn'               => 'Basis Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Passwörter synchronisieren',
-    'ldap_pw_sync_help'         => 'Deaktivieren Sie diese Option, wenn Sie nicht möchten, dass LDAP-Passwörter mit lokalen Passwörtern synchronisiert werden. Wenn Sie dies deaktivieren, kann es sein, dass Benutzer sich möglicherweise nicht anmelden können falls der LDAP-Server aus irgendeinem Grund nicht erreichbar ist.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Benutzername',
     'ldap_lname_field'          => 'Nachname',
     'ldap_fname_field'          => 'LDAP Vorname',
@@ -326,10 +326,14 @@ return [
     'asset_tags_help' => 'Inkrementieren und Präfixe',
     'labels' => 'Etiketten',
     'labels_title' => 'Etiketten-Einstellungen aktualisieren',
-    'labels_help' => 'Barcodes &amp; label settings',
+    'labels_help' => 'Barcodes &amp; Etiketteneinstellungen',
     'purge_help' => 'Gelöschte Einträge bereinigen',
     'ldap_extension_warning' => 'Es sieht nicht so aus, als ob die LDAP-Erweiterung auf diesem Server installiert oder aktiviert ist. Sie können Ihre Einstellungen trotzdem speichern, aber Sie müssen die LDAP-Erweiterung für PHP aktivieren, bevor die LDAP-Synchronisierung oder der Login funktioniert.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Mitarbeiternummer',
     'create_admin_user' => 'Benutzer erstellen ::',
     'create_admin_success' => 'Erfolgreich! Ihr Admin-Benutzer wurde hinzugefügt!',
@@ -360,9 +364,9 @@ return [
     'label2_fields_help'      => 'Felder können in der linken Spalte hinzugefügt, entfernt und neu sortiert werden. In jedem Feld können mehrere Optionen für Label und Datenquelle in der rechten Spalte hinzugefügt, entfernt und neu angeordnet werden.',
     'help_asterisk_bold'    => 'Der eingegebene Text <code>**text**</code> wird in Fettschrift angezeigt',
     'help_blank_to_use'     => 'Leer lassen, um den Wert von <code>:setting_name</code> zu verwenden',
-    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'asset_id'              => 'Asset ID',
-    'data'               => 'Data',
+    'help_default_will_use' => '<code>:default</code> verwendet den Wert aus <code>:setting_name</code>. <br>Beachten Sie, dass der Wert der Barcodes der jeweiligen Barcode-Spezifikation entsprechen muss, damit sie erfolgreich generiert werden können. Weitere Einzelheiten finden Sie in der <a href="https://snipe-it.readme.io/docs/barcodes">Dokumentation <i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'Asset-ID',
+    'data'               => 'Daten',
     'default'               => 'Standard',
     'none'                  => 'Nichts',
     'google_callback_help' => 'Dies sollte als Callback-URL in den Google OAuth App-Einstellungen in deinem Unternehmen eingegeben werden&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google Developer Konsole <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -387,13 +391,13 @@ return [
 
     /* Keywords for settings overview help */
     'keywords' => [
-        'brand'             => 'Fußzeile, Logo, Druck, Theme, Skin, Header, Farben, Farbe, CSS',
-        'general_settings'  => 'Firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzernamenformat, Bilder, pro Seite, Vorschaubilder, EULA, Gravatar, TOS, Dashboard, Privatsphäre',
+        'brand'             => 'Fußzeile, Logo, Drucken, Thema, Oberflächendesign, Header, Farben, Farbe, CSS',
+        'general_settings'  => 'Firmensupport, Unterschrift, Akzeptanz, E-Mail-Format, Benutzernamenformat, Bilder, pro Seite, Miniaturansicht, EULA, Gravatar, Nutzungsbedingungen, Dashboard, Datenschutz',
         'groups'            => 'Berechtigungen, Berechtigungsgruppen, Autorisierung',
-        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
-        'localization'      => 'Lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
-        'php_overview'      => 'php Info, System, Info',
-        'purge'             => 'Endgültig löschen',
+        'labels'            => 'Etiketten, Barcodes, Strichcode, Tabellen, Druck, UPC, QR, 1D, 2D',
+        'localization'      => 'Lokalisierung, Währung, lokal, Sprache, Zeitzone, Zeitzone, international, Internationalisierung, Sprache, Sprachen, Übersetzung',
+        'php_overview'      => 'PHP-Info, System, Info',
+        'purge'             => 'endgültig löschen',
         'security'          => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
     ],
 
diff --git a/resources/lang/de-DE/admin/settings/message.php b/resources/lang/de-DE/admin/settings/message.php
index 039acc606..e9b59c844 100644
--- a/resources/lang/de-DE/admin/settings/message.php
+++ b/resources/lang/de-DE/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP-Authentifizierung wird getestet...',
         'authentication_success' => 'Benutzer wurde erfolgreich gegen LDAP authentifiziert!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app Testnachricht wird gesendet...',
         'success' => 'Ihre :webhook_name Integration funktioniert!',
@@ -45,6 +48,7 @@ return [
         'error' => 'Etwas ist schief gelaufen. :app antwortete mit: :error_message',
         'error_redirect' => 'FEHLER: 301/302 :endpoint gibt eine Umleitung zurück. Aus Sicherheitsgründen folgen wir keinen Umleitungen. Bitte verwenden Sie den aktuellen Endpunkt.',
         'error_misc' => 'Etwas ist schiefgelaufen. :( ',
-        'webhook_fail' => '',
+        'webhook_fail' => ' Webhook-Benachrichtigung fehlgeschlagen: Überprüfen Sie, ob die URL noch gültig ist.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/de-DE/general.php b/resources/lang/de-DE/general.php
index e804a8fdf..40677eeda 100644
--- a/resources/lang/de-DE/general.php
+++ b/resources/lang/de-DE/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Bericht anpassen',
     'custom_report'         => 'Benutzerdefinierter Asset-Bericht',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'Tage',
     'days_to_next_audit'    => 'Tage bis zur nächsten Prüfung',
     'date'					=> 'Datum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Vorname_Nachname (erika_mustermann@example.com)',
     'lastnamefirstinitial_format' =>  'Nachname & Initiale des Vornamens (mustere@example.com)',
     'firstintial_dot_lastname_format' => 'Initiale des Vornamen.Nachname (e.mustermann@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Vorname Nachname (Max Mustermann)',
     'lastname_firstname_display'	=> 'Nachname Vorname (Mustermann Max)',
     'name_display_format'	=> 'Name Anzeigeformat',
@@ -216,12 +218,14 @@ return [
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Notizen',
-    'note_added'            => 'Note Added',
-    'add_note'              => 'Add Note',
-    'note_edited'            => 'Note Edited',
-    'edit_note'              => 'Edit Note',
-    'note_deleted'            => 'Note Deleted',
-    'delete_note'              => 'Delete Note',
+    'note_added'            => 'Notiz hinzugefügt',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Notiz hinzufügen',
+    'note_edited'            => 'Notiz bearbeitet',
+    'edit_note'              => 'Notiz bearbeiten',
+    'note_deleted'            => 'Notiz gelöscht',
+    'delete_note'              => 'Notiz löschen',
     'order_number'          => 'Bestellnummer',
     'only_deleted'          => 'Nur gelöschte Gegenstände',
     'page_menu'				=> 'Zeige _MENU_ Einträge',
@@ -308,7 +312,7 @@ return [
     'username_format'		=> 'Format der Benutzernamen',
     'username'              => 'Benutzername',
     'update'                => 'Aktualisieren',
-    'updating_item' => 'Updating :item',
+    'updating_item' => ':item wird aktualisiert',
     'upload_filetypes_help'      => 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf und rar. Maximale Uploadgröße beträgt :size.',
     'uploaded'              => 'Hochgeladen',
     'user'					=> 'Benutzer',
@@ -369,7 +373,7 @@ return [
     'expected_checkin'      => 'Erwartetes Rückgabedatum',
     'reminder_checked_out_items' => 'Dies ist eine Erinnerung an die Artikel, die gerade an Sie herausgegeben sind. Wenn Sie der Meinung sind, dass die Angaben falsch sind (fehlender Artikel oder Artikel, den Sie nie erhalten haben), senden Sie bitte eine E-Mail an :reply_to_name unter :reply_to_address.',
     'changed'               => 'Geändert',
-    'to'                    => 'An',
+    'to'                    => 'bis',
     'report_fields_info'    => '<p>Wählen Sie die Felder aus, die Sie in Ihren benutzerdefinierten Bericht einfügen möchten, und klicken Sie auf Generieren. Die Datei (custom-asset-report-YYYY-mm-dd.csv) wird automatisch heruntergeladen und Sie können sie in Excel öffnen.</p>
             <p>Wenn Sie nur bestimmte Artikel exportieren möchten, verwenden Sie die folgenden Optionen, um Ihre Ergebnisse zu verfeinern.</p>',
     'range'                 => 'Bereich',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Verbrauchsmaterial|:count Verbrauchsmaterialien',
         'components'  => ':count Komponente|:count Komponenten',
     ],
+
     'more_info' => 'Mehr Informationen',
     'quickscan_bulk_help' => 'Wenn Sie dieses Kontrollkästchen aktivieren, wird der Asset-Datensatz so bearbeitet, dass dieser neue Standort angezeigt wird. Wenn Sie es nicht aktivieren, wird der Standort einfach im Prüfprotokoll vermerkt. Beachten Sie, dass sich der Standort der Person, des Assets oder des Standorts, an den es ausgecheckt wurde, nicht ändert, wenn dieses Asset ausgecheckt wird.',
     'whoops' => 'Hoppla!',
@@ -572,9 +577,14 @@ return [
     'label' => 'Label',
     'import_asset_tag_exists' => 'Ein Asset mit dem Asset-Tag :asset_tag ist bereits vorhanden und es wurde keine Aktualisierung angefordert. Es wurden keine Änderungen vorgenommen.',
     'countries_manually_entered_help' => 'Werte mit einem Sternchen (*) wurden manuell eingegeben und stimmen nicht mit vorhandenen Dropdown-Werten nach ISO 3166 überein',
-    'accessories_assigned' => 'Assigned Accessories',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'accessories_assigned' => 'Zugewiesenes Zubehör',
+    'user_managed_passwords' => 'Passwortverwaltung',
+    'user_managed_passwords_disallow' => 'Benutzern die Verwaltung ihrer eigenen Passwörter verbieten',
+    'user_managed_passwords_allow' => 'Benutzern erlauben, ihre eigenen Passwörter zu verwalten',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
 
 ];
diff --git a/resources/lang/de-if/admin/licenses/message.php b/resources/lang/de-if/admin/licenses/message.php
index c63dc5ae3..df0ed3a99 100644
--- a/resources/lang/de-if/admin/licenses/message.php
+++ b/resources/lang/de-if/admin/licenses/message.php
@@ -50,7 +50,7 @@ return array(
 
     'checkin' => array(
         'error'   => 'Lizenz wurde nicht zurückgenommen, bitte versuche es erneut.',
-        'not_reassignable' => 'License not reassignable',
+        'not_reassignable' => 'Lizenz nicht neu zuweisbar',
         'success' => 'Die Lizenz wurde erfolgreich zurückgenommen'
     ),
 
diff --git a/resources/lang/de-if/admin/reports/general.php b/resources/lang/de-if/admin/reports/general.php
index 48e1007a6..bdaeb0cdb 100644
--- a/resources/lang/de-if/admin/reports/general.php
+++ b/resources/lang/de-if/admin/reports/general.php
@@ -14,9 +14,9 @@ return [
         'user_country' => 'Benutzerland',
         'user_zip' => 'Benutzer PLZ'
     ],
-    'open_saved_template' => 'Open Saved Template',
-    'save_template' =>  'Save Template',
-    'select_a_template' => 'Select a Template',
-    'template_name' => 'Template Name',
-    'update_template' => 'Update Template',
+    'open_saved_template' => 'Gespeicherte Vorlage öffnen',
+    'save_template' =>  'Vorlage speichern',
+    'select_a_template' => 'Wählen Sie eine Vorlage aus',
+    'template_name' => 'Vorlagenname',
+    'update_template' => 'Vorlage aktualisieren',
 ];
diff --git a/resources/lang/de-if/admin/reports/message.php b/resources/lang/de-if/admin/reports/message.php
index 2800bbdf0..dfc487b00 100644
--- a/resources/lang/de-if/admin/reports/message.php
+++ b/resources/lang/de-if/admin/reports/message.php
@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'about_templates' => 'About Saved Templates',
-    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'about_templates' => 'Über gespeicherte Vorlagen',
+    'saving_templates_description' => 'Wählen Sie Ihre Optionen aus, geben Sie dann den Namen Ihrer Vorlage in das Feld oben ein und klicken Sie auf die Schaltfläche „Vorlage speichern“. Verwenden Sie das Dropdown-Menü, um eine zuvor gespeicherte Vorlage auszuwählen.',
     'create'  => [
-        'success' => 'Template saved successfully',
+        'success' => 'Vorlage erfolgreich gespeichert',
     ],
     'update' => [
-        'success' => 'Template updated successfully',
+        'success' => 'Vorlage erfolgreich aktualisiert',
     ],
     'delete' => [
-        'success' => 'Template deleted',
-        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+        'success' => 'Vorlage gelöscht',
+        'no_delete_permission' => 'Die Vorlage existiert nicht oder Sie sind nicht berechtigt, sie zu löschen.',
     ],
 ];
diff --git a/resources/lang/de-if/admin/settings/general.php b/resources/lang/de-if/admin/settings/general.php
index 1fd21b4a5..510d83135 100644
--- a/resources/lang/de-if/admin/settings/general.php
+++ b/resources/lang/de-if/admin/settings/general.php
@@ -55,7 +55,7 @@ return [
     'display_asset_name'        => 'Asset-Name anzeigen',
     'display_checkout_date'     => 'Checkout-Datum anzeigen',
     'display_eol'               => 'EOL in Tabellenansicht anzeigen',
-    'display_qr'                => 'Zeige 2D Barcode',
+    'display_qr'                => '2D-Barcode anzeigen',
     'display_alt_barcode'		=> '1D Barcode anzeigen',
     'email_logo'                => 'E-Mail-Logo',
     'barcode_type'				=> '2D Barcode Typ',
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Passwort',
     'ldap_basedn'               => 'Basis Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP-Passwort-Sync',
-    'ldap_pw_sync_help'         => 'Deaktiviere diese Option, wenn du LDAP-Passwörter nicht mit lokalen Passwörtern synchronisieren möchtest. Wenn du diese Option deaktivierst, können sich deine Benutzer möglicherweise nicht anmelden, wenn dein LDAP-Server aus irgendeinem Grund nicht erreichbar ist.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Benutzernamen Feld',
     'ldap_lname_field'          => 'Nachname',
     'ldap_fname_field'          => 'LDAP Vorname',
@@ -326,10 +326,14 @@ return [
     'asset_tags_help' => 'Inkrementieren und Präfixe',
     'labels' => 'Etiketten',
     'labels_title' => 'Etiketten-Einstellungen aktualisieren',
-    'labels_help' => 'Barcodes &amp; label settings',
+    'labels_help' => 'Barcodes &amp; Etiketteneinstellungen',
     'purge_help' => 'Gelöschte Einträge bereinigen',
     'ldap_extension_warning' => 'Es sieht nicht so aus, als ob die LDAP-Erweiterung auf diesem Server installiert oder aktiviert ist. Du kannst deine Einstellungen trotzdem speichern, aber du musst die LDAP-Erweiterung für PHP aktivieren, bevor die LDAP-Synchronisierung oder der Login funktioniert.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Mitarbeiternummer',
     'create_admin_user' => 'Benutzer erstellen ::',
     'create_admin_success' => 'Erfolgreich! Ihr Admin-Benutzer wurde hinzugefügt!',
@@ -360,9 +364,9 @@ return [
     'label2_fields_help'      => 'Felder können in der linken Spalte hinzugefügt, entfernt und neu sortiert werden. In jedem Feld können mehrere Optionen für Label und Datenquelle in der rechten Spalte hinzugefügt, entfernt und neu angeordnet werden.',
     'help_asterisk_bold'    => 'Der eingegebene Text <code>**text**</code> wird in Fettschrift angezeigt',
     'help_blank_to_use'     => 'Leer lassen, um den Wert von <code>:setting_name</code> zu verwenden',
-    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'asset_id'              => 'Asset ID',
-    'data'               => 'Data',
+    'help_default_will_use' => '<code>:default</code> verwendet den Wert aus <code>:setting_name</code>. <br>Beachten Sie, dass der Wert der Barcodes der jeweiligen Barcode-Spezifikation entsprechen muss, damit sie erfolgreich generiert werden können. Weitere Einzelheiten finden Sie in der <a href="https://snipe-it.readme.io/docs/barcodes">Dokumentation <i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'Asset-ID',
+    'data'               => 'Daten',
     'default'               => 'Standard',
     'none'                  => 'Nichts',
     'google_callback_help' => 'Dies sollte als Callback-URL in den Google OAuth App-Einstellungen in deinem Unternehmen eingegeben werden&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google Developer Konsole <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -390,7 +394,7 @@ return [
         'brand'             => 'Fußzeile, Logo, Druck, Thema, Skin, Header, Farben, Farbe, CSS',
         'general_settings'  => 'firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzername Format, Bilder, pro Seite, Vorschaubilder, eula, gravatar, tos, Dashboard, Privatsphäre',
         'groups'            => 'berechtigungen, Berechtigungsgruppen, Autorisierung',
-        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'labels'            => 'Etiketten, Barcodes, Strichcode, Tabellen, Druck, UPC, QR, 1D, 2D',
         'localization'      => 'lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
         'php_overview'      => 'phpinfo, System, Info',
         'purge'             => 'Endgültig löschen',
diff --git a/resources/lang/de-if/admin/settings/message.php b/resources/lang/de-if/admin/settings/message.php
index fc72cf5bc..9ff2c710b 100644
--- a/resources/lang/de-if/admin/settings/message.php
+++ b/resources/lang/de-if/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP-Authentifizierung wird getestet...',
         'authentication_success' => 'Benutzer wurde erfolgreich gegen LDAP authentifiziert!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app Testnachricht wird gesendet ...',
         'success' => 'Deine :webhook_name Integration funktioniert!',
@@ -45,6 +48,7 @@ return [
         'error' => 'Etwas ist schiefgelaufen. :app antwortete mit: :error_message',
         'error_redirect' => 'FEHLER: 301/302 :endpoint gibt eine Umleitung zurück. Aus Sicherheitsgründen folgen wir keine Umleitungen. Bitte verwende den aktuellen Endpunkt.',
         'error_misc' => 'Etwas ist schiefgelaufen! :( ',
-        'webhook_fail' => '',
+        'webhook_fail' => ' Webhook-Benachrichtigung fehlgeschlagen: Überprüfen Sie, ob die URL noch gültig ist.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/de-if/general.php b/resources/lang/de-if/general.php
index fbe448913..52e202436 100644
--- a/resources/lang/de-if/general.php
+++ b/resources/lang/de-if/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Bericht anpassen',
     'custom_report'         => 'Benutzerdefinierter Asset-Bericht',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'Tage',
     'days_to_next_audit'    => 'Tage bis zur nächsten Prüfung',
     'date'					=> 'Datum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Vorname_Nachname (erika_mustermann@example.com)',
     'lastnamefirstinitial_format' =>  'Nachname & Initiale des Vornamens (mustere@example.com)',
     'firstintial_dot_lastname_format' => 'Initiale des Vornamen.Nachname (e.mustermann@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Vorname Nachname (Max Mustermann)',
     'lastname_firstname_display'	=> 'Nachname Vorname (Mustermann Max)',
     'name_display_format'	=> 'Name Anzeigeformat',
@@ -216,12 +218,14 @@ return [
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Anmerkungen',
-    'note_added'            => 'Note Added',
-    'add_note'              => 'Add Note',
-    'note_edited'            => 'Note Edited',
-    'edit_note'              => 'Edit Note',
-    'note_deleted'            => 'Note Deleted',
-    'delete_note'              => 'Delete Note',
+    'note_added'            => 'Notiz hinzugefügt',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Notiz hinzufügen',
+    'note_edited'            => 'Notiz bearbeitet',
+    'edit_note'              => 'Notiz bearbeiten',
+    'note_deleted'            => 'Notiz gelöscht',
+    'delete_note'              => 'Notiz löschen',
     'order_number'          => 'Auftragsnummer',
     'only_deleted'          => 'Nur gelöschte Assets',
     'page_menu'				=> 'Zeige _MENU_ Einträge',
@@ -308,7 +312,7 @@ return [
     'username_format'		=> 'Format der Benutzernamen',
     'username'              => 'Benutzername',
     'update'                => 'Aktualisieren',
-    'updating_item' => 'Updating :item',
+    'updating_item' => ':item wird aktualisiert',
     'upload_filetypes_help'      => 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf und rar. Maximale Uploadgröße beträgt :size.',
     'uploaded'              => 'Hochgeladen',
     'user'					=> 'Benutzer',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Verbrauchsmaterialien|:count Verbrauchsmaterialien',
         'components'  => ':count Komponente|:count Komponenten',
     ],
+
     'more_info' => 'Mehr Info',
     'quickscan_bulk_help' => 'Wenn du dieses Kontrollkästchen aktivierst, wird der Asset-Datensatz so bearbeitet, dass der neue Standort angezeigt wird. Wenn du es nicht aktivierst, wird der Standort nur im Prüfprotokoll vermerkt. Beachte, dass sich der Standort der Person, des Assets oder des Standorts, an den es ausgecheckt wurde, nicht ändert, wenn dieses Asset ausgecheckt wird.',
     'whoops' => 'Hoppla!',
@@ -572,9 +577,14 @@ return [
     'label' => 'Label',
     'import_asset_tag_exists' => 'Ein Asset mit dem Asset-Tag :asset_tag ist bereits vorhanden und es wurde keine Aktualisierung angefordert. Es wurden keine Änderungen vorgenommen.',
     'countries_manually_entered_help' => 'Werte mit einem Sternchen (*) wurden manuell eingegeben und stimmen nicht mit vorhandenen Dropdown-Werten nach ISO 3166 überein',
-    'accessories_assigned' => 'Assigned Accessories',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'accessories_assigned' => 'Zugewiesenes Zubehör',
+    'user_managed_passwords' => 'Passwortverwaltung',
+    'user_managed_passwords_disallow' => 'Benutzern die Verwaltung ihrer eigenen Passwörter verbieten',
+    'user_managed_passwords_allow' => 'Benutzern erlauben, ihre eigenen Passwörter zu verwalten',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
 
 ];
diff --git a/resources/lang/el-GR/admin/settings/general.php b/resources/lang/el-GR/admin/settings/general.php
index fc34ad79e..c41c8310d 100644
--- a/resources/lang/el-GR/admin/settings/general.php
+++ b/resources/lang/el-GR/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Κωδικός πρόσβασης δεσμού LDAP',
     'ldap_basedn'               => 'Δέσμευση βάσης DN',
     'ldap_filter'               => 'LDAP Φίλτρο',
-    'ldap_pw_sync'              => 'LDAP συγχρονισμός κωδικού πρόσβασης',
-    'ldap_pw_sync_help'         => 'Καταργήστε την επιλογή αυτού του πλαισίου αν δεν θέλετε να διατηρείτε τους κωδικούς LDAP συγχρονισμένους με τοπικούς κωδικούς πρόσβασης. Απενεργοποιώντας αυτό σημαίνει ότι οι χρήστες σας ενδέχεται να μην μπορούν να συνδεθούν αν ο διακομιστής LDAP δεν είναι προσβάσιμος για κάποιο λόγο.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Πεδίο ονόματος χρήστη',
     'ldap_lname_field'          => 'Επίθετο',
     'ldap_fname_field'          => 'Όνομα LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Καθαρισμός αρχείων που έχουν διαγραφεί',
     'ldap_extension_warning' => 'Δεν φαίνεται ότι η επέκταση LDAP είναι εγκατεστημένη ή ενεργοποιημένη σε αυτόν τον διακομιστή. Μπορείτε ακόμα να αποθηκεύσετε τις ρυθμίσεις σας, αλλά θα πρέπει να ενεργοποιήσετε την επέκταση LDAP για PHP πριν το συγχρονισμό LDAP ή σύνδεση θα λειτουργήσει.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Αριθμός Υπάλληλου',
     'create_admin_user' => 'Δημιουργία χρήστη ::',
     'create_admin_success' => 'Επιτυχία! Ο διαχειριστής σας έχει προστεθεί!',
diff --git a/resources/lang/el-GR/admin/settings/message.php b/resources/lang/el-GR/admin/settings/message.php
index 0ce37688c..f53d2bc9a 100644
--- a/resources/lang/el-GR/admin/settings/message.php
+++ b/resources/lang/el-GR/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Δοκιμή Πιστοποίησης Ldap...',
         'authentication_success' => 'Ο χρήστης πιστοποιήθηκε με επιτυχία στο LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Αποστολή δοκιμαστικού μηνύματος :app...',
         'success' => 'Το :webhook_name σας λειτουργεί!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ΣΦΑΛΜΑ: 301/302:endpoint επιστρέφει μια ανακατεύθυνση. Για λόγους ασφαλείας, δεν ακολουθούμε ανακατευθύνσεις. Παρακαλούμε χρησιμοποιήστε το πραγματικό τελικό σημείο.',
         'error_misc' => 'Κάτι πήγε στραβά. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/el-GR/general.php b/resources/lang/el-GR/general.php
index e725a0795..7c8eacb8b 100644
--- a/resources/lang/el-GR/general.php
+++ b/resources/lang/el-GR/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Προσαρμογή Αναφοράς',
     'custom_report'         => 'Αναφορά προσαρμοσμένων στοιχείων ενεργητικού',
     'dashboard'				=> 'Πίνακας ελέγχου',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ημέρες',
     'days_to_next_audit'    => 'Ημέρες έως επόμενο έλεγχο',
     'date'					=> 'Ημερομηνία',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Όνομα και επίθετο (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Επίθετο και πρώτο γράμμα ονόματος (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Πρώτο Αρχικό Όνομα (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Όνομα Επώνυμο (Jane Smith)',
     'lastname_firstname_display'	=> 'Επώνυμο Όνομα (Smith Jane)',
     'name_display_format'	=> 'Μορφή Εμφάνισης Ονόματος',
@@ -217,6 +219,8 @@ return [
     'no'  					=> '\'Οχι',
     'notes'  				=> 'Σημειώσεις',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Αναλώσιμα |:count Αναλώσιμα',
         'components'  => ':count Εξαρτήματα |:count  Εξαρτήματα',
     ],
+
     'more_info' => 'Περισσότερες Πληροφορίες',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index 3aa79d95e..22d8c7e0e 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/en-GB/admin/settings/message.php b/resources/lang/en-GB/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/en-GB/admin/settings/message.php
+++ b/resources/lang/en-GB/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 9d28c3d7c..fefbd5f0a 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customise Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php
index 266788f08..ae733008e 100644
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/resources/lang/en-ID/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind sandi',
     'ldap_basedn'               => 'Mengikat Dasar DN',
     'ldap_filter'               => 'Saring LDAP',
-    'ldap_pw_sync'              => 'Sinkronisasi kata sandi LDAP',
-    'ldap_pw_sync_help'         => 'Hapus centang pada kotak ini jika anda tidak ingin menyimpan kata sandi LDAP yang disinkronkan dengan kata sandi lokal. Menonaktifkan ini berarti pengguna anda tidak dapat masuk jika server LDAP anda tidak dapat dijangkau karena alasan tertentu.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Bidang Nama Pengguna',
     'ldap_lname_field'          => 'Nama Terakhir',
     'ldap_fname_field'          => 'Nama Depan LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Bersihkan Arsip yang Dihapus',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/en-ID/admin/settings/message.php b/resources/lang/en-ID/admin/settings/message.php
index faf6cbf2a..465c0de5c 100644
--- a/resources/lang/en-ID/admin/settings/message.php
+++ b/resources/lang/en-ID/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index 86b6c9663..aed83a5a9 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Laporan aset kostum',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'hari',
     'days_to_next_audit'    => 'Hari untuk audit selanjutnya',
     'date'					=> 'Tanggal',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Nama Depan Nama Belakang (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  'Nama Depan First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Tidak',
     'notes'  				=> 'Catatan',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Info Lengkap',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/en-US/admin/hardware/general.php b/resources/lang/en-US/admin/hardware/general.php
index 34ac4e63e..084e171d4 100644
--- a/resources/lang/en-US/admin/hardware/general.php
+++ b/resources/lang/en-US/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 53482e853..74eef0335 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Action',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -29,6 +29,7 @@ return [
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
@@ -337,10 +338,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -587,4 +588,12 @@ return [
         'notes'  => 'Add a note',
     ],
 
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+
 ];
diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php
index 72509d4ac..92a835eef 100644
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/resources/lang/es-CO/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Contraseña de enlace LDAP',
     'ldap_basedn'               => 'DN del enlace base (Base Bind DN)',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronizar contraseña del LDAP',
-    'ldap_pw_sync_help'         => 'Desmarque esta casilla si no desea mantener las contraseñas LDAP sincronizadas con las contraseñas locales. Si desactiva esta opción, los usuarios no podrán iniciar sesión si, por algún motivo, no se puede acceder al servidor LDAP.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Campo nombre de usuario',
     'ldap_lname_field'          => 'Apellido',
     'ldap_fname_field'          => 'Nombre LDAP',
@@ -326,10 +326,14 @@ return [
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Barcodes &amp; label settings',
+    'labels_help' => 'Configuración de códigos de barras &amp; etiquetas',
     'purge_help' => 'Purgar registros eliminados',
     'ldap_extension_warning' => 'No parece que la extensión LDAP esté instalada o habilitada en este servidor. Todavía puede guardar su configuración, pero necesitará habilitar la extensión LDAP para PHP antes de que funcione la sincronización LDAP o el inicio de sesión.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de empleado',
     'create_admin_user' => 'Crear un usuario ::',
     'create_admin_success' => '¡Éxito! ¡Su usuario admin ha sido añadido!',
@@ -355,14 +359,14 @@ return [
     'label2_2d_type'          => 'Tipo de código de barras 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Apuntamiento del código de barras 2D',
-    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_2d_target_help'   => 'Los datos que incluirá el código de barra 2D',
     'label2_fields'           => 'Definiciones del campo',
     'label2_fields_help'      => 'Los campos se pueden añadir, eliminar y reordenar en la columna izquierda. Para cada campo, se pueden agregar, eliminar y reordenar múltiples opciones para etiquetas y para orígenes de datos en la columna derecha.',
     'help_asterisk_bold'    => 'Texto introducido como <code>**texto**</code> se mostrará como negrita',
     'help_blank_to_use'     => 'Deje en blanco para usar el valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'asset_id'              => 'Asset ID',
-    'data'               => 'Data',
+    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barras debe cumplir la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'asset_id'              => 'ID del activo',
+    'data'               => 'Datos',
     'default'               => 'Por defecto',
     'none'                  => 'Ninguna',
     'google_callback_help' => 'Esto debe introducirse como URL de devolución de llamada (callback) en la configuración de su aplicación de Google OAuth en la <strong><a href="https://console.cloud.google.com/" target="_blank">consola de desarrollador de Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> de su organización .',
@@ -390,7 +394,7 @@ return [
         'brand'             => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
         'general_settings'  => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
         'groups'            => 'permisos, grupos de permisos, autorización',
-        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'labels'            => 'etiquetas, código de barras, código de barra, hojas, imprimir, upc, qr, 1d, 2d',
         'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
         'php_overview'      => 'phpinfo, sistema, información',
         'purge'             => 'eliminar permanentemente',
diff --git a/resources/lang/es-CO/admin/settings/message.php b/resources/lang/es-CO/admin/settings/message.php
index 35096ead8..bbc3c97b5 100644
--- a/resources/lang/es-CO/admin/settings/message.php
+++ b/resources/lang/es-CO/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Probando autenticación LDAP...',
         'authentication_success' => 'Usuario autenticado contra LDAP con éxito!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Enviando mensaje de prueba :app...',
         'success' => '¡Su integración :webhook_name funciona!',
@@ -45,6 +48,7 @@ return [
         'error' => 'Algo salió mal. :app respondió con: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint devuelve una redirección. Por razones de seguridad, no seguimos redirecciones. Por favor, utilice el punto final actual.',
         'error_misc' => 'Algo salió mal. :( ',
-        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_fail' => ' Notificación de webhook fallida: Compruebe que la URL sigue siendo válida.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index d38fdde10..8ef7cbaff 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Personalizar informe',
     'custom_report'         => 'Informe personalizado de activos',
     'dashboard'				=> 'Tablero',
+    'data_source'           => 'Data Source',
     'days'      			=> 'días',
     'days_to_next_audit'    => 'Días hasta la siguiente auditoría',
     'date'					=> 'Fecha',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@ejemplo.com)',
     'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
     'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
     'name_display_format'	=> 'Formato para mostrar el nombre',
@@ -216,12 +218,14 @@ return [
     'no_results'			=> 'No hay resultados.',
     'no'  					=> 'No',
     'notes'  				=> 'Notas',
-    'note_added'            => 'Note Added',
-    'add_note'              => 'Add Note',
-    'note_edited'            => 'Note Edited',
-    'edit_note'              => 'Edit Note',
-    'note_deleted'            => 'Note Deleted',
-    'delete_note'              => 'Delete Note',
+    'note_added'            => 'Nota agregada',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Agregar nota',
+    'note_edited'            => 'Nota editada',
+    'edit_note'              => 'Editar nota',
+    'note_deleted'            => 'Nota eliminada',
+    'delete_note'              => 'Borrar nota',
     'order_number'          => 'Número de orden',
     'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count consumible|:count consumibles',
         'components'  => ':count component|:count componentes',
     ],
+
     'more_info' => 'Más información',
     'quickscan_bulk_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría. Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
     'whoops' => '¡Uy!',
@@ -573,8 +578,13 @@ return [
     'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
     'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
     'accessories_assigned' => 'Accesorios asignados',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'user_managed_passwords' => 'Gestión de contraseña',
+    'user_managed_passwords_disallow' => 'Evitar que los usuarios gestionen sus propias contraseñas',
+    'user_managed_passwords_allow' => 'Permitir a los usuarios gestionar sus propias contraseñas',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
 
 ];
diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php
index 0625343e7..e1cf5c8fe 100644
--- a/resources/lang/es-ES/admin/settings/general.php
+++ b/resources/lang/es-ES/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Contraseña de enlace LDAP',
     'ldap_basedn'               => 'DN del enlace base (Base Bind DN)',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronizar contraseña del LDAP',
-    'ldap_pw_sync_help'         => 'Desmarque esta casilla si no desea mantener las contraseñas LDAP sincronizadas con las contraseñas locales. Si desactiva esta opción, los usuarios no podrán iniciar sesión si, por algún motivo, no se puede acceder al servidor LDAP.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Campo nombre de usuario',
     'ldap_lname_field'          => 'Apellido',
     'ldap_fname_field'          => 'Nombre LDAP',
@@ -326,10 +326,14 @@ return [
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Barcodes &amp; label settings',
+    'labels_help' => 'Configuración de códigos de barras &amp; etiquetas',
     'purge_help' => 'Purgar registros eliminados',
     'ldap_extension_warning' => 'No parece que la extensión LDAP esté instalada o habilitada en este servidor. Todavía puede guardar su configuración, pero necesitará habilitar la extensión LDAP para PHP antes de que funcione la sincronización LDAP o el inicio de sesión.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de empleado',
     'create_admin_user' => 'Crear un usuario ::',
     'create_admin_success' => '¡Éxito! ¡Su usuario admin ha sido añadido!',
@@ -355,14 +359,14 @@ return [
     'label2_2d_type'          => 'Tipo de códigos de barras 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Apuntamiento del código de barras 2D',
-    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_2d_target_help'   => 'Los datos que incluirá el código de barra 2D',
     'label2_fields'           => 'Definiciones del campo',
     'label2_fields_help'      => 'Los campos se pueden añadir, eliminar y reordenar en la columna izquierda. Para cada campo, se pueden agregar, eliminar y reordenar múltiples opciones para etiquetas y para orígenes de datos en la columna derecha.',
     'help_asterisk_bold'    => 'Texto introducido como <code>**texto**</code> se mostrará como negrita',
     'help_blank_to_use'     => 'Deje en blanco para usar el valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'asset_id'              => 'Asset ID',
-    'data'               => 'Data',
+    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barras debe cumplir la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'asset_id'              => 'ID del activo',
+    'data'               => 'Datos',
     'default'               => 'Por defecto',
     'none'                  => 'Ninguna',
     'google_callback_help' => 'Esto debe introducirse como URL de devolución de llamada (callback) en la configuración de su aplicación de Google OAuth en la <strong><a href="https://console.cloud.google.com/" target="_blank">consola de desarrollador de Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> de su organización .',
@@ -390,7 +394,7 @@ return [
         'brand'             => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
         'general_settings'  => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
         'groups'            => 'permisos, grupos de permisos, autorización',
-        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'labels'            => 'etiquetas, código de barras, código de barra, hojas, imprimir, upc, qr, 1d, 2d',
         'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
         'php_overview'      => 'phpinfo, sistema, información',
         'purge'             => 'eliminar permanentemente',
diff --git a/resources/lang/es-ES/admin/settings/message.php b/resources/lang/es-ES/admin/settings/message.php
index ae2ddb300..ca7407c50 100644
--- a/resources/lang/es-ES/admin/settings/message.php
+++ b/resources/lang/es-ES/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Probando autenticación LDAP...',
         'authentication_success' => 'Usuario autenticado contra LDAP con éxito!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Enviando mensaje de prueba de :app...',
         'success' => '¡Su integración :webhook_name funciona!',
@@ -45,6 +48,7 @@ return [
         'error' => 'Algo salió mal. :app respondió con: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint devuelve una redirección. Por razones de seguridad, no seguimos redirecciones. Por favor, utilice el punto final actual.',
         'error_misc' => 'Algo salió mal. :( ',
-        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_fail' => ' Notificación de webhook fallida: Compruebe que la URL sigue siendo válida.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index 37f147179..67c156c73 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Personalizar informe',
     'custom_report'         => 'Informe personalizado de activos',
     'dashboard'				=> 'Tablero',
+    'data_source'           => 'Data Source',
     'days'      			=> 'días',
     'days_to_next_audit'    => 'Días hasta la siguiente auditoría',
     'date'					=> 'Fecha',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
     'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
     'name_display_format'	=> 'Formato para mostrar el nombre',
@@ -216,12 +218,14 @@ return [
     'no_results'			=> 'No hay resultados.',
     'no'  					=> 'No',
     'notes'  				=> 'Notas',
-    'note_added'            => 'Note Added',
-    'add_note'              => 'Add Note',
-    'note_edited'            => 'Note Edited',
-    'edit_note'              => 'Edit Note',
-    'note_deleted'            => 'Note Deleted',
-    'delete_note'              => 'Delete Note',
+    'note_added'            => 'Nota agregada',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Agregar nota',
+    'note_edited'            => 'Nota editada',
+    'edit_note'              => 'Editar nota',
+    'note_deleted'            => 'Nota eliminada',
+    'delete_note'              => 'Borrar nota',
     'order_number'          => 'Número de orden',
     'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count consumible|:count consumibles',
         'components'  => ':count component|:count componentes',
     ],
+
     'more_info' => 'Más información',
     'quickscan_bulk_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría. Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
     'whoops' => '¡Uy!',
@@ -573,8 +578,13 @@ return [
     'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
     'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
     'accessories_assigned' => 'Accesorios asignados',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'user_managed_passwords' => 'Gestión de contraseña',
+    'user_managed_passwords_disallow' => 'Evitar que los usuarios gestionen sus propias contraseñas',
+    'user_managed_passwords_allow' => 'Permitir a los usuarios gestionar sus propias contraseñas',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
 
 ];
diff --git a/resources/lang/es-MX/admin/settings/general.php b/resources/lang/es-MX/admin/settings/general.php
index 63a4983c1..4963766ea 100644
--- a/resources/lang/es-MX/admin/settings/general.php
+++ b/resources/lang/es-MX/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Contraseña de enlace LDAP',
     'ldap_basedn'               => 'Enlazar base DN',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronizar contraseña del LDAP',
-    'ldap_pw_sync_help'         => 'Desmarque esta casilla si no desea mantener las contraseñas LDAP sincronizadas con las contraseñas locales. Si desactiva esta opción, los usuarios no podrán iniciar sesión si, por algún motivo, no se puede acceder al servidor LDAP.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Campo nombre de usuario',
     'ldap_lname_field'          => 'Apellido',
     'ldap_fname_field'          => 'Nombre LDAP',
@@ -326,10 +326,14 @@ return [
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Barcodes &amp; label settings',
+    'labels_help' => 'Configuración de códigos de barras &amp; etiquetas',
     'purge_help' => 'Purgar registros eliminados',
     'ldap_extension_warning' => 'No parece que la extensión LDAP esté instalada o habilitada en este servidor. Todavía puede guardar su configuración, pero necesitará habilitar la extensión LDAP para PHP antes de que funcione la sincronización LDAP o el inicio de sesión.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de empleado',
     'create_admin_user' => 'Crear un usuario ::',
     'create_admin_success' => '¡Éxito! ¡Su usuario admin ha sido añadido!',
@@ -355,14 +359,14 @@ return [
     'label2_2d_type'          => 'Tipo de código de barras 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Apuntamiento del código de barras 2D',
-    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_2d_target_help'   => 'Los datos que incluirá el código de barra 2D',
     'label2_fields'           => 'Definiciones del campo',
     'label2_fields_help'      => 'Los campos se pueden añadir, eliminar y reordenar en la columna izquierda. Para cada campo, se pueden agregar, eliminar y reordenar múltiples opciones para etiquetas y para orígenes de datos en la columna derecha.',
     'help_asterisk_bold'    => 'El texto escrito como <code>**texto**</code> se mostrará como negrita',
     'help_blank_to_use'     => 'Deje en blanco para usar el valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'asset_id'              => 'Asset ID',
-    'data'               => 'Data',
+    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barras debe cumplir la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'asset_id'              => 'ID del activo',
+    'data'               => 'Datos',
     'default'               => 'Predeterminado',
     'none'                  => 'Ninguno',
     'google_callback_help' => 'Esto debe introducirse como URL de devolución de llamada (callback) en la configuración de su aplicación de Google OAuth en la <strong><a href="https://console.cloud.google.com/" target="_blank">consola de desarrollador de Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> de su organización .',
@@ -390,7 +394,7 @@ return [
         'brand'             => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
         'general_settings'  => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
         'groups'            => 'permisos, grupos de permisos, autorización',
-        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'labels'            => 'etiquetas, código de barras, código de barra, hojas, imprimir, upc, qr, 1d, 2d',
         'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
         'php_overview'      => 'phpinfo, sistema, información',
         'purge'             => 'eliminar permanentemente',
diff --git a/resources/lang/es-MX/admin/settings/message.php b/resources/lang/es-MX/admin/settings/message.php
index 7260e9069..03c9db574 100644
--- a/resources/lang/es-MX/admin/settings/message.php
+++ b/resources/lang/es-MX/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Probando autenticación LDAP...',
         'authentication_success' => 'Usuario autenticado contra LDAP con éxito!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Enviando mensaje de prueba a :app...',
         'success' => '¡Su integración :webhook_name funciona!',
@@ -45,6 +48,7 @@ return [
         'error' => 'Algo salió mal. :app respondió con: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint devuelve una redirección. Por razones de seguridad, no seguimos redirecciones. Por favor, utilice el punto final actual.',
         'error_misc' => 'Algo salió mal. :( ',
-        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_fail' => ' Notificación de webhook fallida: Compruebe que la URL sigue siendo válida.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php
index 1e31b4d80..1edae33b2 100644
--- a/resources/lang/es-MX/general.php
+++ b/resources/lang/es-MX/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Personalizar informe',
     'custom_report'         => 'Informe personalizado de activos',
     'dashboard'				=> 'Tablero',
+    'data_source'           => 'Data Source',
     'days'      			=> 'días',
     'days_to_next_audit'    => 'Días hasta la siguiente auditoría',
     'date'					=> 'Fecha',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
     'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
     'name_display_format'	=> 'Formato para mostrar el nombre',
@@ -216,12 +218,14 @@ return [
     'no_results'			=> 'No hay resultados.',
     'no'  					=> 'No',
     'notes'  				=> 'Notas',
-    'note_added'            => 'Note Added',
-    'add_note'              => 'Add Note',
-    'note_edited'            => 'Note Edited',
-    'edit_note'              => 'Edit Note',
-    'note_deleted'            => 'Note Deleted',
-    'delete_note'              => 'Delete Note',
+    'note_added'            => 'Nota agregada',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Agregar nota',
+    'note_edited'            => 'Nota editada',
+    'edit_note'              => 'Editar nota',
+    'note_deleted'            => 'Nota eliminada',
+    'delete_note'              => 'Borrar nota',
     'order_number'          => 'Número de orden',
     'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count consumible|:count consumibles',
         'components'  => ':count component|:count componentes',
     ],
+
     'more_info' => 'Más información',
     'quickscan_bulk_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría. Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
     'whoops' => '¡Uy!',
@@ -573,8 +578,13 @@ return [
     'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
     'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
     'accessories_assigned' => 'Accesorios asignados',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'user_managed_passwords' => 'Gestión de contraseña',
+    'user_managed_passwords_disallow' => 'Evitar que los usuarios gestionen sus propias contraseñas',
+    'user_managed_passwords_allow' => 'Permitir a los usuarios gestionar sus propias contraseñas',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
 
 ];
diff --git a/resources/lang/es-VE/admin/settings/general.php b/resources/lang/es-VE/admin/settings/general.php
index 2db31a94f..27c4a4013 100644
--- a/resources/lang/es-VE/admin/settings/general.php
+++ b/resources/lang/es-VE/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Contraseña de enlace LDAP',
     'ldap_basedn'               => 'DN del enlace base (Base Bind DN)',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronizar contraseña del LDAP',
-    'ldap_pw_sync_help'         => 'Desmarque esta casilla si no desea mantener las contraseñas LDAP sincronizadas con las contraseñas locales. Si desactiva esta opción, los usuarios no podrán iniciar sesión si, por algún motivo, no se puede acceder al servidor LDAP.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Campo nombre de usuario',
     'ldap_lname_field'          => 'Apellido',
     'ldap_fname_field'          => 'Nombre LDAP',
@@ -326,10 +326,14 @@ return [
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Barcodes &amp; label settings',
+    'labels_help' => 'Configuración de códigos de barras &amp; etiquetas',
     'purge_help' => 'Purgar registros eliminados',
     'ldap_extension_warning' => 'No parece que la extensión LDAP esté instalada o habilitada en este servidor. Todavía puede guardar su configuración, pero necesitará habilitar la extensión LDAP para PHP antes de que funcione la sincronización LDAP o el inicio de sesión.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de empleado',
     'create_admin_user' => 'Crear un usuario ::',
     'create_admin_success' => '¡Éxito! ¡Su usuario admin ha sido añadido!',
@@ -355,14 +359,14 @@ return [
     'label2_2d_type'          => 'Tipo de código de barras 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Apuntamiento del código de barras 2D',
-    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_2d_target_help'   => 'Los datos que incluirá el código de barra 2D',
     'label2_fields'           => 'Definiciones del campo',
     'label2_fields_help'      => 'Los campos se pueden añadir, eliminar y reordenar en la columna izquierda. Para cada campo, se pueden agregar, eliminar y reordenar múltiples opciones para etiquetas y para orígenes de datos en la columna derecha.',
     'help_asterisk_bold'    => 'Texto introducido como <code>**texto**</code> se mostrará como negrita',
     'help_blank_to_use'     => 'Deje en blanco para usar el valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'asset_id'              => 'Asset ID',
-    'data'               => 'Data',
+    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barras debe cumplir la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'asset_id'              => 'ID del activo',
+    'data'               => 'Datos',
     'default'               => 'Por defecto',
     'none'                  => 'Ninguna',
     'google_callback_help' => 'Esto debe introducirse como URL de devolución de llamada (callback) en la configuración de su aplicación de Google OAuth en la <strong><a href="https://console.cloud.google.com/" target="_blank">consola de desarrollador de Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> de su organización .',
@@ -390,7 +394,7 @@ return [
         'brand'             => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
         'general_settings'  => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
         'groups'            => 'permisos, grupos de permisos, autorización',
-        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'labels'            => 'etiquetas, código de barras, código de barra, hojas, imprimir, upc, qr, 1d, 2d',
         'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
         'php_overview'      => 'phpinfo, sistema, información',
         'purge'             => 'eliminar permanentemente',
diff --git a/resources/lang/es-VE/admin/settings/message.php b/resources/lang/es-VE/admin/settings/message.php
index 2d37a6597..117d85c0c 100644
--- a/resources/lang/es-VE/admin/settings/message.php
+++ b/resources/lang/es-VE/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Probando autenticación LDAP...',
         'authentication_success' => 'Usuario autenticado contra LDAP con éxito!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Enviando mensaje de prueba :app...',
         'success' => '¡Su integración :webhook_name funciona!',
@@ -45,6 +48,7 @@ return [
         'error' => 'Algo salió mal. :app respondió con: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint devuelve una redirección. Por razones de seguridad, no seguimos redirecciones. Por favor, utilice el punto final actual.',
         'error_misc' => 'Algo salió mal. :( ',
-        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_fail' => ' Notificación de webhook fallida: Compruebe que la URL sigue siendo válida.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php
index c106372de..a5e3d4606 100644
--- a/resources/lang/es-VE/general.php
+++ b/resources/lang/es-VE/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Personalizar informe',
     'custom_report'         => 'Informe personalizado de activos',
     'dashboard'				=> 'Tablero',
+    'data_source'           => 'Data Source',
     'days'      			=> 'días',
     'days_to_next_audit'    => 'Días hasta la siguiente auditoría',
     'date'					=> 'Fecha',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
     'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
     'name_display_format'	=> 'Formato para mostrar el nombre',
@@ -216,12 +218,14 @@ return [
     'no_results'			=> 'No hay resultados.',
     'no'  					=> 'No',
     'notes'  				=> 'Notas',
-    'note_added'            => 'Note Added',
-    'add_note'              => 'Add Note',
-    'note_edited'            => 'Note Edited',
-    'edit_note'              => 'Edit Note',
-    'note_deleted'            => 'Note Deleted',
-    'delete_note'              => 'Delete Note',
+    'note_added'            => 'Nota agregada',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Agregar nota',
+    'note_edited'            => 'Nota editada',
+    'edit_note'              => 'Editar nota',
+    'note_deleted'            => 'Nota eliminada',
+    'delete_note'              => 'Borrar nota',
     'order_number'          => 'Número de orden',
     'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count consumible|:count consumibles',
         'components'  => ':count component|:count componentes',
     ],
+
     'more_info' => 'Más información',
     'quickscan_bulk_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría. Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
     'whoops' => '¡Uy!',
@@ -573,8 +578,13 @@ return [
     'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
     'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
     'accessories_assigned' => 'Accesorios asignados',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'user_managed_passwords' => 'Gestión de contraseña',
+    'user_managed_passwords_disallow' => 'Evitar que los usuarios gestionen sus propias contraseñas',
+    'user_managed_passwords_allow' => 'Permitir a los usuarios gestionar sus propias contraseñas',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
 
 ];
diff --git a/resources/lang/et-EE/admin/settings/general.php b/resources/lang/et-EE/admin/settings/general.php
index b02669207..7891fa6c0 100644
--- a/resources/lang/et-EE/admin/settings/general.php
+++ b/resources/lang/et-EE/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP bind parool',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP-filter',
-    'ldap_pw_sync'              => 'LDAP paroolide sünkroonimine',
-    'ldap_pw_sync_help'         => 'Tühjendage see ruut, kui te ei soovi LDAP paroole sünkroonida kohalike paroolidega. Selle keelamine tähendab, et teie kasutajad ei pruugi siseneda, kui teie LDAP-server mingil põhjusel pole saavutatav.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Kasutajanimi väli',
     'ldap_lname_field'          => 'Perekonnanimi',
     'ldap_fname_field'          => 'LDAP eesnimi',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Puhasta kustutatud dokumendid',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Töötaja number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/et-EE/admin/settings/message.php b/resources/lang/et-EE/admin/settings/message.php
index e61354c71..a831d2572 100644
--- a/resources/lang/et-EE/admin/settings/message.php
+++ b/resources/lang/et-EE/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/et-EE/general.php b/resources/lang/et-EE/general.php
index 7ca4569f0..74ffaab93 100644
--- a/resources/lang/et-EE/general.php
+++ b/resources/lang/et-EE/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Kohanda aruannet',
     'custom_report'         => 'Kohandatud varade aruanne',
     'dashboard'				=> 'Töölaud',
+    'data_source'           => 'Data Source',
     'days'      			=> 'päeva',
     'days_to_next_audit'    => 'Päevad järgmise auditi juurde',
     'date'					=> 'Kuupäev',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Eesnimi Perenimi (eesnimi.perenimi@poleolemas.ee)',
     'lastnamefirstinitial_format' =>  'Perenimi Eesnime lühend (perenimie@poleolemas.ee)',
     'firstintial_dot_lastname_format' => 'Eesnime algustäht Perenimi (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Eesnimi Perekonnanimi (Minu Nimi)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Nime Kuvamise Formaat',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Ei',
     'notes'  				=> 'Märkmed',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Rohkem infot',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/fa-IR/admin/settings/general.php b/resources/lang/fa-IR/admin/settings/general.php
index 1635ac3a7..bbfe4cd4c 100644
--- a/resources/lang/fa-IR/admin/settings/general.php
+++ b/resources/lang/fa-IR/admin/settings/general.php
@@ -148,8 +148,8 @@ return [
     'ldap_pword'                => 'LDAP اتصال رمز عبور',
     'ldap_basedn'               => 'اتصال پایگاه DN',
     'ldap_filter'               => 'LDAP فیلتر',
-    'ldap_pw_sync'              => 'همگام سازی رمز عبور LDAP',
-    'ldap_pw_sync_help'         => 'اگر نمیخواهید گذرواژههای LDAP را با گذرواژههای محلی همگامسازی کنید، این کادر را بردارید. غیرفعال کردن این به این معنی است که کاربران شما ممکن است قادر به ورود به سیستم اگر سرور LDAP شما به دلایلی غیر قابل دسترس است.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'فیلد نام کاربری',
     'ldap_lname_field'          => 'نام خانوادگی',
     'ldap_fname_field'          => 'LDAP نام',
@@ -459,6 +459,10 @@ return [
 ',
     'ldap_ad' => 'LDAP/AD
 ',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'تعداد کارکنان
 ',
     'create_admin_user' => 'ایجاد کاربر جدید ::',
diff --git a/resources/lang/fa-IR/admin/settings/message.php b/resources/lang/fa-IR/admin/settings/message.php
index 2d487fd10..fbd5f620f 100644
--- a/resources/lang/fa-IR/admin/settings/message.php
+++ b/resources/lang/fa-IR/admin/settings/message.php
@@ -45,6 +45,9 @@ return [
         'authentication_success' => 'کاربر در برابر LDAP با موفقیت احراز هویت شد!
 '
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -57,5 +60,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'مشکلی پیش آمده. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/fa-IR/general.php b/resources/lang/fa-IR/general.php
index 77e957b05..8aa6e628d 100644
--- a/resources/lang/fa-IR/general.php
+++ b/resources/lang/fa-IR/general.php
@@ -98,6 +98,7 @@ return [
     'custom_report'         => 'گزارش های سفارشی دارایی
 ',
     'dashboard'				=> 'میز کار',
+    'data_source'           => 'Data Source',
     'days'      			=> 'روزها',
     'days_to_next_audit'    => 'روز به حسابرسی بعدی',
     'date'					=> 'تاریخ',
@@ -138,6 +139,7 @@ return [
     'firstname_lastname_underscore_format' => 'نام خانوادگی (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  'فامیل نام میانه (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'نام میانه فامیل (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -234,6 +236,8 @@ return [
     'no'  					=> 'خیر',
     'notes'  				=> 'یادداشت ها',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -646,6 +650,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'اطلاعات بیشتر',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -662,4 +667,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/fi-FI/admin/settings/general.php b/resources/lang/fi-FI/admin/settings/general.php
index 7af49749b..088050346 100644
--- a/resources/lang/fi-FI/admin/settings/general.php
+++ b/resources/lang/fi-FI/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP-sidonta salasana',
     'ldap_basedn'               => 'Kohdehaaran DN',
     'ldap_filter'               => 'LDAP suodatin',
-    'ldap_pw_sync'              => 'LDAP salasanan synkronointi',
-    'ldap_pw_sync_help'         => 'Poista valinta, jos et halua säilyttää LDAP-salasanoja synkronoituna paikallisiin salasanoihin. Tällöin käyttäjät eivät voi kirjautua sisään, jos LDAP-palvelin ei jostain syystä ole tavoitettavissa.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Käyttäjätunnus kenttä',
     'ldap_lname_field'          => 'Sukunimi',
     'ldap_fname_field'          => 'LDAP etunimi',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Puhdista poistetut tietueet',
     'ldap_extension_warning' => 'Se ei näytä LDAP laajennus on asennettu tai otettu käyttöön tällä palvelimella. Voit silti tallentaa asetuksesi, mutta sinun täytyy ottaa käyttöön LDAP laajennus PHP ennen LDAP synkronointia tai kirjautuminen toimii.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Työntekijän Numero',
     'create_admin_user' => 'Luo käyttäjä ::',
     'create_admin_success' => 'Onnistui! Ylläpitäjäsi on lisätty!',
diff --git a/resources/lang/fi-FI/admin/settings/message.php b/resources/lang/fi-FI/admin/settings/message.php
index 7bce1bb1c..c76e0833f 100644
--- a/resources/lang/fi-FI/admin/settings/message.php
+++ b/resources/lang/fi-FI/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testataan Ldap Todennusta...',
         'authentication_success' => 'Käyttäjä tunnistettu LDAP vastaan!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Lähetetään :app testiviestiä...',
         'success' => 'Sinun :webhook_name Integraatio toimii!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'VIRHE: 301/302 :endpoint palauttaa uudelleenohjauksen. Turvallisuussyistä emme seuraa uudelleenohjauksia. Käytä todellista päätepistettä.',
         'error_misc' => 'Jokin meni pieleen. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/fi-FI/general.php b/resources/lang/fi-FI/general.php
index 25f29f805..15dc85785 100644
--- a/resources/lang/fi-FI/general.php
+++ b/resources/lang/fi-FI/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Mukautettu raportti',
     'custom_report'         => 'Mukautettu laiteraportti',
     'dashboard'				=> 'Hallintasivu',
+    'data_source'           => 'Data Source',
     'days'      			=> 'päivää',
     'days_to_next_audit'    => 'Päivää seuraavaan tarkastukseen',
     'date'					=> 'Päivä',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Etunimi Sukunimi (paivi_virtanen@example.com)',
     'lastnamefirstinitial_format' =>  'Sukunimi Etunimen ensimmäinen (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Ensimmäinen nimikirjain . sukunimi (p.virtanen@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Etunimi Sukunimi (Jane Smith)',
     'lastname_firstname_display'	=> 'Sukunimi Etunimi (Smith Jane)',
     'name_display_format'	=> 'Nimen Näytön Muoto',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Ei',
     'notes'  				=> 'Muistiinpanot',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Kulutustavara :count Kulutustavarat',
         'components'  => ':count Komponentti :count Komponentit',
     ],
+
     'more_info' => 'Lisätiedot',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/fil-PH/admin/accessories/message.php b/resources/lang/fil-PH/admin/accessories/message.php
index 3c32eff5c..2d88299e9 100644
--- a/resources/lang/fil-PH/admin/accessories/message.php
+++ b/resources/lang/fil-PH/admin/accessories/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'does_not_exist' => 'Ang aksesoryang [:id] ay hindi umiiral.',
     'not_found' => 'That accessory was not found.',
     'assoc_users'	 => 'Ang aksesoryang ito ay kasalukuyang mayroong :pag-check out sa pag-kwenta ng mga aytem sa mga gumagamit o user. Paki-tingnan sa mga aksesorya at subukang muli. ',
 
@@ -25,7 +25,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Ang aksesorya ay hindi na-check out, mangyaring subukang muli',
         'success' 		=> 'Ang aksesorya ay matagumoay na nai-check out.',
-        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
+        'unavailable'   => 'Ang aksesorya ay hindi maaaring i-check out. Suriing mabuti ang natitirang bilang',
         'user_does_not_exist' => 'Ang user na iyon ay hindi tama. Mangyaring subukang muli.',
          'checkout_qty' => array(
             'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
diff --git a/resources/lang/fil-PH/admin/components/general.php b/resources/lang/fil-PH/admin/components/general.php
index 528316539..9c44c7667 100644
--- a/resources/lang/fil-PH/admin/components/general.php
+++ b/resources/lang/fil-PH/admin/components/general.php
@@ -12,5 +12,5 @@ return array(
     'remaining' 			             => 'Ang Natitira',
     'total' 			                 => 'Ang Kabuuan',
     'update'                            => 'I-update ang Komponent',
-    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+    'checkin_limit'            => 'Ang bilang ng nai-check in ay dapat pareho o mas mababa sa :assigned_qty'
 );
diff --git a/resources/lang/fil-PH/admin/components/message.php b/resources/lang/fil-PH/admin/components/message.php
index 73549b80e..ec058a2d7 100644
--- a/resources/lang/fil-PH/admin/components/message.php
+++ b/resources/lang/fil-PH/admin/components/message.php
@@ -24,7 +24,7 @@ return array(
         'error'   		=> 'Ang komponent ay hindi nai-check out, mangyaring subukang muli',
         'success' 		=> 'Ang komponent ay matagukpay nang nai-check out.',
         'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.',
-        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
+        'unavailable'      => 'Kulang ang bilang ng natitirang komponent: :remaining ang natitira, :requested ang kinukuha ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fil-PH/admin/consumables/general.php b/resources/lang/fil-PH/admin/consumables/general.php
index 11b0c132d..710309824 100644
--- a/resources/lang/fil-PH/admin/consumables/general.php
+++ b/resources/lang/fil-PH/admin/consumables/general.php
@@ -8,5 +8,5 @@ return array(
     'remaining' 			            => 'Ang natitira',
     'total' 			                => 'Ang Kabuuan',
     'update'                            => 'I-update ang Consumable',
-    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
+    'inventory_warning'                 => 'Ang imbentaryo ng consumable na ito ay nasa mababang bilang na :min_count',
 );
diff --git a/resources/lang/fil-PH/admin/consumables/message.php b/resources/lang/fil-PH/admin/consumables/message.php
index 3976de985..23a11dbf0 100644
--- a/resources/lang/fil-PH/admin/consumables/message.php
+++ b/resources/lang/fil-PH/admin/consumables/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'invalid_category_type' => 'The category must be a consumable category.',
+    'invalid_category_type' => 'Ang kategorya ay dapat nasa kategorya ng consumable.',
     'does_not_exist' => 'Ang consumable ay hindi umiiral.',
 
     'create' => array(
diff --git a/resources/lang/fil-PH/admin/locations/message.php b/resources/lang/fil-PH/admin/locations/message.php
index 801f8304b..027c2e0ad 100644
--- a/resources/lang/fil-PH/admin/locations/message.php
+++ b/resources/lang/fil-PH/admin/locations/message.php
@@ -8,7 +8,7 @@ return array(
     'assoc_child_loc'	 => 'Ang lokasyong ito ay kasalukuyang pinagmumulan sa hindi bumaba sa lokasyon isang bata at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga lokasyon upang hindi na magreperens sa lokasyong ito at paki-subok muli. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
-    'open_map' => 'Open in :map_provider_icon Maps',
+    'open_map' => 'Buksan sa :map_provider_icon Maps',
 
 
     'create' => array(
diff --git a/resources/lang/fil-PH/admin/models/general.php b/resources/lang/fil-PH/admin/models/general.php
index ee943e0d6..af0b52d39 100644
--- a/resources/lang/fil-PH/admin/models/general.php
+++ b/resources/lang/fil-PH/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'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Ang modelong ito ay nabura na.',
     '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'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/fil-PH/admin/reports/general.php b/resources/lang/fil-PH/admin/reports/general.php
index f87a715cf..99dbecda3 100644
--- a/resources/lang/fil-PH/admin/reports/general.php
+++ b/resources/lang/fil-PH/admin/reports/general.php
@@ -4,7 +4,7 @@ return [
     'info'   => 'Pumili ng opsyon na gusto mo para sa iyong report sa asset.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
-    'reminder_sent' => 'Reminder sent',
+    'reminder_sent' => 'Naipadala ang paalala',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
     'custom_export' => [
diff --git a/resources/lang/fil-PH/admin/settings/general.php b/resources/lang/fil-PH/admin/settings/general.php
index d6d0c3753..5b13fe469 100644
--- a/resources/lang/fil-PH/admin/settings/general.php
+++ b/resources/lang/fil-PH/admin/settings/general.php
@@ -51,11 +51,11 @@ return [
     'default_eula_text'			=> 'Ang Default na EULA',
     'default_language'			=> 'Ang Default na Linggwahe',
     'default_eula_help_text'	=> 'Maaari kang mag-ugnay ng kustom na EULAS sa partikular na mga katergorya ng asset.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Magdagdag ng paalala para sa iyong desisyon (Opsiyonal)',
     'display_asset_name'        => 'Ipakita ang Pangalan ng Asset',
     'display_checkout_date'     => 'Ang Petsa ng Pag-checkout ay Ipakita',
     'display_eol'               => 'Ipakita sa table view ang EOL',
-    'display_qr'                => 'Display 2D barcode',
+    'display_qr'                => 'Ipakita ang 2D barcode',
     'display_alt_barcode'		=> 'Ipakita ang 1D barcode',
     'email_logo'                => 'Email Logo',
     'barcode_type'				=> 'Ang Uri ng 2D Barcode',
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Ang Bind Password ng LDAP',
     'ldap_basedn'               => 'Ang Bind DN ng Base',
     'ldap_filter'               => 'Ang Filter ng LDAP',
-    'ldap_pw_sync'              => 'Ang Password Sync ng LDAP',
-    'ldap_pw_sync_help'         => 'Alisan ng tsek ang kahon kapag hindi mo gustong magpanatili ng mga password sync ng LDAP sa lokal na mga password. Ang hindi pagpapagana nito ay nangangahulugang na ang iyong gumagamit ay maaaring hindi makapag-login kapag ang iyong serber ng LDAP ay hindi maabot sa iilang mga kadahilanan.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Ang Field ng Username',
     'ldap_lname_field'          => 'Ang Huling Pangalan',
     'ldap_fname_field'          => 'Unang Pangalan ng LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Ang mga Rekords na Nai-delete sa Pag-purge',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/fil-PH/admin/settings/message.php b/resources/lang/fil-PH/admin/settings/message.php
index 8f1644c26..b6fb1a727 100644
--- a/resources/lang/fil-PH/admin/settings/message.php
+++ b/resources/lang/fil-PH/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/fil-PH/auth/general.php b/resources/lang/fil-PH/auth/general.php
index bce96a234..31d1e992c 100644
--- a/resources/lang/fil-PH/auth/general.php
+++ b/resources/lang/fil-PH/auth/general.php
@@ -11,8 +11,8 @@ return [
     'ldap_reset_password'           => 'Please click here to reset your LDAP password',
     'remember_me'                   => 'Tandaan ako',
     'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
-    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
-    'google_login'                  => 'Login with Google Workspace',
+    'username_help_bottom'          => 'Ang iyong username at email address <em>ay maaaring</em> pareho, ngunit maaaring hindi, depende sa iyong configuration. Kung hindi mo maalala ang iyong username, kontakin ang iyong administrator. <br><br><strong>Ang mga Username na walang kaugnay na email address ay hindi makakatanggap ng email ng password reset link.</strong> ',
+    'google_login'                  => 'Mag-login gamit ang Google Workspace',
     'google_login_failed'           => 'Google Login failed, please try again.',
 ];
 
diff --git a/resources/lang/fil-PH/auth/message.php b/resources/lang/fil-PH/auth/message.php
index dec973c53..3fa252b15 100644
--- a/resources/lang/fil-PH/auth/message.php
+++ b/resources/lang/fil-PH/auth/message.php
@@ -10,7 +10,7 @@ return array(
     'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
-        'already_enrolled'      => 'Your device is already enrolled.',
+        'already_enrolled'      => 'Ang iyong device ay nakarehistro na.',
         'success'               => 'Ikaw ay matagumay na naka-log in.',
         'code_required'         => 'Two-factor code is required.',
         'invalid_code'          => 'Two-factor code is invalid.',
diff --git a/resources/lang/fil-PH/general.php b/resources/lang/fil-PH/general.php
index 88955793a..46d61562a 100644
--- a/resources/lang/fil-PH/general.php
+++ b/resources/lang/fil-PH/general.php
@@ -88,10 +88,11 @@ return [
     'updated_at' 			=> 'Na-update sa',
     'currency'  			=> '$', // this is deprecated
     'current'  				=> 'Ang kasalukuyan',
-    'current_password'      => 'Current Password',
+    'current_password'      => 'Kasalukuyang Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'I-kustom ang Report ng Asset',
     'dashboard'				=> 'Ang Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'mga araw',
     'days_to_next_audit'    => 'Mga Araw para sa Sumusunod na Audit',
     'date'					=> 'Ang Petsa',
@@ -121,12 +122,13 @@ return [
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
-    'example'				=> 'Example: ',
+    'example'				=> 'Halimbawa: ',
     'filastname_format'			=> 'Ang Unang Inisyal Huling Pangalan (jsmith@example.com)',
     'firstname_lastname_format'	=> 'Unang Pangalan Huling Pangalan (jane.smith@example.com)',
     'firstname_lastname_underscore_format' => 'Unang Pangalan Huling Pangalan (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Hindi',
     'notes'  				=> 'Ang mga Paalala',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Karagdagang Impormasyon',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/fr-FR/admin/reports/message.php b/resources/lang/fr-FR/admin/reports/message.php
index 2800bbdf0..c478399cc 100644
--- a/resources/lang/fr-FR/admin/reports/message.php
+++ b/resources/lang/fr-FR/admin/reports/message.php
@@ -2,9 +2,9 @@
 
 return [
     'about_templates' => 'About Saved Templates',
-    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'saving_templates_description' => 'Sélectionnez vos options, puis entrez le nom de votre modèle dans la case ci-dessus et cliquez sur le bouton \'Enregistrer le modèle\'. Utilisez le menu déroulant pour sélectionner un modèle précédemment enregistré.',
     'create'  => [
-        'success' => 'Template saved successfully',
+        'success' => 'Modèle sauvegardé avec succès',
     ],
     'update' => [
         'success' => 'Template updated successfully',
diff --git a/resources/lang/fr-FR/admin/settings/general.php b/resources/lang/fr-FR/admin/settings/general.php
index 3d7e1a570..7c6b7b4fe 100644
--- a/resources/lang/fr-FR/admin/settings/general.php
+++ b/resources/lang/fr-FR/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Mot de passe bind LDAP',
     'ldap_basedn'               => 'Bind de base DN',
     'ldap_filter'               => 'Filtre LDAP',
-    'ldap_pw_sync'              => 'Synchronisation du mot de passe LDAP',
-    'ldap_pw_sync_help'         => 'Décochez cette case si vous ne souhaitez pas conserver les mots de passe LDAP synchronisés avec les mots de passe locaux. Cette désactivation signifie que vos utilisateurs ne pourront plus se connecter si votre serveur LDAP est injoignable pour une raison quelconque.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Champ nom d\'utilisateur',
     'ldap_lname_field'          => 'Nom de famille',
     'ldap_fname_field'          => 'Prénom LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purger les enregistrements supprimés',
     'ldap_extension_warning' => 'Il semble que l\'extension LDAP ne soit pas installée ou activée sur ce serveur. Vous pouvez toujours enregistrer vos paramètres, mais vous devrez activer l\'extension LDAP pour PHP avant que la synchronisation LDAP ne fonctionne.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Numéro d’employé',
     'create_admin_user' => 'Créer un utilisateur ::',
     'create_admin_success' => 'Bravo ! Votre utilisateur administrateur a été ajouté !',
diff --git a/resources/lang/fr-FR/admin/settings/message.php b/resources/lang/fr-FR/admin/settings/message.php
index aa37d6686..7c0b1da5b 100644
--- a/resources/lang/fr-FR/admin/settings/message.php
+++ b/resources/lang/fr-FR/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Test de l\'authentification LDAP...',
         'authentication_success' => 'Utilisateur authentifié contre LDAP avec succès !'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Envoi du message de test :app...',
         'success' => 'Votre intégration :webhook_name fonctionne !',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERREUR : 301/302 :endpoint renvoie une redirection. Pour des raisons de sécurité, nous ne suivons pas les redirections. Veuillez utiliser le point de terminaison réel.',
         'error_misc' => 'Une erreur est survenue. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/fr-FR/general.php b/resources/lang/fr-FR/general.php
index d840d4d22..c0d1ad56f 100644
--- a/resources/lang/fr-FR/general.php
+++ b/resources/lang/fr-FR/general.php
@@ -64,7 +64,7 @@ return [
     'checkout'  			=> 'Associer',
     'checkouts_count'       => 'Associations',
     'checkins_count'        => 'Dissociations',
-    'checkin_and_delete'  	=> 'Checkin and Delete',
+    'checkin_and_delete'  	=> 'Enregistrement et suppression',
     'user_requests_count'   => 'Demandes',
     'city'  				=> 'Ville',
     'click_here'			=> 'Cliquez ici',
@@ -78,7 +78,7 @@ return [
     'consumables'			=> 'Consommables',
     'country'  				=> 'Pays',
     'could_not_restore'     => 'Erreur lors de la restauration de :item_type: :error',
-    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
+    'not_deleted'           => 'Le :item_type n\'a pas été supprimé et ne peut donc pas être restauré',
     'create'				=> 'Créer',
     'created'               => 'Élément créé',
     'created_asset'			=> 'Actif créé',
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Personnaliser le rapport',
     'custom_report'         => 'Rapport d\'actif personnalisé',
     'dashboard'				=> 'Tableau de bord',
+    'data_source'           => 'Data Source',
     'days'      			=> 'journées',
     'days_to_next_audit'    => 'Jours avant la prochaine vérification',
     'date'					=> 'Date',
@@ -99,7 +100,7 @@ return [
     'debug_warning_text'    => 'Cette application fonctionne en mode de production avec le débogage activé. Cela peut exposer des données sensibles si votre application est accessible au monde extérieur. Désactivez le mode de débogage en définissant la valeur <code> APP_DEBUG </ code> dans votre fichier <code> .env </ code> sur <code> false </ code>.',
     'delete'  				=> 'Supprimer',
     'delete_confirm'  		=> 'Êtes-vous certain de vouloir supprimer :item?',
-    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+    'delete_confirm_no_undo' => 'Êtes-vous sûr de vouloir supprimer :item ? Cette action est irréversible.',
     'deleted'  				=> 'Supprimé',
     'delete_seats'  		=> 'Places supprimées',
     'deletion_failed'       => 'Échec de la suppression',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Prénom Nom (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Nom de famille Première lettre du prénom (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Première lettre du prénom et nom de famille (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Prénom Nom (Jane Smith)',
     'lastname_firstname_display'	=> 'Nom Prénom (Smith Jane)',
     'name_display_format'	=> 'Format d\'affichage du nom',
@@ -159,7 +161,7 @@ return [
     'image_upload'         	=> 'Charger une image',
     'filetypes_accepted_help'    => 'Le type de fichier accepté est :types. La taille maximale autorisée est :size.|Les types de fichiers acceptés sont :types. La taille maximale autorisée est :size.',
     'filetypes_size_help'   => 'La taille maximale de téléversement autorisée est :size.',
-    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Les types de fichiers acceptés sont jpg, webp, png, gif, svg et avif. La taille maximale du fichier autorisée est :size.',
     'unaccepted_image_type'  => 'Ce fichier image n\'est pas lisible. Les types de fichiers acceptés sont jpg, webp, png, gif et svg. Le type mimetype de ce fichier est : :mimetype.',
     'import'         	    => 'Importer',
     'import_this_file'      => 'Champs de la carte et traiter ce fichier',
@@ -216,12 +218,14 @@ return [
     'no_results'			=> 'Pas de résultat.',
     'no'  					=> 'Non',
     'notes'  				=> 'Notes',
-    'note_added'            => 'Note Added',
-    'add_note'              => 'Add Note',
-    'note_edited'            => 'Note Edited',
-    'edit_note'              => 'Edit Note',
-    'note_deleted'            => 'Note Deleted',
-    'delete_note'              => 'Delete Note',
+    'note_added'            => 'Note ajoutée',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Ajouter une note',
+    'note_edited'            => 'Note modifiée',
+    'edit_note'              => 'Modifier la note',
+    'note_deleted'            => 'Note supprimée',
+    'delete_note'              => 'Supprimer la note',
     'order_number'          => 'Numéro de commande',
     'only_deleted'          => 'Seulement les matériels supprimés',
     'page_menu'				=> 'Afficher_MENU_items',
@@ -236,7 +240,7 @@ return [
     'purchase_date'         => 'Date d\'achat',
     'qty'		            => 'QTÉ',
     'quantity'		        => 'Quantité',
-    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'Vous avez un élément en dessous ou presque en dessous des niveaux de quantité minimum|Vous avez :count éléments en dessous ou presque en dessous des niveaux de quantité minimum',
     'quickscan_checkin'  	=> 'Retour rapide',
     'quickscan_checkin_status'  	=> 'Statut du retour',
     'ready_to_deploy'		=> 'Prêt à être déployé',
@@ -286,10 +290,10 @@ return [
     'site_name'				=> 'Nom du Site',
     'state'  				=> 'État',
     'status_labels'			=> 'Étiquette de statut',
-    'status_label'			=> 'Status Label',
+    'status_label'			=> 'Libellé du statut',
     'status'    			=> 'Statut',
     'accept_eula'           => 'Contrat de licence',
-    'show_or_hide_eulas' => 'Show/Hide EULAs',
+    'show_or_hide_eulas' => 'Afficher/Masquer les EULAs',
     'supplier'              => 'Fournisseur',
     'suppliers'  			=> 'Fournisseurs',
     'sure_to_delete'        => 'Êtes-vous sûr de vouloir supprimer ?',
@@ -308,7 +312,7 @@ return [
     'username_format'		=> 'Format du nom d\'utilisateur',
     'username'              => 'Nom d\'utilisateur',
     'update'                => 'Actualiser',
-    'updating_item' => 'Updating :item',
+    'updating_item' => 'Mise à jour de :item',
     'upload_filetypes_help'      => 'Les types de fichiers autorisés sont png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf et rar. La taille maximale autorisée est :size.',
     'uploaded'              => 'Téléversement réussi',
     'user'					=> 'Utilisateur',
@@ -358,7 +362,7 @@ return [
     'setup_step_4'          => 'Étape 4',
     'setup_config_check'    => 'Vérification de la configuration',
     'setup_create_database' => 'Créer les tables de la base de données',
-    'setup_create_admin'    => 'Create an admin user',
+    'setup_create_admin'    => 'Créer un administrateur',
     'setup_done'            => 'Terminé !',
     'bulk_edit_about_to'    => 'Vous êtes sur le point de modifier les éléments suivants : ',
     'checked_out'           => 'Affecté',
@@ -428,14 +432,14 @@ return [
     'bulk_soft_delete'      =>'Supprimer ces utilisateurs également. Leur historique de matériel restera intact jusqu\'à ce que vous les supprimiez définitivement depuis le panneau de configuration de l\'administrateur.',
     'bulk_checkin_delete_success' => 'Les utilisateurs sélectionnés ont été supprimés et leurs matériels ont été dissociés.',
     'bulk_checkin_success' => 'Les articles des utilisateurs sélectionnés ont été dissociés.',
-    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
+    'set_to_null'           => 'Supprimer les valeurs pour cette sélection|Supprimer les valeurs pour toutes les sélections :selection_count ',
     'set_users_field_to_null'  => 'Supprimer les valeurs du champ :field pour cet·te utilisateur·trice|Supprimer les valeurs du champ :field pour les :user_count utilisateurs·trices ',
     'na_no_purchase_date'   => 'NC - Pas de date d\'achat renseignée',
     'assets_by_status'      => 'Matériels par statut',
     'assets_by_status_type'      => 'Matériels par type de status',
     'pie_chart_type'        => 'Type de diagramme circulaire',
     'hello_name'            => 'Bonjour, :name!',
-    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'Vous avez un élément à valider. Cliquez ici pour accepter ou refuser | Vous avez :count éléments nécessitant une validation. Cliquez ici pour les accepter ou les refuser',
     'start_date'            => 'Date de début',
     'end_date'            => 'Date de fin',
     'alt_uploaded_image_thumbnail' => 'Miniature téléchargée',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consommable|:count Consommables',
         'components'  => ':count Composant|:count Composants',
     ],
+
     'more_info' => 'Plus d\'info',
     'quickscan_bulk_help' => 'Si vous cochez cette case, l\'enregistrement de l\'actif sera modifié pour refléter ce nouvel emplacement. Si elle n\'est pas cochée, l\'emplacement sera simplement noté dans le journal d\'audit. Notez que si ce bien est sorti, il ne changera pas l\'emplacement de la personne, du bien ou de l\'emplacement auquel il est sorti.',
     'whoops' => 'Oups !',
@@ -569,12 +574,17 @@ return [
     'expires' => 'Expire le',
     'map_fields'=> 'Map :item_type Fields',
     'remaining_var' => ':count restant',
-    'label' => 'Label',
-    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
-    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
-    'accessories_assigned' => 'Assigned Accessories',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'label' => 'Étiquette',
+    'import_asset_tag_exists' => 'Un actif avec la balise d\'actif :asset_tag existe déjà et une mise à jour n\'a pas été demandée. Aucune modification n\'a été apportée.',
+    'countries_manually_entered_help' => 'Les valeurs avec un astérisque (*) ont été saisies manuellement et ne correspondent pas aux valeurs du menu déroulant ISO 3166 existantes',
+    'accessories_assigned' => 'Accessoires assignés',
+    'user_managed_passwords' => 'Gestion des mots de passe',
+    'user_managed_passwords_disallow' => 'Interdire aux utilisateurs de gérer leurs propres mots de passe',
+    'user_managed_passwords_allow' => 'Permettre aux utilisateurs de gérer leurs propres mots de passe',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Ajouter une note',
+    ],
 
 ];
diff --git a/resources/lang/ga-IE/admin/settings/general.php b/resources/lang/ga-IE/admin/settings/general.php
index df7f07b2b..e8f4652dd 100644
--- a/resources/lang/ga-IE/admin/settings/general.php
+++ b/resources/lang/ga-IE/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Pasfhocal Bind LDAP',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'Scagaire LDAP',
-    'ldap_pw_sync'              => 'Sync Pasfhocal LDAP',
-    'ldap_pw_sync_help'         => 'Déan an bosca seo a dhíscriosadh mura mian leat pasfhocail LDAP a choinneáil ar a dtugtar le pasfhocail áitiúla. Ciallaíonn sé seo go bhféadfadh do úsáideoirí logáil isteach má tá do fhreastalaí LDAP neamhshuim ar chúis éigin.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Réimse Ainm Úsáideora',
     'ldap_lname_field'          => 'Ainm deiridh',
     'ldap_fname_field'          => 'Céadainm LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Taifid Scriosta Purge',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/ga-IE/admin/settings/message.php b/resources/lang/ga-IE/admin/settings/message.php
index 2a091713e..34c4dee60 100644
--- a/resources/lang/ga-IE/admin/settings/message.php
+++ b/resources/lang/ga-IE/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php
index 5580b6ec9..4f6640517 100644
--- a/resources/lang/ga-IE/general.php
+++ b/resources/lang/ga-IE/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Tuarascáil Sócmhainní Custaim',
     'dashboard'				=> 'Painéal',
+    'data_source'           => 'Data Source',
     'days'      			=> 'lá',
     'days_to_next_audit'    => 'Laethanta go dtí an chéad Iniúchadh',
     'date'					=> 'Dáta',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Uimh',
     'notes'  				=> 'Nótaí',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Tuilleadh eolais',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/he-IL/admin/locations/message.php b/resources/lang/he-IL/admin/locations/message.php
index d73329b52..4f7e147a2 100644
--- a/resources/lang/he-IL/admin/locations/message.php
+++ b/resources/lang/he-IL/admin/locations/message.php
@@ -8,7 +8,7 @@ return array(
     'assoc_child_loc'	 => 'למיקום זה מוגדרים תתי-מיקומים ולכן לא ניתן למחוק אותו. אנא עדכן את המיקומים כך שלא שמיקום זה לא יכיל תתי מיקומים ונסה שנית. ',
     'assigned_assets' => 'פריטים מוקצים',
     'current_location' => 'מיקום נוכחי',
-    'open_map' => 'Open in :map_provider_icon Maps',
+    'open_map' => 'פתיחה במפות :map_provider_icon',
 
 
     'create' => array(
@@ -23,7 +23,7 @@ return array(
 
     'restore' => array(
         'error'   => 'Location was not restored, please try again',
-        'success' => 'Location restored successfully.'
+        'success' => 'המקום שוחזר בהצלחה.'
     ),
 
     'delete' => array(
diff --git a/resources/lang/he-IL/admin/models/message.php b/resources/lang/he-IL/admin/models/message.php
index 92ba13bce..7009741f6 100644
--- a/resources/lang/he-IL/admin/models/message.php
+++ b/resources/lang/he-IL/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'אזהרה! דגם הפריט אינו תקין או חסר!',
     'no_association_fix' => 'זה ישבור דברים בדרכים שונות ומשונות. ערוך פריט זה עכשיו וקבע לו דגם.',
     'assoc_users'	 => 'מודל זה משויך כרגע לנכס אחד או יותר ולא ניתן למחוק אותו. מחק את הנכסים ולאחר מכן נסה למחוק שוב.',
-    'invalid_category_type' => 'This category must be an asset category.',
+    'invalid_category_type' => 'הקטגוריה הזאת חייב להיות קטגוריית משאבים.',
 
     'create' => array(
         'error'   => 'המודל לא נוצר, נסה שוב.',
diff --git a/resources/lang/he-IL/admin/settings/general.php b/resources/lang/he-IL/admin/settings/general.php
index 3bcbd557a..3a3eb2175 100644
--- a/resources/lang/he-IL/admin/settings/general.php
+++ b/resources/lang/he-IL/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'קישור סיסמה LDAP',
     'ldap_basedn'               => 'בסיס Bind DN',
     'ldap_filter'               => 'מסנן LDAP',
-    'ldap_pw_sync'              => 'סינכרון סיסמת LDAP',
-    'ldap_pw_sync_help'         => 'בטל את הסימון בתיבה זו אם אינך רוצה לשמור את סיסמאות LDAP המסונכרנות עם סיסמאות מקומיות. השבתה זו פירושה שהמשתמשים שלך לא יוכלו להתחבר אם שרת ה- LDAP שלך אינו ניתן להשגה מסיבה כלשהי.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'שם משתמש',
     'ldap_lname_field'          => 'שם משפחה',
     'ldap_fname_field'          => 'שם פרטי של LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'טיהור רשומות שנמחקו',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'מספר עובד',
     'create_admin_user' => 'צור משתמש ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/he-IL/admin/settings/message.php b/resources/lang/he-IL/admin/settings/message.php
index e6e7ce1d3..82e7aa274 100644
--- a/resources/lang/he-IL/admin/settings/message.php
+++ b/resources/lang/he-IL/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'בודק אימות מול שרת LDAP...',
         'authentication_success' => 'התחברות לשרת LDAפ עברה בהצלחה!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'משהו השתבש אופסי פופסי. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' ערוץ ההתליות לא נמצא.'
     ]
 ];
diff --git a/resources/lang/he-IL/general.php b/resources/lang/he-IL/general.php
index 70bfd0cd1..cf5177bb1 100644
--- a/resources/lang/he-IL/general.php
+++ b/resources/lang/he-IL/general.php
@@ -16,7 +16,7 @@ return [
     'superuser_tooltip'		=> 'This user has superuser privileges',
     'administrator'			=> 'אדמיניסטרטור',
     'add_seats'             => 'מושבים נוספים',
-    'age'                   => "Age",
+    'age'                   => "גיל",
     'all_assets'			=> 'כל הנכסים',
     'all'       			=> 'את כל',
     'archived'              => 'בארכיון',
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'דוח מותאם אישית',
     'custom_report'         => 'דוח נכס מותאם אישית',
     'dashboard'				=> 'לוּחַ מַחווָנִים',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ימים',
     'days_to_next_audit'    => 'ימים לביקורת',
     'date'					=> 'תַאֲרִיך',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'שם פרטי שם משפחה (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'שם משפחה ראשי תיבות שם פרטי (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'ראשי תיבות שם פרטי שם משפחה (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'לא',
     'notes'  				=> 'הערות',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'עוד מידע',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -574,7 +579,12 @@ return [
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
     'user_managed_passwords' => 'ניהול סיסמאות',
-    'user_managed_passwords_disallow' => 'למנוע ממשתמשים לנהל את הסיסמאות של עצמם',
-    'user_managed_passwords_allow' => 'לאפשר למשתמשים לנהל את הסיסמאות של עצמם',
+    'user_managed_passwords_disallow' => 'מנע ממשתמשים לנהל את הסיסמאות של עצמם',
+    'user_managed_passwords_allow' => 'אפשר למשתמשים לנהל את הסיסמאות של עצמם',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
 
 ];
diff --git a/resources/lang/hr-HR/admin/settings/general.php b/resources/lang/hr-HR/admin/settings/general.php
index 943a6fd7f..ce637a11e 100644
--- a/resources/lang/hr-HR/admin/settings/general.php
+++ b/resources/lang/hr-HR/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Lozinka vezivanja LDAP-a',
     'ldap_basedn'               => 'Baza se povezuje s DN',
     'ldap_filter'               => 'LDAP filtar',
-    'ldap_pw_sync'              => 'LDAP lozinka sinkronizacija',
-    'ldap_pw_sync_help'         => 'Poništite ovaj okvir ako ne želite zadržati LDAP zaporke sinkronizirane lokalnim zaporkama. Onemogućavanje ovog znači da se vaši korisnici možda neće moći prijaviti ako vaš LDAP poslužitelj zbog nekog razloga nije dostupan.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Polje za korisničko ime',
     'ldap_lname_field'          => 'Prezime',
     'ldap_fname_field'          => 'Ime LDAP-a',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Obrišite izbrisane zapise',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Broj djelatnika',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/hr-HR/admin/settings/message.php b/resources/lang/hr-HR/admin/settings/message.php
index 000760796..738981c61 100644
--- a/resources/lang/hr-HR/admin/settings/message.php
+++ b/resources/lang/hr-HR/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/hr-HR/general.php b/resources/lang/hr-HR/general.php
index 63571bfb3..0eb2af2e5 100644
--- a/resources/lang/hr-HR/general.php
+++ b/resources/lang/hr-HR/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Prilagodi izvještaj',
     'custom_report'         => 'Prilagođeno izvješće o aktivi',
     'dashboard'				=> 'kontrolna ploča',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dana',
     'days_to_next_audit'    => 'Dani za sljedeću reviziju',
     'date'					=> 'Datum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Ime Prezime (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Prezime Prvo slovo imena (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Inicijal imena i prezime (i.ivic)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Ime prezime (Ivana Ivić)',
     'lastname_firstname_display'	=> 'Prezime ime (Ivić Ivana)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Ne',
     'notes'  				=> 'Bilješke',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Više informacija',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/hu-HU/admin/settings/general.php b/resources/lang/hu-HU/admin/settings/general.php
index a9ab93b76..636bae55c 100644
--- a/resources/lang/hu-HU/admin/settings/general.php
+++ b/resources/lang/hu-HU/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP összekötő jelszó',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP szűrő',
-    'ldap_pw_sync'              => 'LDAP jelszószinkronizálás',
-    'ldap_pw_sync_help'         => 'Törölje a jelölőnégyzetet, ha nem szeretné megőrizni az LDAP jelszavakat szinkronizált helyi jelszavakkal. A letiltás azt jelenti, hogy a felhasználók esetleg nem tudnak bejelentkezni, ha az LDAP-kiszolgáló valamilyen okból elérhetetlenné válik.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Felhasználónév mező',
     'ldap_lname_field'          => 'Vezetéknév',
     'ldap_fname_field'          => 'LDAP keresztnév',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Törölt rekordok kitisztítása',
     'ldap_extension_warning' => 'Úgy tűnik, hogy az LDAP-bővítmény nincs telepítve vagy engedélyezve ezen a kiszolgálón. A beállításokat továbbra is elmentheti, de az LDAP-szinkronizálás vagy a bejelentkezés előtt engedélyeznie kell az LDAP-bővítményt a PHP számára.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Alkalmazottak száma',
     'create_admin_user' => 'Felhasználó létrehozása ::',
     'create_admin_success' => 'Siker! Az Ön admin felhasználója hozzá lett adva!',
diff --git a/resources/lang/hu-HU/admin/settings/message.php b/resources/lang/hu-HU/admin/settings/message.php
index 7d11816bb..425a2e642 100644
--- a/resources/lang/hu-HU/admin/settings/message.php
+++ b/resources/lang/hu-HU/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP-hitelesítés tesztelése...',
         'authentication_success' => 'A felhasználó sikeresen hitelesített az LDAP-nál!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app tesztüzenet küldése...',
         'success' => 'A :webhook_name integráció működik!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Valami hiba történt :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/hu-HU/general.php b/resources/lang/hu-HU/general.php
index 678dbec67..2b3e62e80 100644
--- a/resources/lang/hu-HU/general.php
+++ b/resources/lang/hu-HU/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Jelentés testreszabása',
     'custom_report'         => 'Egyedi eszköz riport',
     'dashboard'				=> 'Irányítópult',
+    'data_source'           => 'Data Source',
     'days'      			=> 'napok',
     'days_to_next_audit'    => 'Napok a következő ellenőrzéshez',
     'date'					=> 'Dátum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Keresztnév Vezetéknév (jakab_gipsz@example.com)',
     'lastnamefirstinitial_format' =>  'Utónév Keresztnév kezdőbetű (kovacsb@example.com)',
     'firstintial_dot_lastname_format' => 'Keresztnév első betűje majd vezetéknév (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Keresztnév Vezetéknév (Jakab Gipsz)',
     'lastname_firstname_display'	=> 'Vezetéknév Keresztnév (Gipsz Jakab)',
     'name_display_format'	=> 'Megelenítendő név',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Nem ',
     'notes'  				=> 'Megjegyzések',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'További információ',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/id-ID/admin/settings/general.php b/resources/lang/id-ID/admin/settings/general.php
index 4ce7f34f8..f6b0e0f9f 100644
--- a/resources/lang/id-ID/admin/settings/general.php
+++ b/resources/lang/id-ID/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Katakunci LDAP',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'Saring LDAP',
-    'ldap_pw_sync'              => 'Sinkronisasi Password LDAP',
-    'ldap_pw_sync_help'         => 'Hapus tanda centang kotak ini jika Anda tidak ingin menyimpan password LDAP disinkronkan dengan password lokal. Menonaktifkan ini berarti bahwa pengguna Anda mungkin tidak bisa login jika server LDAP Anda tidak bisa diakses untuk beberapa alasan.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Kolom nama pengguna',
     'ldap_lname_field'          => 'Nama Belakang',
     'ldap_fname_field'          => 'LDAP Nama Depan',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Pembersihan catatan yang telah terhapus',
     'ldap_extension_warning' => 'Sepertinya ekstensi LDAP tidak terinstal atau diaktifkan di server ini. Anda masih dapat menyimpan pengaturan, tetapi Anda perlu mengaktifkan ekstensi LDAP untuk PHP sebelum sinkronisasi atau login LDAP berfungsi.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Nomor Karyawan',
     'create_admin_user' => 'Buat Pengguna',
     'create_admin_success' => 'Berhasil! Pengguna admin Anda telah ditambahkan!',
diff --git a/resources/lang/id-ID/admin/settings/message.php b/resources/lang/id-ID/admin/settings/message.php
index e4efb1fe6..f88d1cbbf 100644
--- a/resources/lang/id-ID/admin/settings/message.php
+++ b/resources/lang/id-ID/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Menguji Autentikasi LDAP...',
         'authentication_success' => 'Pengguna berhasil diautentikasi terhadap LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Mengirim pesan uji :app...',
         'success' => 'Integrasi :webhook_name Anda berfungsi!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'KESALAHAN: 301/302 :endpoint mengembalikan pengalihan. Untuk alasan keamanan, kami tidak mengikuti pengalihan. Harap gunakan endpoint yang sebenarnya.',
         'error_misc' => 'Terjadi kesalahan. :( ',
         'webhook_fail' => ' notifikasi webhook gagal: Pastikan URL masih valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/id-ID/general.php b/resources/lang/id-ID/general.php
index 309be3302..959ace18a 100644
--- a/resources/lang/id-ID/general.php
+++ b/resources/lang/id-ID/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Sesuaikan Laporan',
     'custom_report'         => 'Laporan kustom aset',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'hari',
     'days_to_next_audit'    => 'Hari ke Audit Berikutnya',
     'date'					=> 'Tanggal',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Nama Depan Nama Belakang (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Nama Depan First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Nama Belakang Inisial Pertama (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Nama Depan Nama Belakang (Jane Smith)',
     'lastname_firstname_display'	=> 'Nama Belakang Nama Depan (Smith Jane)',
     'name_display_format'	=> 'Format tampilan nama',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Tidak',
     'notes'  				=> 'Catatan',
     'note_added'            => 'Catatan Ditambahkan',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Tambah Catatan',
     'note_edited'            => 'Catatan Diedit',
     'edit_note'              => 'Edit Catatan',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Barang Habis Pakai|:count Barang Habis Pakai',
         'components'  => ':count Komponen|:count Komponen',
     ],
+
     'more_info' => 'Lebih Lanjut',
     'quickscan_bulk_help' => 'Menandai kotak ini akan mengedit catatan aset untuk mencerminkan lokasi baru ini. Jika dibiarkan tidak dicentang, hanya lokasi tersebut yang akan dicatat dalam log audit. Perhatikan bahwa jika aset ini sedang dipinjam, lokasi orang, aset, atau lokasi tempat aset dipinjam tidak akan berubah.',
     'whoops' => 'Waduh!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Jangan izinkan pengelolaan kata sandi oleh pengguna',
     'user_managed_passwords_allow' => 'Izinkan pengguna mengelola kata sandi mereka sendiri',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/is-IS/admin/settings/general.php b/resources/lang/is-IS/admin/settings/general.php
index fcbb9c779..13c958e6e 100644
--- a/resources/lang/is-IS/admin/settings/general.php
+++ b/resources/lang/is-IS/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Eftirnafn',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Starfsmanna númer',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/is-IS/admin/settings/message.php b/resources/lang/is-IS/admin/settings/message.php
index ff2e5102f..d73e8f178 100644
--- a/resources/lang/is-IS/admin/settings/message.php
+++ b/resources/lang/is-IS/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Prófa LDAP auðkenningu...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Eitthvað fór úrskeiðis. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/is-IS/general.php b/resources/lang/is-IS/general.php
index 3ed975c83..3b0e3210b 100644
--- a/resources/lang/is-IS/general.php
+++ b/resources/lang/is-IS/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Sérsníðin skýrsla',
     'custom_report'         => 'Sérsníðin eigna skýrsla',
     'dashboard'				=> 'Stjórnborð',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dagar',
     'days_to_next_audit'    => 'Dagar fram að næstu úttekt',
     'date'					=> 'Dagsetning',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Fornafn Eftirnafn (Jane Smith)',
     'lastname_firstname_display'	=> 'Eftirnafn Fornafn (Smith Jane)',
     'name_display_format'	=> 'Nafn á birtingaforsniði',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Nei',
     'notes'  				=> 'Athugasemdir',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Nánar',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/it-IT/admin/settings/general.php b/resources/lang/it-IT/admin/settings/general.php
index 0a2303773..270b6bd79 100644
--- a/resources/lang/it-IT/admin/settings/general.php
+++ b/resources/lang/it-IT/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Password LDAP',
     'ldap_basedn'               => 'DN Base',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronizzazione password LDAP',
-    'ldap_pw_sync_help'         => 'Deseleziona questa casella se non desideri mantenere le password LDAP sincronizzate con le password locali. Disattivare questo significa che i tuoi utenti potrebbero non essere in grado di accedere se il server LDAP non è raggiungibile per qualche motivo.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Campo nome utente',
     'ldap_lname_field'          => 'Cognome',
     'ldap_fname_field'          => 'Nome LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Elimina Record Cancellati',
     'ldap_extension_warning' => 'L\'estensione LDAP non è installata o abilitata su questo server. Puoi ancora salvare le impostazioni, ma è necessario abilitare l\'estensione LDAP per PHP prima che il login o la sincronizzazione LDAP funzioni.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Numero Dipendente',
     'create_admin_user' => 'Crea Utente ::',
     'create_admin_success' => 'Successo! L\'utente admin è stato aggiunto!',
diff --git a/resources/lang/it-IT/admin/settings/message.php b/resources/lang/it-IT/admin/settings/message.php
index 87245998b..e81f58d6d 100644
--- a/resources/lang/it-IT/admin/settings/message.php
+++ b/resources/lang/it-IT/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testo l\'Autenticazione LDAP...',
         'authentication_success' => 'Utente autenticato correttamente con LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Invio a :app un messaggio di prova...',
         'success' => 'La tua integrazione :webhook_name funziona!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint restituisce un reindirizzamento. Per motivi di sicurezza, non seguiamo reindirizzamenti. Si prega di utilizzare l\'endpoint attuale.',
         'error_misc' => 'Qualcosa è andato storto. :( ',
         'webhook_fail' => ' notifica webhook fallita: Controlla che l\'URL sia ancora valido.',
+        'webhook_channel_not_found' => ' canale webhook non trovato.'
     ]
 ];
diff --git a/resources/lang/it-IT/general.php b/resources/lang/it-IT/general.php
index 81a5e1618..7f5a97473 100644
--- a/resources/lang/it-IT/general.php
+++ b/resources/lang/it-IT/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Personalizza Report',
     'custom_report'         => 'Report personalizzato Beni',
     'dashboard'				=> 'Cruscotto',
+    'data_source'           => 'Data Source',
     'days'      			=> 'giorni',
     'days_to_next_audit'    => 'Giorni al prossimo controllo inventario',
     'date'					=> 'Data',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Nome_Cognome (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Cognome + Iniziale Nome (smithj@esempio.it)',
     'firstintial_dot_lastname_format' => 'Iniziale Nome . Cognome (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Nome Cognome (Jane Smith)',
     'lastname_firstname_display'	=> 'Cognome Nome (Smith Jane)',
     'name_display_format'	=> 'Formato Nome',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Note',
     'note_added'            => 'Nota Aggiunta',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Aggiungi nota',
     'note_edited'            => 'Nota Modificata',
     'edit_note'              => 'Modifica Nota',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumabile|:count Consumabili',
         'components'  => ':count Componente|:count Componenti',
     ],
+
     'more_info' => 'Altre informazioni',
     'quickscan_bulk_help' => 'Spuntare questa casella modificherà la Sede di questo Bene. Non spuntandola, la Sede verrà solo annotata nel registro del controllo inventario. Nota che se questo bene è già assegnato, non verrà modificata la Sede della persona, del Bene o della Sede a cui è assegnato.',
     'whoops' => 'Ops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Non consentire agli utenti di gestire le proprie password',
     'user_managed_passwords_allow' => 'Consenti agli utenti di gestire le proprie password',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Aggiungere una nota',
+    ],
+
 ];
diff --git a/resources/lang/iu-NU/admin/settings/general.php b/resources/lang/iu-NU/admin/settings/general.php
index 97567df8d..ad21bbb64 100644
--- a/resources/lang/iu-NU/admin/settings/general.php
+++ b/resources/lang/iu-NU/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/iu-NU/admin/settings/message.php b/resources/lang/iu-NU/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/iu-NU/admin/settings/message.php
+++ b/resources/lang/iu-NU/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/iu-NU/general.php b/resources/lang/iu-NU/general.php
index 77670b5a7..53482e853 100644
--- a/resources/lang/iu-NU/general.php
+++ b/resources/lang/iu-NU/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/ja-JP/admin/settings/general.php b/resources/lang/ja-JP/admin/settings/general.php
index fcced6a48..c4d8e4438 100644
--- a/resources/lang/ja-JP/admin/settings/general.php
+++ b/resources/lang/ja-JP/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP バインド パスワード',
     'ldap_basedn'               => 'LDAP 検索ベース DN',
     'ldap_filter'               => 'LDAP フィルター',
-    'ldap_pw_sync'              => 'LDAP パスワード同期',
-    'ldap_pw_sync_help'         => 'LDAPパスワードをローカルパスワードと同期させない場合は、このチェックボックスをオフにします。これをオフにすると、何らかの理由でLDAPサーバーにアクセスできない場合、ユーザーがログインできなくなる可能性があります。',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'ユーザー名フィールド',
     'ldap_lname_field'          => '苗字',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -333,6 +333,10 @@ return [
     'purge_help' => '削除したレコードを消去',
     'ldap_extension_warning' => 'このサーバーでは、LDAP 拡張モジュールがインストールされていないか、または有効になっていないようです。設定を保存することはできますが、LDAPの同期やログインを機能させるために、PHPのLDAP拡張モジュールを有効にする必要があります。',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => '従業員番号',
     'create_admin_user' => 'ユーザーを作成 ::',
     'create_admin_success' => '成功！管理者ユーザーが追加されました！',
diff --git a/resources/lang/ja-JP/admin/settings/message.php b/resources/lang/ja-JP/admin/settings/message.php
index 48f71c2dc..9a126f368 100644
--- a/resources/lang/ja-JP/admin/settings/message.php
+++ b/resources/lang/ja-JP/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP認証のテスト中...',
         'authentication_success' => 'LDAPによるユーザー認証に成功しました！'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app テストメッセージを送信しています...',
         'success' => 'あなたの:webhook_name連携は動作します！',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'エラー: 301/302 :endpoint はリダイレクトを返します。セキュリティ上の理由から、リダイレクトには従いません。実際のエンドポイントを使用してください。',
         'error_misc' => '問題が発生しました。:( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ja-JP/general.php b/resources/lang/ja-JP/general.php
index 4c0fe5b35..4a4f8a581 100644
--- a/resources/lang/ja-JP/general.php
+++ b/resources/lang/ja-JP/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'レポートのカスタマイズ',
     'custom_report'         => '資産レポートをカスタム',
     'dashboard'				=> 'ダッシュボード',
+    'data_source'           => 'Data Source',
     'days'      			=> '日間',
     'days_to_next_audit'    => '次の監査日',
     'date'					=> '日付',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => '名前_苗字 (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  '名前と苗字のイニシャル（smithj@example.com）',
     'firstintial_dot_lastname_format' => '名前のイニシャル.苗字 (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> '名 姓 (ジェーン・スミス)',
     'lastname_firstname_display'	=> '姓 (スミス・ジェーン)',
     'name_display_format'	=> '名前表示形式',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'いいえ',
     'notes'  				=> '備考',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count 消耗品数',
         'components'  => ':count コンポーネント',
     ],
+
     'more_info' => '詳細',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'メモを追加する',
+    ],
+
 ];
diff --git a/resources/lang/km-KH/admin/kits/general.php b/resources/lang/km-KH/admin/kits/general.php
index 2b5c2d9cd..469d59d6c 100644
--- a/resources/lang/km-KH/admin/kits/general.php
+++ b/resources/lang/km-KH/admin/kits/general.php
@@ -1,11 +1,11 @@
 <?php
 
 return [
-    'about_kits_title'                  => 'About Predefined Kits',
+    'about_kits_title'                  => 'អំពីកញ្ចប់ដែលបានកំណត់ជាមុន',
     'about_kits_text'                   => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
     'checkout'                          => 'Checkout Kit ',
-    'create_success'                    => 'Kit was successfully created.',
-    'create'                            => 'Create Predefined Kit',
+    'create_success'                    => 'កញ្ចប់ត្រូវបានបង្កើតដោយជោគជ័យ។',
+    'create'                            => 'បង្កើតកញ្ចប់ដែលបានកំណត់ជាមុន',
     'update'                            => 'Update Predefined Kit',
     'delete_success'                    => 'Kit was successfully deleted.',
     'update_success'                    => 'Kit was successfully updated.',
diff --git a/resources/lang/km-KH/admin/settings/general.php b/resources/lang/km-KH/admin/settings/general.php
index 68d52ba84..eb0bef207 100644
--- a/resources/lang/km-KH/admin/settings/general.php
+++ b/resources/lang/km-KH/admin/settings/general.php
@@ -16,8 +16,8 @@ return [
     'alert_email'				=> 'ផ្ញើការជូនដំណឹងទៅ',
     'alert_email_help'    => 'អាសយដ្ឋានអ៊ីមែល ឬបញ្ជីចែកចាយដែលអ្នកចង់ឱ្យការជូនដំណឹងត្រូវបានផ្ញើទៅដោយសញ្ញាក្បៀស',
     'alerts_enabled'			=> 'បានបើកការជូនដំណឹងតាមអ៊ីមែល',
-    'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
-    'alert_inv_threshold'		=> 'Inventory Alert Threshold',
+    'alert_interval'			=> 'កម្រិតជូនដំណឹងអំពីការផុតកំណត់ (ជាច្រើនថ្ងៃ)',
+    'alert_inv_threshold'		=> 'កម្រិតជូនដំណឹងស្តុក',
     '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'					=> 'លេខសម្គាល់ទ្រព្យសកម្ម',
@@ -91,16 +91,16 @@ return [
     'ldap_client_tls_cert_help' => 'វិញ្ញាបនបត្រ TLS ខាង Client-Side និងកូនសោសម្រាប់ការតភ្ជាប់ LDAP ជាធម្មតាមានប្រយោជន៍តែនៅក្នុងការកំណត់រចនាសម្ព័ន្ធ Google Workspace ជាមួយ " LDAP សុវត្ថិភាព។" ទាំងពីរត្រូវបានទាមទារ។',
     'ldap_location'             => 'ទីតាំង LDAP',
 'ldap_location_help'             => 'វាលទីតាំង Ldap គួរតែត្រូវបានប្រើ ប្រសិនបើ <strong> OU មិនត្រូវបានប្រើនៅក្នុង Base Bind DN។</strong> ទុកវាឱ្យនៅទទេ ប្រសិនបើការស្វែងរក OU កំពុងត្រូវបានប្រើប្រាស់។',
-    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
-    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
-    'ldap_manager'              => 'LDAP Manager',
-    'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+    'ldap_login_test_help'      => 'បញ្ចូលឈ្មោះអ្នកប្រើប្រាស់ និងពាក្យសម្ងាត់ LDAP ដែលមានសុពលភាពពី DN មូលដ្ឋានដែលអ្នកបានបញ្ជាក់ខាងលើ ដើម្បីសាកល្បងថាតើការចូល LDAP របស់អ្នកត្រូវបានកំណត់រចនាសម្ព័ន្ធត្រឹមត្រូវដែរឬទេ។ អ្នកត្រូវតែរក្សាទុកការកំណត់ LDAP ដែលបានធ្វើបច្ចុប្បន្នភាពរបស់អ្នកជាមុនសិន។',
+    'ldap_login_sync_help'      => 'វាសាកល្បងតែការធ្វើសមកាលកម្ម LDAP ប៉ុណ្ណោះ។ ប្រសិនបើសំណួរការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវរបស់ LDAP មិនត្រឹមត្រូវ អ្នកប្រើអាចនៅតែមិនអាចចូលបាន។ អ្នកត្រូវរក្សាទុកការកំណត់ LDAP ដែលបានធ្វើបច្ចុប្បន្នភាពជាមុនសិន។',
+    'ldap_manager'              => 'អ្នកគ្រប់គ្រង LDAP',
+    'ldap_server'               => 'LDAP សើវើ',
+    'ldap_server_help'          => 'វាត្រូវចាប់ផ្តើមដោយ ldap:// (សម្រាប់មិនអ៊ីនគ្រីប) ឬ ldaps:// (សម្រាប់ TLS ឬ SSL)',
     'ldap_server_cert'			=> 'សុពលភាពវិញ្ញាបនបត្រ LDAP SSL',
     'ldap_server_cert_ignore'	=> 'អនុញ្ញាតឱ្យវិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវ',
     'ldap_server_cert_help'		=> 'ជ្រើសរើសប្រអប់ធីកនេះ ប្រសិនបើអ្នកកំពុងប្រើវិញ្ញាបនបត្រ SSL ដែលបានចុះហត្ថលេខាដោយខ្លួនឯង ហើយចង់ទទួលយកវិញ្ញាបនបត្រ SSL ដែលមិនត្រឹមត្រូវ។',
     'ldap_tls'                  => 'ប្រើ TLS',
-    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
+    'ldap_tls_help'             => 'វាត្រូវបានពិនិត្យបើកតែប៉ុណ្ណោះ ប្រសិនបើអ្នកកំពុងប្រតិបត្តិ STARTTLS លើ LDAP សើវើ របស់អ្នក។ ',
     'ldap_uname'                => 'LDAP ចងឈ្មោះអ្នកប្រើប្រាស់',
     'ldap_dept'                 => 'នាយកដ្ឋាន LDAP',
     'ldap_phone'                => 'លេខទូរស័ព្ទ LDAP',
@@ -109,15 +109,17 @@ return [
     'ldap_pword'                => 'LDAP ចងពាក្យសម្ងាត់',
     'ldap_basedn'               => 'មូលដ្ឋានចង DN',
     'ldap_filter'               => 'តម្រង LDAP',
-    'ldap_pw_sync'              => 'សមកាលកម្មពាក្យសម្ងាត់ LDAP',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
-    'ldap_username_field'       => 'Username Field',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'វាលឈ្មោះអ្នកប្រើ',
     'ldap_lname_field'          => 'នាមត្រកូល',
     'ldap_fname_field'          => 'ឈ្មោះ LDAP',
     'ldap_auth_filter_query'    => 'សំណួរការផ្ទៀងផ្ទាត់ LDAP',
     'ldap_version'              => 'កំណែ LDAP',
     'ldap_active_flag'          => 'ទង់សកម្ម LDAP',
-    'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_activated_flag_help'  => 'តម្លៃនេះត្រូវបានប្រើដើម្បីកំណត់ថា អ្នកប្រើដែលបានធ្វើសមកាលកម្មអាចចូលទៅ Snipe-IT បានឬអត់។ <strong>វាមិនប៉ះពាល់ដល់សិទ្ធិពិនិត្យចេញ ឬចូលទ្រព្យសម្បត្តិរបស់ពួកគេទេ</strong> ហើយវាត្រូវជាឈ្មោះ <strong>គុណលក្ខណៈ</strong> នៅក្នុង AD/LDAP របស់អ្នក <strong>មិនមែនតម្លៃ</strong>។
+
+<br><br> ប្រសិនបើវាលនេះត្រូវបានកំណត់ទៅឈ្មោះវាលមួយដែលមិនមាននៅក្នុង AD/LDAP របស់អ្នក ឬតម្លៃក្នុងវាល AD/LDAP ត្រូវបានកំណត់ទៅ <code>0</code> ឬ <code>false</code> នោះ<strong>ការចូលរបស់អ្នកប្រើនឹងត្រូវបិទ</strong>។ ប្រសិនបើតម្លៃក្នុងវាល AD/LDAP ត្រូវបានកំណត់ទៅ <code>1</code> ឬ <code>true</code> ឬ <em>អត្ថបទផ្សេងៗ</em> នោះមានន័យថា អ្នកប្រើអាចចូលបាន។ នៅពេលដែលវាលនេះនៅក្នុង AD របស់អ្នកគ្មានតម្លៃ អ្នកប្រើនឹងត្រូវគោរពតាមគុណលក្ខណៈ <code>userAccountControl</code> ដែលជាទម្លាប់អាចអនុញ្ញាតឲ្យអ្នកប្រើដែលមិនបានផ្អាកចូលបាន។',
     'ldap_emp_num'              => 'លេខបុគ្គលិក LDAP',
     'ldap_email'                => 'LDAP អ៊ីមែល',
     'ldap_test'                 => 'សាកល្បង LDAP',
@@ -138,9 +140,9 @@ return [
     'login_remote_user_enabled_help' => 'ជម្រើសនេះបើកការផ្ទៀងផ្ទាត់តាមរយៈបឋមកថា REMOTE_USER យោងតាម ​​"ចំណុចប្រទាក់ច្រកផ្លូវទូទៅ (rfc3875)"',
     'login_common_disabled_text' => 'បិទយន្តការផ្ទៀងផ្ទាត់ផ្សេងទៀត។',
     'login_common_disabled_help' => 'ជម្រើសនេះបិទយន្តការផ្ទៀងផ្ទាត់ផ្សេងទៀត។ គ្រាន់តែបើកជម្រើសនេះ ប្រសិនបើអ្នកប្រាកដថាការចូល REMOTE_USER របស់អ្នកដំណើរការរួចហើយ',
-    'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
+    'login_remote_user_custom_logout_url_text' => 'URL ចេញប្រើផ្ទាល់ខ្លួន',
     'login_remote_user_custom_logout_url_help' => 'ប្រសិនបើ url ត្រូវបានផ្តល់ជូននៅទីនេះ អ្នកប្រើប្រាស់នឹងត្រូវបានបញ្ជូនបន្តទៅកាន់ URL នេះ បន្ទាប់ពីអ្នកប្រើប្រាស់ចាកចេញពី Snipe-IT។ វាមានប្រយោជន៍ក្នុងការបិទវគ្គអ្នកប្រើប្រាស់របស់អ្នកផ្តល់ការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវរបស់អ្នក។',
-    'login_remote_user_header_name_text' => 'Custom user name header',
+    'login_remote_user_header_name_text' => 'បឋមកថាឈ្មោះអ្នកប្រើផ្ទាល់ខ្លួន',
     'login_remote_user_header_name_help' => 'ប្រើបឋមកថាដែលបានបញ្ជាក់ជំនួសឱ្យ REMOTE_USER',
     'logo'                    	=> 'និមិត្តសញ្ញា',
     'logo_print_assets'         => 'ប្រើក្នុងការបោះពុម្ព',
@@ -148,12 +150,12 @@ return [
     'full_multiple_companies_support_help_text' => 'ការដាក់កម្រិតអ្នកប្រើប្រាស់ (រាប់បញ្ចូលទាំងអ្នកគ្រប់គ្រង) ដែលត្រូវបានចាត់តាំងឱ្យក្រុមហ៊ុនចំពោះទ្រព្យសម្បត្តិរបស់ក្រុមហ៊ុនពួកគេ។',
     'full_multiple_companies_support_text' => 'ការគាំទ្រក្រុមហ៊ុនច្រើនយ៉ាងពេញលេញ',
     'show_in_model_list'   => 'Show in Model Dropdowns',
-    'optional'					=> 'optional',
+    'optional'					=> 'ជាជម្រើស',
     'per_page'                  => 'លទ្ធផលក្នុងមួយទំព័រ',
     'php'                       => 'កំណែ PHP',
-    'php_info'                  => 'PHP info',
+    'php_info'                  => 'ព័ត៌មាន PHP',
     'php_overview'              => 'ព័ត៌មាន PHP',
-    'php_overview_help'         => 'PHP System info',
+    'php_overview_help'         => 'ព័ត៌មានប្រព័ន្ធ PHP',
     'php_gd_info'               => 'អ្នកត្រូវតែដំឡើង php-gd ដើម្បីបង្ហាញកូដ QR សូមមើលការណែនាំដំឡើង។',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
     'pwd_secure_complexity'     => 'ភាពស្មុគស្មាញនៃពាក្យសម្ងាត់',
@@ -170,8 +172,8 @@ return [
     'qr_help'                   => 'បើក QR Codes ជាដំបូងដើម្បីកំណត់វា។',
     'qr_text'                   => 'អត្ថបទកូដ QR',
     'saml'                      => 'SAML',
-    'saml_title'                => 'Update SAML settings',
-    'saml_help'                 => 'SAML settings',
+    'saml_title'                => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់ SAML',
+    'saml_help'                 => 'ការកំណត់ SAML',
     'saml_enabled'              => 'SAML enabled',
     'saml_integration'          => 'SAML Integration',
     'saml_sp_entityid'          => 'លេខសម្គាល់អង្គភាព',
@@ -330,6 +332,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'វាមិនមើលទៅដូចជាផ្នែកបន្ថែម LDAP ត្រូវបានដំឡើង ឬបើកនៅលើម៉ាស៊ីនមេនេះទេ។ អ្នកនៅតែអាចរក្សាទុកការកំណត់របស់អ្នកបាន ប៉ុន្តែអ្នកនឹងត្រូវបើកដំណើរការផ្នែកបន្ថែម LDAP សម្រាប់ PHP មុនពេលការធ្វើសមកាលកម្ម LDAP ឬការចូលនឹងដំណើរការ។',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'លេខបុគ្គលិក',
     'create_admin_user' => 'បង្កើតអ្នកប្រើប្រាស់ ::',
     'create_admin_success' => 'ជោគជ័យ! អ្នកប្រើប្រាស់អ្នកគ្រប់គ្រងរបស់អ្នកត្រូវបានបន្ថែម!',
diff --git a/resources/lang/km-KH/admin/settings/message.php b/resources/lang/km-KH/admin/settings/message.php
index 99b0dfdc7..20e34205a 100644
--- a/resources/lang/km-KH/admin/settings/message.php
+++ b/resources/lang/km-KH/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'កំពុងសាកល្បងការផ្ទៀងផ្ទាត់ LDAP...',
         'authentication_success' => 'អ្នកប្រើប្រាស់បានផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវប្រឆាំងនឹង LDAP ដោយជោគជ័យ!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'កំពុងផ្ញើ៖ សារសាកល្បងកម្មវិធី...',
         'success' => 'ការរួមបញ្ចូល៖ webhook_name របស់អ្នកដំណើរការ!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'កំហុស៖ 301/302៖ ចំណុចបញ្ចប់ត្រឡប់ការបញ្ជូនបន្ត។ សម្រាប់ហេតុផលសុវត្ថិភាព យើងមិនធ្វើតាមការបញ្ជូនបន្តទេ។ សូមប្រើចំណុចបញ្ចប់ពិតប្រាកដ។',
         'error_misc' => 'មាន​អ្វីមួយ​មិន​ប្រក្រតី។ :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/km-KH/general.php b/resources/lang/km-KH/general.php
index e261772ba..a337cbb80 100644
--- a/resources/lang/km-KH/general.php
+++ b/resources/lang/km-KH/general.php
@@ -62,8 +62,8 @@ return [
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'ប្រគល់មកវិញពី',
     'checkout'  			=> 'ប្រគល់អោយ',
-    'checkouts_count'       => 'Checkouts',
-    'checkins_count'        => 'Checkins',
+    'checkouts_count'       => 'ការបញ្ចេញប្រើច្រើន',
+    'checkins_count'        => 'ការបង្វិលត្រឡប់ច្រើន',
     'checkin_and_delete'  	=> 'សង់មកវិញ និងលុប',
     'user_requests_count'   => 'សំណើ',
     'city'  				=> 'ទីក្រុង',
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'កំណត់របាយការណ៍តាមបំណង',
     'custom_report'         => 'របាយការណ៍ទ្រព្យសកម្មផ្ទាល់ខ្លួន',
     'dashboard'				=> 'ផ្ទាំងគ្រប់គ្រង',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ថ្ងៃ',
     'days_to_next_audit'    => 'ថ្ងៃទៅសវនកម្មបន្ទាប់',
     'date'					=> 'កាលបរិច្ឆេទ',
@@ -105,7 +106,7 @@ return [
     'deletion_failed'       => 'ការលុបបានបរាជ័យ',
     'departments'           => 'នាយកដ្ឋានច្រើន',
     'department'            => 'នាយកដ្ឋាន',
-    'deployed'				=> 'Deployed',
+    'deployed'				=> 'បានប្រើប្រាស់',
     'depreciation'			=> 'រំលោះ',
     'depreciations'         => 'ការរំលោះ',
     'depreciation_report'	=> 'របាយការណ៍រំលោះ',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'នាមត្រកូលនាមខ្លួន (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'នាមត្រកូល នាមខ្លួនដំបូង (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'នាមត្រកូលដំបូង (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'នាមត្រកូលនាមខ្លួន (Jane Smith)',
     'lastname_firstname_display'	=> 'នាមត្រកូលនាមខ្លួន (ស្មីត ជេន)',
     'name_display_format'	=> 'ឈ្មោះទម្រង់បង្ហាញ',
@@ -214,9 +216,11 @@ return [
     'new'					=> 'ថ្មី!',
     'no_depreciation'		=> 'គ្មានការរំលោះ',
     'no_results'			=> 'គ្មានលទ្ធផល។',
-    'no'  					=> 'No',
+    'no'  					=> 'ល.រ',
     'notes'  				=> 'កំណត់ចំណាំ',
     'note_added'            => 'ចំណាំបានបន្ថែម',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'បន្ថែមចំណាំ',
     'note_edited'            => 'ចំណាំបានកែសម្រួល',
     'edit_note'              => 'កែសម្រួលចំណាំ',
@@ -303,9 +307,9 @@ return [
     'total_accessories'		=> 'គ្រឿងបន្ថែមសរុប',
     'total_consumables'		=> 'សម្ភារៈប្រើប្រាស់សរុប',
     'type'  				=> 'ប្រភេទ',
-    'undeployable'			=> 'Un-deployable',
+    'undeployable'			=> 'មិនអាចប្រើប្រាស់បាន',
     'unknown_admin'			=> 'មិនស្គាល់ Admin',
-    'username_format'		=> 'Username Format',
+    'username_format'		=> 'ទម្រង់ឈ្មោះអ្នកប្រើប្រាស់',
     'username'              => 'ឈ្មោះ​អ្នកប្រើប្រាស់',
     'update'                => 'ធ្វើបច្ចុប្បន្នភាព',
     'updating_item' => 'ការធ្វើបច្ចុប្បន្នភាព៖ ធាតុ',
@@ -397,7 +401,7 @@ return [
     'assigned'              => 'បានចាត់តាំង',
     'asset_count'           => 'ចំនួនទ្រព្យសកម្ម',
     'accessories_count'     => 'ចំនួនគ្រឿងបន្ថែម',
-    'consumables_count'     => 'Consumables Count',
+    'consumables_count'     => 'រាប់ចំនួនសម្ភារៈប្រើប្រាស់ច្រើន',
     'components_count'      => 'Components Count',
     'licenses_count'        => 'ចំនួនអាជ្ញាប័ណ្ណ',
     'notification_error'    => 'កំហុស',
@@ -415,8 +419,8 @@ return [
     'accessory_name'       => 'ឈ្មោះគ្រឿងបន្លាស់៖',
     'clone_item'            => 'ធាតុក្លូន',
     'checkout_tooltip' => 'Check this item out',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
-    'checkout_user_tooltip' => 'Check this item out to a user',
+    'checkin_tooltip' => 'សូមបង្វិលត្រឡប់ធាតុនេះ ដើម្បីឲ្យវាអាចប្រើបានសម្រាប់ការចេញប្រើម្តងទៀត ការធ្វើរូបភាពឡើងវិញ និងអ្វីផ្សេងទៀត',
+    'checkout_user_tooltip' => 'សូមបញ្ចេញប្រើធាតុនេះទៅឲ្យបុគ្គលអ្នកប្រើ',
     'checkin_to_diff_location' => 'អ្នកអាចជ្រើសរើសដើម្បីពិនិត្យមើលទ្រព្យសកម្មនេះនៅក្នុងទីតាំងផ្សេងក្រៅពីទីតាំងលំនាំដើមរបស់ទ្រព្យសកម្មនេះនៃ :default_location ប្រសិនបើទីតាំងមួយត្រូវបានកំណត់',
     'maintenance_mode'      => 'សេវាកម្មនេះមិនមានជាបណ្តោះអាសន្នសម្រាប់ការអាប់ដេតប្រព័ន្ធទេ។ សូមពិនិត្យមើលឡើងវិញនៅពេលក្រោយ។',
     'maintenance_mode_title' => 'ប្រព័ន្ធមិនអាចប្រើបានជាបណ្តោះអាសន្ន',
@@ -425,12 +429,12 @@ return [
     'backup_delete_not_allowed'     => 'ការលុបការបម្រុងទុកត្រូវបានបិទនៅក្នុងឯកសារ .env ។ ទាក់ទងផ្នែកជំនួយ ឬអ្នកគ្រប់គ្រងប្រព័ន្ធរបស់អ្នក។',
     'additional_files'           => 'ឯកសារបន្ថែម',
     'shitty_browser'        => 'រកមិនឃើញហត្ថលេខាទេ។ ប្រសិនបើអ្នកកំពុងប្រើកម្មវិធីរុករកចាស់ សូមប្រើកម្មវិធីរុករកតាមអ៊ីនធឺណិតទំនើបជាងមុន ដើម្បីបញ្ចប់ការទទួលយកទ្រព្យសកម្មរបស់អ្នក។',
-    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
-    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
-    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
-    'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
-    'na_no_purchase_date'   => 'N/A - No purchase date provided',
+    'bulk_soft_delete'      =>'លុបអ្នកប្រើប្រាស់ទាំងនេះឱ្យទន់ផងដែរ។ ប្រវត្តិទ្រព្យសម្បត្តិរបស់ពួកគេនឹងនៅដដែល លុះត្រាតែអ្នកលុបកំណត់ត្រាដែលបានលុបនៅក្នុងការកំណត់អ្នកគ្រប់គ្រង។',
+    'bulk_checkin_delete_success' => 'អ្នកប្រើដែលអ្នកបានជ្រើសរើសត្រូវបានលុបហើយ និងធាតុរបស់ពួកគេត្រូវបានបង្វិលត្រឡប់។',
+    'bulk_checkin_success' => 'ធាតុសម្រាប់អ្នកប្រើដែលបានជ្រើសរើសត្រូវបានបង្វិលត្រឡប់។',
+    'set_to_null'           => 'លុបតម្លៃសម្រាប់ការជ្រើសរើសនេះ | លុបតម្លៃសម្រាប់ការជ្រើសរើសទាំងអស់: selection_count ',
+    'set_users_field_to_null'  => 'លុបតម្លៃ :field សម្រាប់អ្នកប្រើនេះ | លុបតម្លៃ :field សម្រាប់អ្នកប្រើទាំងអស់ :user_count ',
+    'na_no_purchase_date'   => 'N/A - មិនមានកាលបរិច្ឆេទទិញទេ',
     'assets_by_status'      => 'ទ្រព្យសម្បត្តិតាមស្ថានភាព',
     'assets_by_status_type'      => 'ទ្រព្យសកម្មតាមប្រភេទស្ថានភាព',
     'pie_chart_type'        => 'ប្រភេទគំនូសតាងចំណិតនៃផ្ទាំងគ្រប់គ្រង',
@@ -446,7 +450,7 @@ return [
     'setup'                 => 'រៀបចំ',
     'pre_flight'            => 'Pre-Flight',
     'skip_to_main_content'  => 'រំលងទៅមាតិកាសំខាន់',
-    'toggle_navigation'     => 'Toggle navigation',
+    'toggle_navigation'     => 'បិទ/បើកការរុករក',
     'alerts'                => 'ការជូនដំណឹង',
     'tasks_view_all'        => 'មើលកិច្ចការទាំងអស់។',
     'true'                  => 'ពិត',
@@ -485,9 +489,9 @@ return [
     'importer_generic_error'    => 'ការនាំចូលឯកសាររបស់អ្នកបានបញ្ចប់ ប៉ុន្តែយើងបានទទួលកំហុស។ ជាធម្មតាវាបណ្តាលមកពីការបិទ API ភាគីទីបីពី webhook ការជូនដំណឹង (ដូចជា Slack) ហើយនឹងមិនមានការជ្រៀតជ្រែកជាមួយការនាំចូលដោយខ្លួនឯងទេ ប៉ុន្តែអ្នកគួរតែបញ្ជាក់រឿងនេះ។',
     'confirm' => 'បញ្ជាក់',
     'autoassign_licenses' => 'ផ្តល់អាជ្ញាប័ណ្ណដោយស្វ័យប្រវត្តិ',
-    'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
-    'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
-    'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
+    'autoassign_licenses_help' => 'អនុញ្ញាតឱ្យអ្នកប្រើប្រាស់នេះមានអាជ្ញាប័ណ្ណដែលបានកំណត់តាមរយៈ UI ឬឧបករណ៍ cli ភាគច្រើនដែលផ្តល់អាជ្ញាប័ណ្ណ។',
+    'autoassign_licenses_help_long' => 'វាអនុញ្ញាតឲ្យអ្នកប្រើមានអាជ្ញាប័ណ្ណដែលត្រូវចាត់តាមរយៈ UI ការចាត់អាជ្ញាប័ណ្ណជាច្រើន ឬឧបករណ៍ CLI។ (ឧទាហរណ៍៖ អ្នកប្រហែលជាមិនចង់ឲ្យអ្នកកុងត្រាការ ទទួលអាជ្ញាប័ណ្ណដោយស្វ័យប្រវត្តិ ដែលអ្នកបម្រុងទុកសម្រាប់បុគ្គលិកប៉ុណ្ណោះ។ អ្នកនៅតែអាចចាត់អាជ្ញាប័ណ្ណជាឯកជនទៅកាន់អ្នកប្រើទាំងនោះបាន ប៉ុន្តែពួកគេនឹងមិនត្រូវរួមបញ្ចូលក្នុងមុខងារ \'Checkout License to All Users\' ឡើយ។)',
+    'no_autoassign_licenses_help' => 'កុំរួមបញ្ចូលអ្នកប្រើសម្រាប់ការចាត់អាជ្ញាប័ណ្ណជាច្រើនតាមរយៈ UI ឬឧបករណ៍ CLI។',
     'modal_confirm_generic'      => 'តើអ្នកប្រាកដទេ?',
     'cannot_be_deleted'      => 'ធាតុនេះមិនអាចលុបបានទេ។',
     'cannot_be_edited'      => 'ធាតុនេះមិនអាចកែសម្រួលបានទេ។',
@@ -495,39 +499,39 @@ return [
     'serial_number'        => 'លេខស៊េរី',
     'item_notes' => ': ចំណាំធាតុ',
     'item_name_var' => '៖ ឈ្មោះធាតុ',
-    'error_user_company' => 'Checkout target company and asset company do not match',
+    'error_user_company' => 'ក្រុមហ៊ុនគោលដៅនៃការចេញយក និងក្រុមហ៊ុនដែលកាន់កាប់ទ្រព្យសម្បត្តិមិនត្រូវគ្នា',
     'error_user_company_accept_view' => 'ទ្រព្យសម្បត្តិដែលប្រគល់ឱ្យអ្នកជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនផ្សេង ដូច្នេះអ្នកមិនអាចទទួលយក ឬបដិសេធបានទេ សូមពិនិត្យជាមួយអ្នកគ្រប់គ្រងរបស់អ្នក',
     'importer' => [
-        'checked_out_to_fullname' => 'Checked Out to: Full Name',
-        'checked_out_to_first_name' => 'Checked Out to: First Name',
-        'checked_out_to_last_name' => 'Checked Out to: Last Name',
-        'checked_out_to_username' => 'Checked Out to: Username',
-        'checked_out_to_email' => 'Checked Out to: Email',
-        'checked_out_to_tag' => 'Checked Out to: Asset Tag',
+        'checked_out_to_fullname' => 'បានចេញយកទៅកាន់៖ ឈ្មោះពេញ',
+        'checked_out_to_first_name' => 'បានចេញយកទៅកាន់៖ នាមខ្លួន',
+        'checked_out_to_last_name' => 'បានចេញយកទៅកាន់៖ នាមត្រកូល',
+        'checked_out_to_username' => 'បានចេញយកទៅកាន់៖ ឈ្មោះអ្នកប្រើ',
+        'checked_out_to_email' => 'បានចេញយកទៅកាន់៖ អ៊ីម៉ែល',
+        'checked_out_to_tag' => 'បានចេញយកទៅកាន់៖ ស្លាកទ្រព្យសម្បត្តិ',
         'manager_first_name' => 'ឈ្មោះអ្នកគ្រប់គ្រង',
         'manager_last_name' => 'នាមត្រកូលអ្នកគ្រប់គ្រង',
         'manager_full_name' => 'ឈ្មោះពេញអ្នកគ្រប់គ្រង',
         'manager_username' => 'ឈ្មោះអ្នកប្រើអ្នកគ្រប់គ្រង',
         'checkout_type' => 'ប្រភេទ Checkout',
         'checkout_location' => 'Checkout ទៅកាន់ទីតាំង',
-        'image_filename' => 'Image Filename',
-        'do_not_import'     => 'Do Not Import',
+        'image_filename' => 'ឈ្មោះឯកសាររូបភាព',
+        'do_not_import'     => 'កុំនាំចូល',
         'vip' => 'VIP',
         'avatar'  => 'Avatar',
-        'gravatar' => 'Gravatar Email',
+        'gravatar' => 'អ៊ីមែល Gravatar',
         'currency' => 'រូបិយប័ណ្ណ',
         'address2' => 'ខ្សែអាស័យដ្ឋាន 2',
-        'import_note' => 'Imported using csv importer',
+        'import_note' => 'បាននាំចូលដោយប្រើ csv importer',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'លុបវាលនេះចេញពីសំណុំវាល។ វានឹងមិនលុបវាលផ្ទាល់ខ្លួនទេ គ្រាន់តែផ្ដាច់ការភ្ជាប់របស់វាជាមួយសំណុំវាលនេះប៉ុណ្ណោះ។',
+    'checked_out_to_fields' => 'វាលច្រើន បានចេញយកទៅកាន់',
     'percent_complete' => '% រួចរាល់',
     'uploading' => 'កំពុងបង្ហោះ... ',
     'upload_error' => 'កំហុសក្នុងការបង្ហោះឯកសារ។ សូម​ពិនិត្យ​មើល​ថា​គ្មាន​ជួរ​ដេក​ទទេ ហើយ​ថា​គ្មាន​ឈ្មោះ​ជួរ​ឈរ​ត្រូវ​បាន​ស្ទួន​ទេ។',
     'copy_to_clipboard' => 'ចម្លងទៅក្ដារតម្បៀតខ្ទាស់',
     'copied' => 'បានចម្លង!',
     'status_compatibility' => 'ប្រសិនបើទ្រព្យសម្បត្តិត្រូវបានចាត់ចែងរួចហើយ ពួកវាមិនអាចប្តូរទៅជាប្រភេទស្ថានភាពដែលមិនអាចប្រើប្រាស់បានឡើយ ហើយការផ្លាស់ប្តូរតម្លៃនេះនឹងត្រូវបានរំលង។',
-    'rtd_location_help' => 'This is the location of the asset when it is not checked out',
+    'rtd_location_help' => 'នេះគឺជាទីតាំងនៃទ្រព្យសកម្ម នៅពេលដែលវាមិនត្រូវបានពិនិត្យប្រគលឲ្យ',
     'item_not_found' => ':item_type ID :id មិនមានទេ ឬត្រូវបានលុប',
     'action_permission_denied' => 'អ្នកមិនមានសិទ្ធិក្នុងការ :action :item_type ID :id',
     'action_permission_generic' => 'អ្នកមិនមានសិទ្ធិក្នុងការ :action this :item_type',
@@ -535,7 +539,7 @@ return [
     'action_source' => 'ប្រភពសកម្មភាព',
     'or' => 'ឬ',
     'url'                   => 'URL',
-    'edit_fieldset' => 'Edit fieldset fields and options',
+    'edit_fieldset' => 'កែសម្រួលវាល សំណុំវាល និងជម្រើសច្រើន',
     'permission_denied_superuser_demo' => 'ការអនុញ្ញាតត្រូវបានបដិសេធ។ អ្នកមិនអាចធ្វើបច្ចុប្បន្នភាពព័ត៌មានអ្នកប្រើប្រាស់សម្រាប់អ្នកគ្រប់គ្រងជាន់ខ្ពស់នៅលើការបង្ហាញនោះទេ។',
     'pwd_reset_not_sent' => 'អ្នក​ប្រើ​មិន​ត្រូវ​បាន​ធ្វើ​ឱ្យ​សកម្ម, ត្រូវ​បាន​ធ្វើ​សមកាលកម្ម LDAP, ឬ​មិន​មាន​អាសយដ្ឋាន​អ៊ីមែល',
     'error_sending_email' => 'កំហុសក្នុងការផ្ញើអ៊ីមែល',
@@ -557,12 +561,13 @@ return [
         'accessories'  => ':count Accessory|:រាប់គ្រឿងបន្ថែម',
         'assets'  => ':count Asset|:រាប់ទ្រព្យសកម្ម',
         'licenses'  => ':count License|:រាប់អាជ្ញាបណ្ណ',
-        'license_seats'  => ':count License Seat|:count License Seats',
-        'consumables'  => ':count Consumable|:count Consumables',
-        'components'  => ':count Component|:count Components',
+        'license_seats'  => ':រាប់ អាជ្ញាប័ណ្ណ Seat|:រាប់ អាជ្ញាប័ណ្ណ Seats',
+        'consumables'  => ':រាប់ចំនួនប្រើប្រាស់|:រាប់ចំនួនប្រើប្រាស់ច្រើន',
+        'components'  => ':រាប់សមាសធាតុ|:រាប់សមាសធាតុច្រើន',
     ],
+
     'more_info' => 'ព័​ត៍​មាន​បន្ថែម',
-    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'quickscan_bulk_help' => 'ត្រួតពិនិត្យប្រអប់នេះនឹងកែសម្រួលកំណត់ត្រាទ្រព្យសម្បត្តិដើម្បីបង្ហាញទីតាំងថ្មីនេះ។ ប្រសិនបើមិនបានត្រួតពិនិត្យប្រអប់នេះ វានឹងត្រឹមតែចុះកំណត់ត្រាទីតាំងក្នុងកំណត់ហេតុសវនកម្មប៉ុណ្ណោះ។ សូមចំណាំថា បើទ្រព្យសម្បត្តិនេះត្រូវបានបញ្ចេញប្រើ វានឹងមិនបម្លែងទីតាំងរបស់បុគ្គល ទ្រព្យសម្បត្តិ ឬទីតាំងដែលវាត្រូវបានបញ្ចេញប្រើនោះទេ។',
     'whoops' => 'អូយ!',
     'something_went_wrong' => 'មានអ្វីមួយខុសជាមួយសំណើរបស់អ្នក។',
     'close' => 'បិទ',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'មិនអនុញ្ញាតឱ្យអ្នកប្រើប្រាស់គ្រប់គ្រងពាក្យសម្ងាត់ផ្ទាល់ខ្លួនរបស់ពួកគេ។',
     'user_managed_passwords_allow' => 'អនុញ្ញាតឱ្យអ្នកប្រើប្រាស់គ្រប់គ្រងពាក្យសម្ងាត់ផ្ទាល់ខ្លួនរបស់ពួកគេ។',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'បន្ថែមកំណត់ចំណាំ',
+    ],
+
 ];
diff --git a/resources/lang/ko-KR/admin/settings/general.php b/resources/lang/ko-KR/admin/settings/general.php
index cab2efff1..2344ed401 100644
--- a/resources/lang/ko-KR/admin/settings/general.php
+++ b/resources/lang/ko-KR/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP 연결용 비밀번호',
     'ldap_basedn'               => 'Base BIND DN',
     'ldap_filter'               => 'LDAP 필터',
-    'ldap_pw_sync'              => 'LDAP 암호 동기화',
-    'ldap_pw_sync_help'         => '로컬 암호와 PDAP 암호를 동기화 하지 않으려면 이 박스의 체크를 풀어주세요. 이것을 해제하면 당신의 LDAP 서버에 여러 원인으로 접속할 수 없다면 사용자들도 로그인 할 수 없게 됩니다.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => '사용자명 항목',
     'ldap_lname_field'          => '성:',
     'ldap_fname_field'          => 'LDAP 이름',
@@ -330,6 +330,10 @@ return [
     'purge_help' => '삭제된 기록들 지우기',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => '사원번호',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/ko-KR/admin/settings/message.php b/resources/lang/ko-KR/admin/settings/message.php
index 26eb32cb6..3ec1d7110 100644
--- a/resources/lang/ko-KR/admin/settings/message.php
+++ b/resources/lang/ko-KR/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ko-KR/general.php b/resources/lang/ko-KR/general.php
index 43094ffe3..1a381eb9c 100644
--- a/resources/lang/ko-KR/general.php
+++ b/resources/lang/ko-KR/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => '맞춤형 자산 보고서',
     'dashboard'				=> '대시보드',
+    'data_source'           => 'Data Source',
     'days'      			=> '일자',
     'days_to_next_audit'    => '다음 감사까지의 일자',
     'date'					=> '날짜',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => '이름 성 (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  '성 (姓)의 첫 이니셜 (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> '아니오',
     'notes'  				=> '비고',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => '자세한 정보',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/lt-LT/admin/components/general.php b/resources/lang/lt-LT/admin/components/general.php
index 560389a85..b97e67632 100644
--- a/resources/lang/lt-LT/admin/components/general.php
+++ b/resources/lang/lt-LT/admin/components/general.php
@@ -4,10 +4,10 @@ return array(
     'component_name'                  => 'Komponento pavadinimas',
     'checkin'                             => 'Paimti komponentą',
     'checkout'                             => 'Išduoti komponentą',
-    'cost'				=> 'Pirkimo kaina',
+    'cost'				=> 'Įsigijimo kaina',
     'create'                             => 'Sukurti komponentą',
     'edit'                             => 'Redaguoti komponentą',
-    'date'					=> 'Pirkimo data',
+    'date'					=> 'Įsigijimo data',
     'order'					=> 'Užsakymo numeris',
     'remaining' 			             => 'Likutis',
     'total' 			                 => 'Iš viso',
diff --git a/resources/lang/lt-LT/admin/hardware/form.php b/resources/lang/lt-LT/admin/hardware/form.php
index 7845202a0..e8cdea422 100644
--- a/resources/lang/lt-LT/admin/hardware/form.php
+++ b/resources/lang/lt-LT/admin/hardware/form.php
@@ -17,9 +17,9 @@ return [
     'checkout_date'		=> 'Išdavimo data',
     'checkin_date'		=> 'Paėmimo data',
     'checkout_to'		=> 'Išduoti',
-    'cost'				=> 'Pirkimo kaina',
+    'cost'				=> 'Įsigijimo kaina',
     'create'			=> 'Sukurti turtą',
-    'date'				=> 'Pirkimo data',
+    'date'				=> 'Įsigijimo data',
     'depreciation'	    => 'Nusidėvėjimas',
     'depreciates_on'	=> 'Nusidėvėjimo data',
     'default_location'	=> 'Numatytoji vieta',
@@ -60,5 +60,5 @@ return [
     'processing_spinner' => 'Apdorojama... (Dideliems failams gali šiek tiek užtrukti)',
     'optional_infos'  => 'Papildoma informacija',
     'order_details'   => 'Su užsakymu susijusi informacija',
-    'calc_eol'    => 'Jei EOL data nustatoma iš naujo, naudoti automatinį EOL apskaičiavimą pagal pirkimo datą ir EOL laipsnį.',
+    'calc_eol'    => 'Jei EOL data nustatoma iš naujo, naudoti automatinį EOL apskaičiavimą pagal įsigijimo datą ir nusidėvėjimo laipsnį.',
 ];
diff --git a/resources/lang/lt-LT/admin/licenses/table.php b/resources/lang/lt-LT/admin/licenses/table.php
index 68efb1998..c5d6ffad7 100644
--- a/resources/lang/lt-LT/admin/licenses/table.php
+++ b/resources/lang/lt-LT/admin/licenses/table.php
@@ -8,7 +8,7 @@ return array(
     'id'      			=> 'ID',
     'license_email'   	=> 'Licencijos el. paštas',
     'license_name'   	=> 'Licencija išduota',
-    'purchase_date'   	=> 'Pirkimo data',
+    'purchase_date'   	=> 'Įsigijimo data',
     'purchased'   		=> 'Įsigyta',
     'seats'   			=> 'Vietos',
     'hardware'   		=> 'Įranga',
diff --git a/resources/lang/lt-LT/admin/settings/general.php b/resources/lang/lt-LT/admin/settings/general.php
index 0335a4112..c70fd2e08 100644
--- a/resources/lang/lt-LT/admin/settings/general.php
+++ b/resources/lang/lt-LT/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP susiejimo slaptažodis',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP filtras',
-    'ldap_pw_sync'              => 'LDAP slaptažodžių sinchronizavimas',
-    'ldap_pw_sync_help'         => 'Atžymėkite šį langelį, jei nenorite, kad LDAP slaptažodžiai būtų sinchronizuojami su vietiniais slaptažodžiais. Tai išjungus, jūsų naudotojams gali nepavykti prisijungti, jei dėl kokios nors priežasties jūsų LDAP serveris būtų nepasiekiamas.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Naudotojo vardo laukas',
     'ldap_lname_field'          => 'Pavardė',
     'ldap_fname_field'          => 'LDAP Vardas',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Išvalyti ištrintus įrašus',
     'ldap_extension_warning' => 'Panašu, kad šiame serveryje nėra įdiegtas arba įjungtas LDAP plėtinys. Vis tiek galite išsaugoti nustatymus, bet turėsite įjungti LDAP plėtinį PHP, kad veiktų LDAP sinchronizavimas arba prisijungimas.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Darbuotojo numeris',
     'create_admin_user' => 'Sukurti naudotoją ::',
     'create_admin_success' => 'Pavyko! Jūsų administratoriaus naudotojas buvo sukurtas!',
diff --git a/resources/lang/lt-LT/admin/settings/message.php b/resources/lang/lt-LT/admin/settings/message.php
index 378f9c077..b117140ad 100644
--- a/resources/lang/lt-LT/admin/settings/message.php
+++ b/resources/lang/lt-LT/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Tikrinamas LDAP autentifikavimas...',
         'authentication_success' => 'Naudotojas sėkmingai atpažintas naudojant LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app siunčiamas bandomasis pranešimas...',
         'success' => 'Jūsų :webhook_name integracija veikia!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'KLAIDA: 301/302 :endpoint rodo peradresavimą. Saugumo sumetimais peradresavimų nevykdome. Naudokite tikrąjį galinį tašką.',
         'error_misc' => 'Kažkas ne taip. :( ',
         'webhook_fail' => ' „Webhook“ pranešimas nepavyko: patikrinkite ar URL vis dar galioja.',
+        'webhook_channel_not_found' => ' „webhook“ kanalas nerastas.'
     ]
 ];
diff --git a/resources/lang/lt-LT/general.php b/resources/lang/lt-LT/general.php
index a960b1590..70249be85 100644
--- a/resources/lang/lt-LT/general.php
+++ b/resources/lang/lt-LT/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Individualizuoti ataskaitą',
     'custom_report'         => 'Individualizuota turto ataskaita',
     'dashboard'				=> 'Valdymo skydas',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dienos',
     'days_to_next_audit'    => 'Dienos iki kito audito',
     'date'					=> 'Data',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Vardas_Pavardė (vardas_pavarde@example.com)',
     'lastnamefirstinitial_format' =>  'Pavardė, Vardo pirmoji raidė (pavardev@example.com)',
     'firstintial_dot_lastname_format' => 'Vardo pirmoji raidė.Pavardė (v.pavarde@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Vardas Pavardė (Vardenis Pavardenis)',
     'lastname_firstname_display'	=> 'Pavardė Vardas (Pavardenis Vardenis)',
     'name_display_format'	=> 'Vardo atvaizdavimo formatas',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Ne',
     'notes'  				=> 'Pastabos',
     'note_added'            => 'Pastaba pridėta',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Pridėti pastabą',
     'note_edited'            => 'Pastaba atnaujinta',
     'edit_note'              => 'Redaguoti pastabą',
@@ -232,8 +236,8 @@ return [
     'previous'				=> 'Ankstesnis',
     'processing'			=> 'Vykdoma',
     'profile'				=> 'Jūsų profilis',
-    'purchase_cost'                              => 'Pirkimo kaina',
-    'purchase_date'         => 'Pirkimo data',
+    'purchase_cost'                              => 'Įsigijimo kaina',
+    'purchase_date'         => 'Įsigijimo data',
     'qty'		            => 'Kiekis',
     'quantity'		        => 'Kiekis',
     'quantity_minimum'      => 'Turite vieną daiktą, kurio kiekis yra mažesnis arba beveik mažesnis už nurodytą minimalų kiekį|Turite :count daiktus (-ų), kurių kiekis yra mažesnis arba beveik mažesnis už nurodytą minimalų kiekį',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Eksploatacinė medžiaga|:count Eksploatacinės medžiagos',
         'components'  => ':count Komponentas|:count Komponentai',
     ],
+
     'more_info' => 'Išsamiau',
     'quickscan_bulk_help' => 'Pažymėjus šį langelį, turto įrašas bus atnaujintas, kad atspindėtų šią naują vietą. Jei paliksite jį nepažymėtą, vieta bus pažymėta tik audito žurnale. Atkreipkite dėmesį, kad jei šis turtas bus išduotas, tai nepakeis to asmens, turto ar vietos, kuriems išduodamas turtas, buvimo vietos.',
     'whoops' => 'Oi!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Neleisti naudotojams tvarkyti savo slaptažodžių',
     'user_managed_passwords_allow' => 'Leisti naudotojams tvarkyti savo slaptažodžius',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Pridėti pastabą',
+    ],
+
 ];
diff --git a/resources/lang/lv-LV/admin/settings/general.php b/resources/lang/lv-LV/admin/settings/general.php
index 2309a5fc7..02056cc6c 100644
--- a/resources/lang/lv-LV/admin/settings/general.php
+++ b/resources/lang/lv-LV/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Parole',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP filtrs',
-    'ldap_pw_sync'              => 'LDAP paroles sinhronizācija',
-    'ldap_pw_sync_help'         => 'Noņemiet atzīmi no šīs izvēles rūtiņas, ja nevēlaties, lai LDAP paroles tiktu sinhronizētas ar vietējām parolēm. Atspējojot to, tas nozīmē, ka jūsu lietotāji, iespējams, nevarēs pieteikties, ja jūsu LDAP serveris kāda iemesla dēļ nav sasniedzams.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Lietotājvārds lauks',
     'ldap_lname_field'          => 'Uzvārds',
     'ldap_fname_field'          => 'LDAP vārds',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Iztīrīt dzēstos ierakstus',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Darbinieka numurs',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/lv-LV/admin/settings/message.php b/resources/lang/lv-LV/admin/settings/message.php
index a97406344..9b0f5f48f 100644
--- a/resources/lang/lv-LV/admin/settings/message.php
+++ b/resources/lang/lv-LV/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/lv-LV/general.php b/resources/lang/lv-LV/general.php
index 2cfba8baa..e71ce24b4 100644
--- a/resources/lang/lv-LV/general.php
+++ b/resources/lang/lv-LV/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Pielāgot atskaiti',
     'custom_report'         => 'Pielāgoto aktīvu pārskats',
     'dashboard'				=> 'Informācijas panelis',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dienas',
     'days_to_next_audit'    => 'Dienas līdz nākamajam auditam',
     'date'					=> 'Datums',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Vārds Uzvārds (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Uzvārds un vārda pirmais burts (berzinsj@epasts.lv)',
     'firstintial_dot_lastname_format' => 'Vārds un uzvārds (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Vārds Uzvārds (Liene Ozoliņa)',
     'lastname_firstname_display'	=> 'Uzvārds Vārds (Ozoliņa Liene)',
     'name_display_format'	=> 'Vārda Attēlošanas Formāts',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Nē',
     'notes'  				=> 'Piezīmes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Vairāk informācijas',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/mi-NZ/admin/settings/general.php b/resources/lang/mi-NZ/admin/settings/general.php
index d1d045449..d74c60a58 100644
--- a/resources/lang/mi-NZ/admin/settings/general.php
+++ b/resources/lang/mi-NZ/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Whakauru Kupuhipa',
     'ldap_basedn'               => 'Tae Tae Tae',
     'ldap_filter'               => 'Tātari LDAP',
-    'ldap_pw_sync'              => 'Tukutahi Kupuhipa LDAP',
-    'ldap_pw_sync_help'         => 'Tangohia tenei pouaka ki te kore koe e hiahia ki te pupuri i nga kupuhipa a LDAP e tukuna ana ki nga kupuhipa a rohe. Ko te whakakore i tenei ka kore e taea e to kaiwhakamahi te takiuru mēnā kaore e taea te hoko atu i tō tūmau LDAP mō ētahi take.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Ingoa Ingoa Kaiwhakamahi',
     'ldap_lname_field'          => 'Ingoa Whakamutunga',
     'ldap_fname_field'          => 'Ingoa Tuatahi LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purea nga Tiwhikete Kua Mukua',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/mi-NZ/admin/settings/message.php b/resources/lang/mi-NZ/admin/settings/message.php
index b522ea832..35af55813 100644
--- a/resources/lang/mi-NZ/admin/settings/message.php
+++ b/resources/lang/mi-NZ/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/mi-NZ/general.php b/resources/lang/mi-NZ/general.php
index a5cc21fa7..51bd34fd8 100644
--- a/resources/lang/mi-NZ/general.php
+++ b/resources/lang/mi-NZ/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Ripoata Ahua Ritenga',
     'dashboard'				=> 'Papatohu',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ra',
     'days_to_next_audit'    => 'Ko nga ra ki te arotake i muri',
     'date'					=> 'Rā',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Tuhipoka',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'He Korero Ano',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/mk-MK/admin/settings/general.php b/resources/lang/mk-MK/admin/settings/general.php
index fea9a6082..da830ae9c 100644
--- a/resources/lang/mk-MK/admin/settings/general.php
+++ b/resources/lang/mk-MK/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Лозинка',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP филтер',
-    'ldap_pw_sync'              => 'LDAP синхронизирање лозинки',
-    'ldap_pw_sync_help'         => 'Отштиклирајте го ова поле ако не сакате да ги одржувате лозинките за LDAP синхронизирани со локалните лозинки. Оневозможувањето на ова значи дека вашите корисници можеби нема да можат да се најават ако вашиот сервер LDAP е недостижен поради некоја причина.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Поле за корисничко име',
     'ldap_lname_field'          => 'Презиме',
     'ldap_fname_field'          => 'LDAP Име',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Прочистете ги избришаните записи',
     'ldap_extension_warning' => 'Не изгледа како LDAP додатокот е инсталиран или овозможен на овој сервер. Сè уште можете да ги зачувате вашите поставки, Но, ќе треба да го овозможите LDAP додатокот за PHP пред LDAP сихронизацијата и најавата да работат',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Број на вработен',
     'create_admin_user' => 'Создадете корисник ::',
     'create_admin_success' => 'Успех! Вашиот администратор е додаден!',
diff --git a/resources/lang/mk-MK/admin/settings/message.php b/resources/lang/mk-MK/admin/settings/message.php
index 332af8ef3..03b4334f3 100644
--- a/resources/lang/mk-MK/admin/settings/message.php
+++ b/resources/lang/mk-MK/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Тестирање LDAP Автентификација...',
         'authentication_success' => 'Автентификацијата на корисникот на LDAP е успешна!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Испраќање :app тест порака...',
         'success' => 'Вашата :webhook_name Интеграција работи!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ГРЕШКА: 301/302 :endpoint враќа пренасочување. Од безбедносни причини, ние не ги следиме пренасочувањата. Ве молиме користете директна крајна точка.',
         'error_misc' => 'Нешто не е во ред. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/mk-MK/general.php b/resources/lang/mk-MK/general.php
index 8bac58a5a..6e94e2ef6 100644
--- a/resources/lang/mk-MK/general.php
+++ b/resources/lang/mk-MK/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Прилагоди извештај',
     'custom_report'         => 'Приспособен извештај за основни средства',
     'dashboard'				=> 'Табла',
+    'data_source'           => 'Data Source',
     'days'      			=> 'денови',
     'days_to_next_audit'    => 'Денови до следна ревизија',
     'date'					=> 'Датум',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Име, _, Презиме (janko_jankov@example.com)',
     'lastnamefirstinitial_format' =>  'Презиме, Почетна буква од име (jankovj@example.com)',
     'firstintial_dot_lastname_format' => 'Иницијал од име Презиме (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Име Презиме (Jane Smith)',
     'lastname_firstname_display'	=> 'Презиме Име (Smith Jane)',
     'name_display_format'	=> 'Формат на приказ на име',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Не',
     'notes'  				=> 'Забелешки',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Потрошен материјал|:count Потрошни материјали',
         'components'  => ':count Компонента|:count Компоненти',
     ],
+
     'more_info' => 'Повеќе информации',
     'quickscan_bulk_help' => 'Потврдувањето на ова поле ќе го уреди записот на средствата за да ја одрази оваа нова локација. Оставањето непотврдено, едноставно ќе ја забележи локацијата во пописот. Забележете дека ако се потврди ова средство, нема да ја промени локацијата на лицето, средството или локацијата на која се задолжува.',
     'whoops' => 'Упс!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/ml-IN/admin/settings/general.php b/resources/lang/ml-IN/admin/settings/general.php
index 97567df8d..ad21bbb64 100644
--- a/resources/lang/ml-IN/admin/settings/general.php
+++ b/resources/lang/ml-IN/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/ml-IN/admin/settings/message.php b/resources/lang/ml-IN/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/ml-IN/admin/settings/message.php
+++ b/resources/lang/ml-IN/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ml-IN/general.php b/resources/lang/ml-IN/general.php
index f67a7793b..ffed000e8 100644
--- a/resources/lang/ml-IN/general.php
+++ b/resources/lang/ml-IN/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/mn-MN/admin/settings/general.php b/resources/lang/mn-MN/admin/settings/general.php
index c736c9bd2..97659a173 100644
--- a/resources/lang/mn-MN/admin/settings/general.php
+++ b/resources/lang/mn-MN/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP нууц үгийн холбох',
     'ldap_basedn'               => 'Суурь Bind DN',
     'ldap_filter'               => 'LDAP шүүгч',
-    'ldap_pw_sync'              => 'LDAP нууц үгийн синк',
-    'ldap_pw_sync_help'         => 'Хэрэв та LDAP нууц үгүүдийг локал нууц үгтэй синхрончлохыг хүсэхгүй байгаа бол энэ хайрцгийг идэвхгүй болгоно уу. Ингэхгүй бол таны LDAP сервер ямар нэг шалтгаанаар хүрэх боломжгүй бол таны хэрэглэгчид нэвтэрч чадахгүй байж болно гэсэн үг юм.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Хэрэглэгчийн талбар',
     'ldap_lname_field'          => 'Сүүлийн нэр',
     'ldap_fname_field'          => 'LDAP анхны нэр',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Устгагдсан бүртгэл',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/mn-MN/admin/settings/message.php b/resources/lang/mn-MN/admin/settings/message.php
index 97e2d3d5d..ecfbf8030 100644
--- a/resources/lang/mn-MN/admin/settings/message.php
+++ b/resources/lang/mn-MN/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/mn-MN/general.php b/resources/lang/mn-MN/general.php
index 99eb53f9c..4c4077af2 100644
--- a/resources/lang/mn-MN/general.php
+++ b/resources/lang/mn-MN/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Гаалийн хєрєнгийн тайлан',
     'dashboard'				=> 'Хянах самбар',
+    'data_source'           => 'Data Source',
     'days'      			=> 'өдөр',
     'days_to_next_audit'    => 'Дараагийн аудитуудад орох өдрүүд',
     'date'					=> 'Огноо',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Oвог нэр (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Овгийн Эхний Үсэг Өөрийн Нэр (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Үгүй',
     'notes'  				=> 'Тэмдэглэл',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Илүү мэдээлэл',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/ms-MY/admin/settings/general.php b/resources/lang/ms-MY/admin/settings/general.php
index 210f6cfd5..410d0a4c1 100644
--- a/resources/lang/ms-MY/admin/settings/general.php
+++ b/resources/lang/ms-MY/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Pangkalan Bind DN',
     'ldap_filter'               => 'Penapis LDAP',
-    'ldap_pw_sync'              => 'Sinkron Kata Laluan LDAP',
-    'ldap_pw_sync_help'         => 'Nyahtandai kotak ini jika anda tidak mahu menyimpan kata laluan LDAP diselaraskan dengan kata laluan tempatan. Melumpuhkan ini bermakna pengguna anda mungkin tidak dapat melog masuk jika pelayan LDAP anda tidak dapat dicapai kerana sebab tertentu.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Medan Nama Pengguna',
     'ldap_lname_field'          => 'Nama terakhir',
     'ldap_fname_field'          => 'Nama Pertama LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Rekod Menghapuskan Rekod',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/ms-MY/admin/settings/message.php b/resources/lang/ms-MY/admin/settings/message.php
index 76c3e365d..223f8fb71 100644
--- a/resources/lang/ms-MY/admin/settings/message.php
+++ b/resources/lang/ms-MY/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ms-MY/general.php b/resources/lang/ms-MY/general.php
index 060805e88..388c4abe5 100644
--- a/resources/lang/ms-MY/general.php
+++ b/resources/lang/ms-MY/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Laporan Harta Pilihan',
     'dashboard'				=> 'Papan Pemuka',
+    'data_source'           => 'Data Source',
     'days'      			=> 'hari',
     'days_to_next_audit'    => 'Hari ke Audit Seterusnya',
     'date'					=> 'Tarikh',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Nama Pertama Nama Akhir (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Tidak',
     'notes'  				=> 'Nota',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Maklumat tambahan',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/nb-NO/admin/settings/general.php b/resources/lang/nb-NO/admin/settings/general.php
index e1e819146..5c3228ba3 100644
--- a/resources/lang/nb-NO/admin/settings/general.php
+++ b/resources/lang/nb-NO/admin/settings/general.php
@@ -110,8 +110,8 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'ldap_pword'                => 'LDAP Bind passord',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP-passord Sync',
-    'ldap_pw_sync_help'         => 'Ta bort kryss på denne boksen hvis du ikke vil at LDAP passord skal holdes synkronisert med lokale passord. Ved å skru av dette er det mulig at brukerne ikke vil klare å logge på om de ikke får tak i LDAP serveren.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Brukernavn Felt',
     'ldap_lname_field'          => 'Etternavn',
     'ldap_fname_field'          => 'LDAP Fornavn',
@@ -331,6 +331,10 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'purge_help' => 'Tømme slettede poster',
     'ldap_extension_warning' => 'Det ser ikke ut som LDAP-utvidelsen er installert eller aktivert på denne serveren. Du kan fortsatt lagre innstillingene, men du må installere og aktivere LDAP-tillegget til PHP før LDAP-synkronisering eller innlogging virker.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Ansattnummer',
     'create_admin_user' => 'Opprett en bruker ::',
     'create_admin_success' => 'Suksess! Din adminbruker har blitt lagt til!',
diff --git a/resources/lang/nb-NO/admin/settings/message.php b/resources/lang/nb-NO/admin/settings/message.php
index 9a977fcf6..68e62e5c8 100644
--- a/resources/lang/nb-NO/admin/settings/message.php
+++ b/resources/lang/nb-NO/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Tester LDAP-autentisering...',
         'authentication_success' => 'Brukeren ble autentisert mot LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sender :app test melding...',
         'success' => 'Ditt :webhook_name integrasjon fungerer!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'FEIL: 301/302 :endpoint returnerer en omaddressering. Av sikkerhetsgrunner følger vi ikke omadressering. Vennligst bruk det faktiske endepunktet.',
         'error_misc' => 'Noe gikk galt. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/nb-NO/general.php b/resources/lang/nb-NO/general.php
index 567bf33d5..0837fdc5b 100644
--- a/resources/lang/nb-NO/general.php
+++ b/resources/lang/nb-NO/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Tilpass rapport',
     'custom_report'         => 'Tilpasset eiendelsrapport',
     'dashboard'				=> 'Kontrollpanel',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dager',
     'days_to_next_audit'    => 'Dager til neste revisjon',
     'date'					=> 'Dato',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Fornavn Etternavn (oladunk@example.com)',
     'lastnamefirstinitial_format' =>  'Etternavn Initialer (oladunk@example.com)',
     'firstintial_dot_lastname_format' => 'Fornavn Initialer. Etternavn (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Fornavn Etternavn (Kari Torildsdottir)',
     'lastname_firstname_display'	=> 'Etternavn Fornavn (Torildsdottir, Kari)',
     'name_display_format'	=> 'Navneformat',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Nei',
     'notes'  				=> 'Notater',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Forbruksvare|:count Forbruksvarer',
         'components'  => ':count Komponenter|:count komponenter',
     ],
+
     'more_info' => 'Mer info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/nl-NL/admin/settings/general.php b/resources/lang/nl-NL/admin/settings/general.php
index e5b676f9f..789f81f27 100644
--- a/resources/lang/nl-NL/admin/settings/general.php
+++ b/resources/lang/nl-NL/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind wachtwoord',
     'ldap_basedn'               => 'Basis Bind DN',
     'ldap_filter'               => 'LDAP filter',
-    'ldap_pw_sync'              => 'LDAP wachtwoord synchronisatie',
-    'ldap_pw_sync_help'         => 'Schakel dit vinkje uit als je niet wenst dat LDAP wachtwoorden gesynchroniseerd worden met lokale wachtwoorden. Uitschakelen kan betekenen dat gebruikers niet kunnen inloggen als de LDAP server niet bereikbaar is.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Gebruikersnaam veld',
     'ldap_lname_field'          => 'Achternaam',
     'ldap_fname_field'          => 'LDAP Voornaam',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Verwijderde Records opschonen',
     'ldap_extension_warning' => 'Het lijkt erop dat de LDAP-extensie niet is geïnstalleerd of ingeschakeld op deze server. U kunt nog steeds uw instellingen opslaan, maar u moet de LDAP extensie voor PHP inschakelen voordat LDAP synchronisatie of login zal werken.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Personeelsnummer',
     'create_admin_user' => 'Gebruiker aanmaken ::',
     'create_admin_success' => 'Gelukt! Uw beheerder is toegevoegd!',
diff --git a/resources/lang/nl-NL/admin/settings/message.php b/resources/lang/nl-NL/admin/settings/message.php
index da8a638be..6db8d082d 100644
--- a/resources/lang/nl-NL/admin/settings/message.php
+++ b/resources/lang/nl-NL/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP-authenticatie testen...',
         'authentication_success' => 'Gebruiker met succes geverifieerd met LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app test bericht wordt verzonden...',
         'success' => 'Je :webhook_name integratie werkt!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'FOUT: 301/302 :endpoint geeft een omleiding. Om veiligheidsredenen volgen we geen omleidingen. Gebruik het werkelijke eindpunt.',
         'error_misc' => 'Er ging iets mis. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/nl-NL/general.php b/resources/lang/nl-NL/general.php
index 1143c1e07..9d09ca6c3 100644
--- a/resources/lang/nl-NL/general.php
+++ b/resources/lang/nl-NL/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Rapport aanpassen',
     'custom_report'         => 'Aangepaste Asset Rapport',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dagen',
     'days_to_next_audit'    => 'Dagen tot de volgende controle',
     'date'					=> 'Datum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Voornaam Achternaam (nomen.nescio@voorbeeld.nl)',
     'lastnamefirstinitial_format' =>  'Achternaam eerste initiaal (nescion@voorbeeld.nl)',
     'firstintial_dot_lastname_format' => 'Eerste Initiaal Achternaam (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Voornaam Achternaam (Jane Smith)',
     'lastname_firstname_display'	=> 'Achternaam Voornaam (Smith Jane)',
     'name_display_format'	=> 'Weergave naam',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Nee',
     'notes'  				=> 'Notities',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Verbruiksverbruiker|:count Verbruiksartikelen',
         'components'  => ':count Component|:count componenten',
     ],
+
     'more_info' => 'Meer Info',
     'quickscan_bulk_help' => 'Als u dit selectievakje aanvinkt, wordt het asset record bewerkt om deze nieuwe locatie te weerspiegelen. Als u het uitgevinkt laat staan ziet u de locatie in het audit logboek. Let op dat als dit asset is uitgecheckt, dan zal de locatie van de persoon, product of locatie waar het uitgecheckt is niet veranderen.',
     'whoops' => 'Oeps!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/nn-NO/admin/settings/general.php b/resources/lang/nn-NO/admin/settings/general.php
index e1e819146..5c3228ba3 100644
--- a/resources/lang/nn-NO/admin/settings/general.php
+++ b/resources/lang/nn-NO/admin/settings/general.php
@@ -110,8 +110,8 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'ldap_pword'                => 'LDAP Bind passord',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP-passord Sync',
-    'ldap_pw_sync_help'         => 'Ta bort kryss på denne boksen hvis du ikke vil at LDAP passord skal holdes synkronisert med lokale passord. Ved å skru av dette er det mulig at brukerne ikke vil klare å logge på om de ikke får tak i LDAP serveren.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Brukernavn Felt',
     'ldap_lname_field'          => 'Etternavn',
     'ldap_fname_field'          => 'LDAP Fornavn',
@@ -331,6 +331,10 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'purge_help' => 'Tømme slettede poster',
     'ldap_extension_warning' => 'Det ser ikke ut som LDAP-utvidelsen er installert eller aktivert på denne serveren. Du kan fortsatt lagre innstillingene, men du må installere og aktivere LDAP-tillegget til PHP før LDAP-synkronisering eller innlogging virker.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Ansattnummer',
     'create_admin_user' => 'Opprett en bruker ::',
     'create_admin_success' => 'Suksess! Din adminbruker har blitt lagt til!',
diff --git a/resources/lang/nn-NO/admin/settings/message.php b/resources/lang/nn-NO/admin/settings/message.php
index 9a977fcf6..68e62e5c8 100644
--- a/resources/lang/nn-NO/admin/settings/message.php
+++ b/resources/lang/nn-NO/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Tester LDAP-autentisering...',
         'authentication_success' => 'Brukeren ble autentisert mot LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sender :app test melding...',
         'success' => 'Ditt :webhook_name integrasjon fungerer!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'FEIL: 301/302 :endpoint returnerer en omaddressering. Av sikkerhetsgrunner følger vi ikke omadressering. Vennligst bruk det faktiske endepunktet.',
         'error_misc' => 'Noe gikk galt. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/nn-NO/general.php b/resources/lang/nn-NO/general.php
index 567bf33d5..0837fdc5b 100644
--- a/resources/lang/nn-NO/general.php
+++ b/resources/lang/nn-NO/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Tilpass rapport',
     'custom_report'         => 'Tilpasset eiendelsrapport',
     'dashboard'				=> 'Kontrollpanel',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dager',
     'days_to_next_audit'    => 'Dager til neste revisjon',
     'date'					=> 'Dato',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Fornavn Etternavn (oladunk@example.com)',
     'lastnamefirstinitial_format' =>  'Etternavn Initialer (oladunk@example.com)',
     'firstintial_dot_lastname_format' => 'Fornavn Initialer. Etternavn (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Fornavn Etternavn (Kari Torildsdottir)',
     'lastname_firstname_display'	=> 'Etternavn Fornavn (Torildsdottir, Kari)',
     'name_display_format'	=> 'Navneformat',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Nei',
     'notes'  				=> 'Notater',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Forbruksvare|:count Forbruksvarer',
         'components'  => ':count Komponenter|:count komponenter',
     ],
+
     'more_info' => 'Mer info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/no-NO/admin/settings/general.php b/resources/lang/no-NO/admin/settings/general.php
index e1e819146..5c3228ba3 100644
--- a/resources/lang/no-NO/admin/settings/general.php
+++ b/resources/lang/no-NO/admin/settings/general.php
@@ -110,8 +110,8 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'ldap_pword'                => 'LDAP Bind passord',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP-passord Sync',
-    'ldap_pw_sync_help'         => 'Ta bort kryss på denne boksen hvis du ikke vil at LDAP passord skal holdes synkronisert med lokale passord. Ved å skru av dette er det mulig at brukerne ikke vil klare å logge på om de ikke får tak i LDAP serveren.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Brukernavn Felt',
     'ldap_lname_field'          => 'Etternavn',
     'ldap_fname_field'          => 'LDAP Fornavn',
@@ -331,6 +331,10 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'purge_help' => 'Tømme slettede poster',
     'ldap_extension_warning' => 'Det ser ikke ut som LDAP-utvidelsen er installert eller aktivert på denne serveren. Du kan fortsatt lagre innstillingene, men du må installere og aktivere LDAP-tillegget til PHP før LDAP-synkronisering eller innlogging virker.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Ansattnummer',
     'create_admin_user' => 'Opprett en bruker ::',
     'create_admin_success' => 'Suksess! Din adminbruker har blitt lagt til!',
diff --git a/resources/lang/no-NO/admin/settings/message.php b/resources/lang/no-NO/admin/settings/message.php
index 9a977fcf6..68e62e5c8 100644
--- a/resources/lang/no-NO/admin/settings/message.php
+++ b/resources/lang/no-NO/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Tester LDAP-autentisering...',
         'authentication_success' => 'Brukeren ble autentisert mot LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sender :app test melding...',
         'success' => 'Ditt :webhook_name integrasjon fungerer!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'FEIL: 301/302 :endpoint returnerer en omaddressering. Av sikkerhetsgrunner følger vi ikke omadressering. Vennligst bruk det faktiske endepunktet.',
         'error_misc' => 'Noe gikk galt. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/no-NO/general.php b/resources/lang/no-NO/general.php
index 567bf33d5..0837fdc5b 100644
--- a/resources/lang/no-NO/general.php
+++ b/resources/lang/no-NO/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Tilpass rapport',
     'custom_report'         => 'Tilpasset eiendelsrapport',
     'dashboard'				=> 'Kontrollpanel',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dager',
     'days_to_next_audit'    => 'Dager til neste revisjon',
     'date'					=> 'Dato',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Fornavn Etternavn (oladunk@example.com)',
     'lastnamefirstinitial_format' =>  'Etternavn Initialer (oladunk@example.com)',
     'firstintial_dot_lastname_format' => 'Fornavn Initialer. Etternavn (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Fornavn Etternavn (Kari Torildsdottir)',
     'lastname_firstname_display'	=> 'Etternavn Fornavn (Torildsdottir, Kari)',
     'name_display_format'	=> 'Navneformat',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Nei',
     'notes'  				=> 'Notater',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Forbruksvare|:count Forbruksvarer',
         'components'  => ':count Komponenter|:count komponenter',
     ],
+
     'more_info' => 'Mer info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/pl-PL/account/general.php b/resources/lang/pl-PL/account/general.php
index 5c6fd0946..c126a5283 100644
--- a/resources/lang/pl-PL/account/general.php
+++ b/resources/lang/pl-PL/account/general.php
@@ -2,16 +2,17 @@
 
 return array(
     'personal_api_keys' => 'Osobiste klucze API',
-    'personal_access_token' => 'Personal Access Token',
+    'personal_access_token' => 'Osobisty token dostępu',
     'personal_api_keys_success' => 'Pomyślnie utworzono klucz dostępu API :key',
-    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'here_is_api_key' => 'Oto twój nowy osobisty token dostępu. Jest to jedyny raz, gdy zostanie wyświetlony, więc nie zgub go! Możesz teraz użyć tego tokenu, aby wywołać żądania API.',
+    'api_key_warning' => 'Po wygenerowaniu tokena API upewnij się, że natychmiast go skopiujesz, ponieważ
+                    nie będzie potem widoczny.',
     'api_base_url' => 'Twój bazowy adres URL API znajduje się w:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'Tokeny API tracą ważność za:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
+    'api_reference' => 'Sprawdź <a href="https://snipe-it.readme.io/referencję" target="_blank">API reference</a>, aby                    znaleźć konkretne enpoint-y API i dodatkową dokumentację API.',
     'profile_updated' => 'Aktualizacja konta powiodła się',
     'no_tokens' => 'Nie utworzyłeś żadnych osobistych tokenów.',
     'enable_sounds' => 'Włącz efekty dźwiękowe',
-    'enable_confetti' => 'Enable confetti effects',
+    'enable_confetti' => 'Włącz efekty confetti',
 );
diff --git a/resources/lang/pl-PL/admin/accessories/message.php b/resources/lang/pl-PL/admin/accessories/message.php
index 1cce9e89a..0ad568493 100644
--- a/resources/lang/pl-PL/admin/accessories/message.php
+++ b/resources/lang/pl-PL/admin/accessories/message.php
@@ -28,7 +28,7 @@ return array(
         'unavailable'   => 'Akcesoria nie są dostępne do zakupu. Sprawdź ilość dostępną',
         'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.',
          'checkout_qty' => array(
-            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            'lte'  => 'Obecnie dostępne jest tylko jedno akcesorium tego typu i próbujesz wydać :checkout_qty. Dostostosuj ilość wydania lub stan magazynowy tego akcesorium i spróbuj ponownie. Obecnie jest :number_currently_remaining dostępnych akcesoriów i próbujesz wydać :checkout_qty. Dostostosuj ilość wydania lub stan magazynowy tego akcesorium i spróbuj ponownie.',
             ),
            
     ),
diff --git a/resources/lang/pl-PL/admin/consumables/general.php b/resources/lang/pl-PL/admin/consumables/general.php
index 7bd7c2b24..6f9e75720 100644
--- a/resources/lang/pl-PL/admin/consumables/general.php
+++ b/resources/lang/pl-PL/admin/consumables/general.php
@@ -8,5 +8,5 @@ return array(
     'remaining' 			            => 'Pozostało',
     'total' 			                => 'Łącznie',
     'update'                            => 'Aktualizuj materiał eksploatacyjny',
-    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
+    'inventory_warning'                 => 'Stan magazynowy tego materiału jest poniżej minimum :min_count',
 );
diff --git a/resources/lang/pl-PL/admin/consumables/message.php b/resources/lang/pl-PL/admin/consumables/message.php
index 82356a05d..d8bc49c9b 100644
--- a/resources/lang/pl-PL/admin/consumables/message.php
+++ b/resources/lang/pl-PL/admin/consumables/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'invalid_category_type' => 'The category must be a consumable category.',
+    'invalid_category_type' => 'Kategoria musi być materiałem eksploatacyjnym.',
     'does_not_exist' => 'Materiał eksploatacyjny nie istnieje.',
 
     'create' => array(
diff --git a/resources/lang/pl-PL/admin/custom_fields/message.php b/resources/lang/pl-PL/admin/custom_fields/message.php
index 0d567bb93..a8eb12e95 100644
--- a/resources/lang/pl-PL/admin/custom_fields/message.php
+++ b/resources/lang/pl-PL/admin/custom_fields/message.php
@@ -5,7 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Pole nie istnieje.',
         'already_added'   => 'Pole już istnieje',
-        'none_selected'   => 'No field selected',
+        'none_selected'   => 'Nie wybrano żadnego pola',
 
         'create' => array(
             'error'   => 'Pole nie zostało utworzone. Spróbuj ponownie.',
diff --git a/resources/lang/pl-PL/admin/hardware/form.php b/resources/lang/pl-PL/admin/hardware/form.php
index ad16bbd78..199f84533 100644
--- a/resources/lang/pl-PL/admin/hardware/form.php
+++ b/resources/lang/pl-PL/admin/hardware/form.php
@@ -41,7 +41,7 @@ return [
     'requestable'		=> 'Użytkownicy mogą wymagać tego zasobu',
     'redirect_to_all'   => 'Wróć do wszystkich :type',
     'redirect_to_type'   => 'Przejdź do :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_checked_out_to'   => 'Przejdź do wydania do',
     'select_statustype'	=> 'Wybierz status',
     'serial'			=> 'Numer seryjny',
     'status'			=> 'Status',
@@ -55,10 +55,10 @@ return [
     'asset_location_update_default' => 'Zaktualizuj tylko domyślną lokalizację',
     'asset_location_update_actual' => 'Aktualizuj tylko bieżącą lokalizację',
     'asset_not_deployable' => 'Ten status oznacza brak możliwości wdrożenia. Ten zasób nie może zostać przypisany.',
-    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_not_deployable_checkin' => 'Ten status nie jest wdrożeniowym. Użycie tego statusu uniemożliwi wydanie zasobu.',
     'asset_deployable' => 'Ten status oznacza możliwość wdrożenia. Ten zasób może zostać przypisany.',
     'processing_spinner' => 'Przetwarzanie... (To może zająć trochę czasu dla dużych plików)',
     'optional_infos'  => 'Informacje opcjonalne',
     'order_details'   => 'Informacje związane z zamówieniem',
-    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
+    'calc_eol'    => 'W przypadku unieważnienia daty wycofania z eksploatacji, użyj automatycznego obliczenia wycofania z eksploatacji w oparciu o datę zakupu i czas wycofania z eksploatacji.',
 ];
diff --git a/resources/lang/pl-PL/admin/hardware/general.php b/resources/lang/pl-PL/admin/hardware/general.php
index 1c2f5973e..722fc7ffe 100644
--- a/resources/lang/pl-PL/admin/hardware/general.php
+++ b/resources/lang/pl-PL/admin/hardware/general.php
@@ -16,7 +16,7 @@ return [
     'edit'  					=> 'Edytuj zasób',
     'model_deleted'  			=> 'Ten model zasobów został usunięty. Musisz przywrócić model zanim będziesz mógł przywrócić zasób.',
     'model_invalid'             => 'Nieprawidłowy model dla tego zasobu.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid_fix'         => 'Zasób musi być zaktualizowany za pomocą ważnego modelu aktywów przed próbą sprawdzenia go w lub poza nim lub audytu.',
     'requestable'               => 'Żądane',
     'requested'				    => 'Zamówione',
     'not_requestable'           => 'Brak możliwości zarządzania',
diff --git a/resources/lang/pl-PL/admin/hardware/message.php b/resources/lang/pl-PL/admin/hardware/message.php
index 60bd88e09..34e95beb0 100644
--- a/resources/lang/pl-PL/admin/hardware/message.php
+++ b/resources/lang/pl-PL/admin/hardware/message.php
@@ -9,16 +9,16 @@ return [
     'does_not_exist_or_not_requestable' => 'Aktywo nie istnieje albo nie można go zażądać.',
     'assoc_users'	 	 => 'Ten nabytek/zasób jest przypisany do użytkownika i nie może być usunięty. Proszę sprawdzić przypisanie nabytków/zasobów a następnie spróbować ponownie.',
     'warning_audit_date_mismatch' 	=> 'Data następnego audytu (:next_audit_date) jest przed datą poprzedniego audytu (:last_audit_date). Zaktualizuj datę następnego audytu.',
-    'labels_generated'   => 'Labels were successfully generated.',
-    'error_generating_labels' => 'Error while generating labels.',
-    'no_assets_selected' => 'No assets selected.',
+    'labels_generated'   => 'Etykiety zostały pomyślnie wygenerowane.',
+    'error_generating_labels' => 'Błąd podczas generowania etykiet.',
+    'no_assets_selected' => 'Nie wybrano żadnych zasobów.',
 
     'create' => [
         'error'   		=> 'Nabytek nie został utworzony, proszę spróbować ponownie. :(',
         'success' 		=> 'Nowy nabytek został utworzony. :)',
         'success_linked' => 'Zasób o tagu :tag został utworzony pomyślnie. <strong><a href=":link" style="color: white;">Kliknij tutaj, aby wyświetlić</a></strong>.',
-        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
-        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
+        'multi_success_linked' => 'Zasób z tagiem :link został utworzony pomyślnie.|:count aktywów zostało utworzonych pomyślnie. :links.',
+        'partial_failure' => 'Nie można utworzyć zasobu. Powód: :failures|:count aktywów nie mogły zostać utworzone. Powód: :failed',
     ],
 
     'update' => [
@@ -85,8 +85,8 @@ return [
     ],
 
     'multi-checkout' => [
-        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
-        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+        'error'   => 'Zasób nie został zablokowany, spróbuj ponownie|Zasoby nie zostały zablokowane, spróbuj ponownie',
+        'success' => 'Zasób wydany pomyślnie.|Zasoby wydane pomyślnie.',
     ],
 
     'checkin' => [
diff --git a/resources/lang/pl-PL/admin/kits/general.php b/resources/lang/pl-PL/admin/kits/general.php
index 9e9bb7fae..1ad5481f9 100644
--- a/resources/lang/pl-PL/admin/kits/general.php
+++ b/resources/lang/pl-PL/admin/kits/general.php
@@ -47,5 +47,5 @@ return [
     'kit_deleted'                       => 'Zestaw został pomyślnie usunięty',
     'kit_model_updated'                 => 'Model został pomyślnie zaktualizowany',
     'kit_model_detached'                => 'Model został pomyślnie odłączony',
-    'model_already_attached'            => 'Model already attached to kit',
+    'model_already_attached'            => 'Wzór już dołączony do zestawu',
 ];
diff --git a/resources/lang/pl-PL/admin/licenses/general.php b/resources/lang/pl-PL/admin/licenses/general.php
index 84486c52c..aa9bf4576 100644
--- a/resources/lang/pl-PL/admin/licenses/general.php
+++ b/resources/lang/pl-PL/admin/licenses/general.php
@@ -14,7 +14,7 @@ return array(
     'info'  					=> 'Informacja o licencji',
     'license_seats'  			=> 'Licencje',
     'seat'  					=> 'Miejsce',
-    'seat_count'  				=> 'Seat :count',
+    'seat_count'  				=> 'Siedzenie :count',
     'seats'  					=> 'Miejsca',
     'software_licenses'  		=> 'Licencje oprogramowania',
     'user'  					=> 'Użytkownik',
@@ -24,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Zaznacz wszystkie miejsca',
-                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'Ta akcja będzie sprawdzać jedno miejsce. | Ta akcja będzie sprawdzać wszystkie :checkedout_seats_count miejsc dla tej licencji.',
                 'enabled_tooltip'   => 'Zaznacz WSZYSTKIE miejsca dla tej licencji zarówno od użytkowników, jak i aktywów',
                 'disabled_tooltip'  => 'To jest wyłączone, ponieważ nie ma obecnie zamówionych miejsc',
                 'disabled_tooltip_reassignable'  => 'To jest wyłączone, ponieważ licencja nie jest przypisywana ponownie',
                 'success'           => 'Licencja pomyślnie odblokowana! | Wszystkie licencje zostały pomyślnie sprawdzone!',
-                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
+                'log_msg'           => 'Sprawdzone poprzez sprawdzenie licencji zbiorczej w interfejsie licencyjnym',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/pl-PL/admin/licenses/message.php b/resources/lang/pl-PL/admin/licenses/message.php
index 18c4513d1..16cc59a73 100644
--- a/resources/lang/pl-PL/admin/licenses/message.php
+++ b/resources/lang/pl-PL/admin/licenses/message.php
@@ -44,8 +44,8 @@ return array(
         'error'   => 'Nastąpił problem podczas weryfikacji licencji. Spróbuj ponownie',
         'success' => 'Licencja poprawna',
         'not_enough_seats' => 'Za mało dostępnych miejsc do zamówienia',
-        'mismatch' => 'The license seat provided does not match the license',
-        'unavailable' => 'This seat is not available for checkout.',
+        'mismatch' => 'Podane miejsce licencji nie jest zgodne z licencją',
+        'unavailable' => 'To miejsce nie jest dostępne do wydania.',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/pl-PL/admin/locations/message.php b/resources/lang/pl-PL/admin/locations/message.php
index 7c48f1325..0542958f2 100644
--- a/resources/lang/pl-PL/admin/locations/message.php
+++ b/resources/lang/pl-PL/admin/locations/message.php
@@ -3,12 +3,12 @@
 return array(
 
     'does_not_exist' => 'Lokalizacja nie istnieje.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
+    'assoc_users'    => 'Ta lokalizacja nie jest obecnie usuwana, ponieważ jest to lokalizacja rekordu dla co najmniej jednego zasobu lub użytkownika, posiada przypisane do niego aktywa lub jest miejscem macierzystym innej lokalizacji. Zaktualizuj swoje rekordy, aby nie odnosić się już do tej lokalizacji i spróbuj ponownie. ',
     'assoc_assets'	 => 'Lokalizacja obecnie jest skojarzona z minimum jednym aktywem i nie może zostać usunięta. Uaktualnij właściwości aktywów tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ',
     'assoc_child_loc'	 => 'Lokalizacja obecnie jest rodzicem minimum jeden innej lokalizacji i nie może zostać usunięta. Uaktualnij właściwości lokalizacji tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ',
     'assigned_assets' => 'Przypisane aktywa',
     'current_location' => 'Bieżąca lokalizacja',
-    'open_map' => 'Open in :map_provider_icon Maps',
+    'open_map' => 'Otwórz w mapach :map_provider_icon',
 
 
     'create' => array(
diff --git a/resources/lang/pl-PL/admin/settings/general.php b/resources/lang/pl-PL/admin/settings/general.php
index 5d638a8a0..b6d5ce4a4 100644
--- a/resources/lang/pl-PL/admin/settings/general.php
+++ b/resources/lang/pl-PL/admin/settings/general.php
@@ -31,8 +31,8 @@ return [
     'backups'					=> 'Kopie zapasowe',
     'backups_help'              => 'Utwórz, pobieraj i przywracaj kopie zapasowe ',
     'backups_restoring'         => 'Przywróć z kopii zapasowej',
-    'backups_clean' => 'Clean the backed-up database before restore',
-    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
+    'backups_clean' => 'Wyczyść kopię zapasową bazy danych przed przywróceniem',
+    'backups_clean_helptext' => "To może być przydatne, jeśli zmieniasz się pomiędzy wersjami bazy danych",
     'backups_upload'            => 'Prześlij kopię zapasową',
     'backups_path'              => 'Kopie zapasowe na serwerze są przechowywane w <code>:path</code>',
     'backups_restore_warning'   => 'Użyj przycisku przywracania <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> aby przywrócić z poprzedniej kopii zapasowej. (To nie działa obecnie z pamięcią plików S3 lub Docker.<br><br>Twoja baza danych <strong>cała :app_name i wszystkie przesłane pliki zostaną całkowicie zastąpione</strong> przez to, co znajduje się w pliku kopii zapasowej.  ',
@@ -95,7 +95,7 @@ return [
     'ldap_login_sync_help'      => 'To tylko sprawdza, czy LDAP może poprawnie się synchronizować. Jeśli zapytanie o autoryzację LDAP nie jest poprawne, użytkownicy nadal mogą nie być w stanie się zalogować. NAJPIERW MUSISZ ZAPISAĆ TWOJE WCZEŚNIEJSZE AKTUALIZACJE USTAWIEŃ LDAP.',
     'ldap_manager'              => 'Menedżer LDAP',
     'ldap_server'               => 'Serwery LDAP',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+    'ldap_server_help'          => 'To powinno zaczynać się od ldap:// (dla nieszyfrowanych) lub ldaps:// (dla TLS lub SSL)',
     'ldap_server_cert'			=> 'Walidacja certyfikatu SSL dla LDAP',
     'ldap_server_cert_ignore'	=> 'Zezwalaj na nieprawidłowy certyfikat SSL',
     'ldap_server_cert_help'		=> 'Zaznacz tą opcje jeśli używasz certyfikatu SSL podpisanego przez samego siebie i chcesz zezwolić na nieprawidłowy certyfikat.',
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Hasło użytkownika wpisanego do łączenia się z serwerem LDAP',
     'ldap_basedn'               => 'DN',
     'ldap_filter'               => 'Filtr LDAP',
-    'ldap_pw_sync'              => 'Synchronizacja haseł LDAP',
-    'ldap_pw_sync_help'         => 'Odznacz jeśli nie chcesz synchronizować haseł z LDAP z lokalnymi',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Pole użytkownika',
     'ldap_lname_field'          => 'Nazwisko',
     'ldap_fname_field'          => 'Imię',
@@ -123,8 +123,8 @@ return [
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Testuj synchronizację LDAP',
     'license'                   => 'Licencja oprogramowania',
-    'load_remote'               => 'Load Remote Avatars',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
+    'load_remote'               => 'Załaduj zdalne awatary',
+    'load_remote_help_text'		=> 'Odznacz to pole, jeśli instalacja nie może załadować skryptów z zewnętrznego internetu. To uniemożliwi Snipe-IT próby załadowania obrazów z Gravatar.',
     'login'                     => 'Próby logowania',
     'login_attempt'             => 'Próba logowania',
     'login_ip'                  => 'Adres IP',
@@ -218,8 +218,8 @@ return [
     'webhook_integration_help'    => 'Integracja z :app jest opcjonalna, jednak endpoint i kanał są wymagane, jeśli chcesz z niej korzystać. Aby skonfigurować integrację z aplikacją, musisz najpierw <a href=":webhook_link" target="_new" rel="noopener">utworzyć przychodzący webhook</a> na swoim koncie :App. Kliknij przycisk <strong>Test :app Integration</strong> , aby potwierdzić poprawność ustawień przed zapisaniem. ',
     'webhook_integration_help_button'    => 'Po zapisaniu informacji o :app pojawi się przycisk testowy.',
     'webhook_test_help'           => 'Sprawdź, czy integracja aplikacji jest poprawnie skonfigurowana. ZAPISZ SWOJE AKTUALIZOWANE :app USTAWIENIA.',
-    'shortcuts_enabled'         => 'Enable Shortcuts',
-    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
+    'shortcuts_enabled'         => 'Włącz skróty',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + klucz dostępu, <strong>Mac</strong>: Kontrola + Opcja + klucz dostępu',
     'snipe_version'  			=> 'Wersja Snipe-IT',
     'support_footer'            => 'Obsługa linków stopki ',
     'support_footer_help'       => 'Określ kto widzi linki do Snipe-IT Instrukcji Obsługi oraz Wsparcia',
@@ -277,8 +277,8 @@ return [
     'two_factor_enrollment_text'	=> "Wymagane jest uwierzytelnianie dwóch elementów, ale urządzenie nie zostało jeszcze zapisane. Otwórz aplikację Google Authenticator i zeskanuj kod QR poniżej, aby zarejestrować urządzenie. Po zarejestrowaniu urządzenia wprowadź poniższy kod",
     'require_accept_signature'      => 'Wymagany podpis',
     'require_accept_signature_help_text'      => 'Włączając tę funkcjonalność wymusza się na użytkownikach fizycznego podpisania przyjęcia aktywa.',
-    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
-    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
+    'require_checkinout_notes'  => 'Wymagaj notatek o wydaniu/zwrocie',
+    'require_checkinout_notes_help_text'    => 'Włączenie tej funkcji będzie wymagało wypełnienia pól notatki podczas sprawdzania lub sprawdzania aktywów.',
     'left'        => 'lewo',
     'right'        => 'prawo',
     'top'        => 'góra',
@@ -295,13 +295,13 @@ return [
     'oauth_help' => 'Ustawienia punktu końcowego Oauth',
     'oauth_no_clients' => 'Nie utworzyłeś jeszcze żadnych klientów OAuth.',
     'oauth_secret' => 'Sekret',
-    'oauth_authorized_apps' => 'Authorized Applications',
+    'oauth_authorized_apps' => 'Autoryzowane aplikacje',
     'oauth_redirect_url' => 'URL przekierowania',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
-    'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
+    'oauth_name_help' => ' Coś, co Twoi użytkownicy będą rozpoznawać i ufać.',
+    'oauth_scopes' => 'Zakresy',
+    'oauth_callback_url' => 'Twój URL wywołania zwrotnego autoryzacji aplikacji.',
+    'create_client' => 'Utwórz klienta',
+    'no_scopes' => 'Brak zakresów',
     'asset_tag_title' => 'Aktualizuj ustawienia tagów zasobów',
     'barcode_title' => 'Aktualizuj ustawienia kodów kreskowych',
     'barcodes' => 'Kody kreskowe',
@@ -326,10 +326,14 @@ return [
     'asset_tags_help' => 'Zwiększanie i prefiksy',
     'labels' => 'Etykiety',
     'labels_title' => 'Aktualizuj ustawienia etykiety',
-    'labels_help' => 'Barcodes &amp; label settings',
+    'labels_help' => 'Kody kreskowe &amp; ustawienia etykiety',
     'purge_help' => 'Wyczyść usunięte rekordy',
     'ldap_extension_warning' => 'Nie wygląda na to, że rozszerzenie LDAP jest zainstalowane lub włączone na tym serwerze. Nadal możesz zapisać swoje ustawienia, ale musisz włączyć rozszerzenie LDAP dla PHP, zanim synchronizacja lub logowanie LDAP zadziała.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Numer pracownika',
     'create_admin_user' => 'Dodaj użytkownika ::',
     'create_admin_success' => 'Sukces! Twój użytkownik administratracyjny został dodany!',
@@ -355,14 +359,14 @@ return [
     'label2_2d_type'          => 'Kod kreskowy typu 2D',
     'label2_2d_type_help'     => 'Format kodów kreskowych 2D',
     'label2_2d_target'        => '2D Kod kreskowy',
-    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_2d_target_help'   => 'Dane zawarte w kodzie kreskowym 2D',
     'label2_fields'           => 'Definicje pól',
     'label2_fields_help'      => 'Pola mogą być dodawane, usuwane i przesuwane w lewej kolumnie. Dla każdego pola wiele opcji etykiet i źródeł danych może być dodawanych, usuwanych i zmienianych w prawej kolumnie.',
     'help_asterisk_bold'    => 'Tekst wprowadzony jako <code>**text**</code> będzie wyświetlany jako pogrubiony',
     'help_blank_to_use'     => 'Pozostaw puste, aby użyć wartości z <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'asset_id'              => 'Asset ID',
-    'data'               => 'Data',
+    'help_default_will_use' => '<code>:default</code> użyje wartości z <code>:setting_name</code>. <br>Zauważ, że wartość kodów kreskowych musi być zgodna z odpowiednią specyfikacją kodu kreskowego, aby mogła zostać wygenerowana. Aby uzyskać więcej informacji, zobacz <a href="https://snipe-it.readme.io/docs/barcodes">dokumentację <i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'ID Aktywa',
+    'data'               => 'Dane',
     'default'               => 'Domyślny',
     'none'                  => 'Brak',
     'google_callback_help' => 'Należy go wprowadzić jako adres URL wywołania zwrotnego w ustawieniach aplikacji Google OAuth w &apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">konsoli programisty Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -375,14 +379,14 @@ return [
     'bs_table_storage' => 'Pamięć tabeli',
     'timezone' => 'Strefa czasowa',
     'profile_edit'          => 'Edytuj profil',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
-    'default_avatar' => 'Upload custom default avatar',
-    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
-    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'profile_edit_help'          => 'Zezwalaj użytkownikom na edytowanie własnych profili.',
+    'default_avatar' => 'Prześlij niestandardowy awatar',
+    'default_avatar_help' => 'Ten obraz będzie wyświetlany jako profil, jeśli użytkownik nie ma zdjęcia profilowego.',
+    'restore_default_avatar' => 'Przywróć <a href=":default_avatar" data-toggle="lightbox" data-type="image">oryginalny domyślny awatar systemowy</a>',
     'restore_default_avatar_help' => '',
-    'due_checkin_days' => 'Due For Checkin Warning',
-    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
-    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'due_checkin_days' => 'Wymagane ostrzeżenie za Checkin',
+    'due_checkin_days_help' => 'Ile dni przed oczekiwanym sprawdzianem zasobu powinien on być wymieniony na stronie "Do sprawdzenia"?',
+    'no_groups' => 'Nie utworzono jeszcze żadnych grup. Odwiedź <code>Ustawienia administracyjne> Grupy uprawnień</code> aby je dodać.',
 
 
     /* Keywords for settings overview help */
@@ -390,7 +394,7 @@ return [
         'brand'             => 'stopka, logo, druk, motyw, skórka, nagłówek, kolory, kolor, css',
         'general_settings'  => 'obsługa firmy, podpis, akceptacja, format e-mail, format nazwy użytkownika, obrazy, miniatura, eula, grawatar, tos, kokpit menedżerski, prywatność',
         'groups'            => 'uprawnienia, grupy uprawnień, autoryzacje',
-        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'labels'            => 'etykiety, kody kreskowe, arkusze, druk, wzór, qr, 1d, 2d',
         'localization'      => 'lokalizacja, waluta, lokalna, lokalna, lokalna, strefa czasowa, strefa czasowa, międzynarodowa, internatalizacja, język, tłumaczenie',
         'php_overview'      => 'phpinfo, system, info',
         'purge'             => 'trwałe usunięcie',
diff --git a/resources/lang/pl-PL/admin/settings/message.php b/resources/lang/pl-PL/admin/settings/message.php
index 4b09bfa9c..e1bfd1ec6 100644
--- a/resources/lang/pl-PL/admin/settings/message.php
+++ b/resources/lang/pl-PL/admin/settings/message.php
@@ -15,7 +15,7 @@ return [
         'restore_confirm'       => 'Czy na pewno chcesz przywrócić bazę danych z :filename?'
     ],
     'restore' => [
-        'success'               => 'Your system backup has been restored. Please log in again.'
+        'success'               => 'Kopia zapasowa została przywrócona. Zaloguj się ponownie.'
     ],
     'purge' => [
         'error'     => 'Wystąpił błąd podczas czyszczenia. ',
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testowanie uwierzytelniania LDAP...',
         'authentication_success' => 'Użytkownik uwierzytelniony z LDAP pomyślnie!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Wysyłanie wiadomości testowej :app...',
         'success' => 'Twoja integracja :webhook_name działa!',
@@ -45,6 +48,7 @@ return [
         'error' => 'Coś poszło nie tak. :app odpowiedział: :error_message',
         'error_redirect' => 'BŁĄD: 301/302 :endpoint zwraca przekierowanie. Ze względów bezpieczeństwa nie podążamy za przekierowaniami. Proszę użyć aktualnego punktu końcowego.',
         'error_misc' => 'Coś poszło nie tak. :( ',
-        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_fail' => ' Powiadomienie webhook nie powiodło się: Sprawdź, czy adres URL jest nadal prawidłowy.',
+        'webhook_channel_not_found' => ' Nie znaleziono kanału webhook.'
     ]
 ];
diff --git a/resources/lang/pl-PL/admin/users/message.php b/resources/lang/pl-PL/admin/users/message.php
index 346c2ef5b..ae9b24ba3 100644
--- a/resources/lang/pl-PL/admin/users/message.php
+++ b/resources/lang/pl-PL/admin/users/message.php
@@ -37,23 +37,23 @@ return array(
         'update' => 'Podczas aktualizacji użytkownika wystąpił problem. Spróbuj ponownie.',
         'delete' => 'Wystąpił błąd podczas usuwania użytkownika. Spróbuj ponownie.',
         'delete_has_assets' => 'Ten użytkownik posiada elementy przypisane i nie może być usunięty.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Ten użytkownik nadal ma przypisany zasób. Proszę sprawdzić to najpierw.|Ten użytkownik nadal ma :count przypisanych zasobów. Proszę najpierw sprawdzić jego aktywa.',
+        'delete_has_licenses_var' => 'Ten użytkownik nadal ma przypisaną licencję. Proszę sprawdzić ją najpierw. | Ten użytkownik nadal ma przypisaną licencję :count. Proszę sprawdzić je najpierw.',
+        'delete_has_accessories_var' => 'Ten użytkownik nadal ma przypisane akcesoria. Proszę sprawdzić to najpierw. | Ten użytkownik nadal ma :count przyporządkowanych akcesoriów. Proszę najpierw sprawdzić ich aktywa.',
+        'delete_has_locations_var' => 'Ten użytkownik nadal zarządza lokalizacją. Proszę najpierw wybrać innego menedżera.|Ten użytkownik nadal zarządza :count lokalizacji. Proszę najpierw wybrać innego menedżera.',
+        'delete_has_users_var' => 'Ten użytkownik nadal zarządza innym użytkownikiem. Proszę najpierw wybrać innego menedżera dla tego użytkownika. Ten użytkownik nadal zarządza :count użytkowników. Najpierw wybierz innego menedżera.',
         'unsuspend' => 'Wystąpił problem podczas odblokowania użytkownika. Spróbuj ponownie.',
         'import'    => 'Podczas importowania użytkowników wystąpił błąd. Spróbuj ponownie.',
         'asset_already_accepted' => 'Aktywo zostało już zaakceptowane.',
         'accept_or_decline' => 'Musisz zaakceptować lub odrzucić to aktywo.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Czujemy się naprawdę źle, jeśli usuniesz siebie, prosimy o ponowne rozważenie.',
         'incorrect_user_accepted' => 'Zasób, który próbowano zaakceptować nie został wyewidencjonowany dla użytkownika.',
         'ldap_could_not_connect' => 'Nie udało się połączyć z serwerem LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji. <br>Błąd z serwera LDAP:',
         'ldap_could_not_bind' => 'Nie udało się połączyć z serwerem LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji. <br>Błąd z serwera LDAP: ',
         'ldap_could_not_search' => 'Nie udało się przeszukać serwera LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji. <br>Błąd z serwera LDAP:',
         'ldap_could_not_get_entries' => 'Nie udało się pobrać pozycji z serwera LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji. <br>Błąd z serwera LDAP:',
         'password_ldap' => 'Hasło dla tego konta jest zarządzane przez usługę LDAP, Active Directory. Skontaktuj się z działem IT, aby zmienić swoje hasło. ',
-        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
+        'multi_company_items_assigned' => 'Ten użytkownik ma elementy przypisane do innej firmy. Sprawdź je lub edytuj swoją firmę.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/pl-PL/auth/message.php b/resources/lang/pl-PL/auth/message.php
index 72db39464..1a1c7b04d 100644
--- a/resources/lang/pl-PL/auth/message.php
+++ b/resources/lang/pl-PL/auth/message.php
@@ -15,7 +15,7 @@ return array(
         'code_required'         => 'Kod weryfikacji dwuskładnikowej jest wymagany.',
         'invalid_code'          => 'Kod weryfikacji dwuskładnikowej jest nieprawidłowy.',
         'enter_two_factor_code' => 'Wprowadź kod uwierzytelniania dwuskładnikowego.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'please_enroll'         => 'Proszę zapisać urządzenie w uwierzytelnianiu dwuskładnikowym.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/pl-PL/button.php b/resources/lang/pl-PL/button.php
index 4e56cdba8..2f56768b8 100644
--- a/resources/lang/pl-PL/button.php
+++ b/resources/lang/pl-PL/button.php
@@ -7,7 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Odbierz wszytko i usuń użytkownika',
     'delete'  	                => 'Kasuj',
     'edit'    	                => 'Edycja',
-    'clone'    	                => 'Clone',
+    'clone'    	                => 'Powiel',
     'restore' 	                => 'Przywróć',
     'remove'                    => 'Usuń',
     'request'                   => 'Zamówienie',
@@ -23,12 +23,12 @@ return [
     'append'                    => 'Dołącz',
     'new'                       => 'Nowy',
     'var' => [
-        'clone'     => 'Clone :item_type',
-        'edit'      => 'Edit :item_type',
-        'delete'    => 'Delete :item_type',
-        'restore'   => 'Restore :item_type',
-        'create'    => 'Create New :item_type',
-        'checkout'  => 'Checkout :item_type',
-        'checkin'   => 'Checkin :item_type',
+        'clone'     => 'Powiel :item_type',
+        'edit'      => 'Edytuj :item_type',
+        'delete'    => 'Usuń :item_type',
+        'restore'   => 'Przywróć :item_type',
+        'create'    => 'Utwórz nowy :item_type',
+        'checkout'  => 'Wydaj :item_type',
+        'checkin'   => 'Odbierz :item_type',
     ]
 ];
diff --git a/resources/lang/pl-PL/general.php b/resources/lang/pl-PL/general.php
index 2445c8e29..c4356e85f 100644
--- a/resources/lang/pl-PL/general.php
+++ b/resources/lang/pl-PL/general.php
@@ -64,7 +64,7 @@ return [
     'checkout'  			=> 'Przypisz',
     'checkouts_count'       => 'Przypisania',
     'checkins_count'        => 'Odbiory',
-    'checkin_and_delete'  	=> 'Checkin and Delete',
+    'checkin_and_delete'  	=> 'Zaznacz i usuń',
     'user_requests_count'   => 'Żądania',
     'city'  				=> 'Miasto',
     'click_here'			=> 'Kliknij tutaj',
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Dostosuj raport',
     'custom_report'         => 'Raport niestandardowy składnik aktywów',
     'dashboard'				=> 'Panel główny',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dni',
     'days_to_next_audit'    => 'Dni do następnej inspekcji',
     'date'					=> 'Data',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Imię i Nazwisko (pawel@example.com)',
     'lastnamefirstinitial_format' =>  'Nazwisko i pierwsza litera imienia (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Pierwsza litera imienia i nazwisko (jsmith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Imię i Nazwisko (Jan Kowalski)',
     'lastname_firstname_display'	=> 'Nazwisko Imię (Smith Jane)',
     'name_display_format'	=> 'Format wyświetlania nazwy',
@@ -159,7 +161,7 @@ return [
     'image_upload'         	=> 'Dodaj zdjęcie',
     'filetypes_accepted_help'    => 'Akceptowany typ pliku to :types. Maksymalny dozwolony rozmiar pliku to :size.|Akceptowane typy plików to :types. Maksymalny dozwolony rozmiar pliku to :size.',
     'filetypes_size_help'   => 'Maksymalny rozmiar pliku to :size.',
-    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Akceptowane typy plików to jpg, webp, png, gif, svg i avif. Maksymalny rozmiar pliku to :size.',
     'unaccepted_image_type'  => 'Plik z obrazem jest nieczytelny. Akceptowane typy plików to JPG, WebP, PNG, GIF i SVG. Typ MIME przesłanego pliku to :mimetype.',
     'import'         	    => 'Zaimportuj',
     'import_this_file'      => 'Mapuj pola i przetwarzaj ten plik',
@@ -216,12 +218,14 @@ return [
     'no_results'			=> 'Brak wyników.',
     'no'  					=> 'Nie',
     'notes'  				=> 'Notatki',
-    'note_added'            => 'Note Added',
-    'add_note'              => 'Add Note',
-    'note_edited'            => 'Note Edited',
-    'edit_note'              => 'Edit Note',
-    'note_deleted'            => 'Note Deleted',
-    'delete_note'              => 'Delete Note',
+    'note_added'            => 'Dodano notatkę',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Dodaj notatkę',
+    'note_edited'            => 'Notatka edytowana',
+    'edit_note'              => 'Edytuj notatkę',
+    'note_deleted'            => 'Notatka usunięta',
+    'delete_note'              => 'Usuń notatkę',
     'order_number'          => 'Numer zamówienia',
     'only_deleted'          => 'Tylko usunięte aktywa',
     'page_menu'				=> 'Wyświetla pozycje _MENU_',
@@ -236,7 +240,7 @@ return [
     'purchase_date'         => 'Data zakupu',
     'qty'		            => 'Ilość',
     'quantity'		        => 'Ilość',
-    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'Masz jeden przedmiot poniżej lub prawie poniżej minimalnego poziomu ilości|Masz :count przedmiotów poniżej lub prawie poniżej minimalnego poziomu ilości',
     'quickscan_checkin'  	=> 'Szybkie skanowanie',
     'quickscan_checkin_status'  	=> 'Status przypisania',
     'ready_to_deploy'		=> 'Gotowe do wdrożenia',
@@ -247,7 +251,7 @@ return [
     'restored'				=> 'przywrócone',
     'restore'				=> 'Przywróć',
     'requestable_models'    => 'Żądane modele',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Żądane elementy',
     'requested'				=> 'Wymagane',
     'requested_date'        => 'Data złożenia zapotrzebowania',
     'requested_assets'      => 'Żądane zasoby',
@@ -281,7 +285,7 @@ return [
     'signed_off_by'         => 'Podpisano przez',
     'skin'       			=> 'Motyw',
     'webhook_msg_note'        => 'Powiadomienie zostanie wysłane przez webhook',
-    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Wygląda na to, że Twoja integracja :app z Snipe-IT działa!',
     'some_features_disabled' => 'Wersja demonstracyjna: Pewne funkcje zostały wyłączone w tej instalacji.',
     'site_name'				=> 'Nazwa Witryny',
     'state'  				=> 'Województwo',
@@ -308,7 +312,7 @@ return [
     'username_format'		=> 'Format nazwy użytkownika',
     'username'              => 'Nazwa użytkownika',
     'update'                => 'Zaktualizuj',
-    'updating_item' => 'Updating :item',
+    'updating_item' => 'Aktualizacja :item',
     'upload_filetypes_help'      => 'Dozwolone typy plików to png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip i rar. Maksymalny dozwolony rozmiar przesyłania to :rozmiar.',
     'uploaded'              => 'Przesłano',
     'user'					=> 'Użytkownik',
@@ -415,9 +419,9 @@ return [
     'accessory_name'       => 'Nazwa akcesorium:',
     'clone_item'            => 'Klonuj obiekt',
     'checkout_tooltip' => 'Sprawdź ten element',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkin_tooltip' => 'Zaznacz ten element, aby był dostępny do ponownego zgłoszenia, ponownego obrazowania itp.',
     'checkout_user_tooltip' => 'Sprawdź ten element do użytkownika',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkin_to_diff_location' => 'Możesz zaznaczyć ten zasób do lokalizacji innej niż domyślna lokalizacja tego zasobu :default_location, jeśli jeden jest ustawiony',
     'maintenance_mode'      => 'Usługa jest tymczasowo niedostępna z powodu aktualizacji systemu. Sprawdź ponownie później.',
     'maintenance_mode_title' => 'System tymczasowo niedostępny',
     'ldap_import'           => 'Hasło użytkownika nie powinno być zarządzane przez LDAP. (Pozwala to wysyłać prośbę o zresetowanie zapomnianego hasła)',
@@ -428,14 +432,14 @@ return [
     'bulk_soft_delete'      =>'Również miękkie usuwanie tych użytkowników. Ich historia zasobów pozostanie nieuszkodzona/dopóki nie usuniesz usuniętych rekordów w ustawieniach administratora.',
     'bulk_checkin_delete_success' => 'Wybrani użytkownicy zostali usunięci i ich zasoby zostały odebrane.',
     'bulk_checkin_success' => 'Elementy dla wybranych użytkowników zostały odebrane.',
-    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
+    'set_to_null'           => 'Usuń wartości dla tego zasobu|Usuń wartości dla wszystkich :asset_count aktywów ',
     'set_users_field_to_null'  => 'Usuń :field wartości dla tego użytkownika|Usuń :field wartości dla wszystkich użytkowników :user_count ',
     'na_no_purchase_date'   => 'N/A - Nie podano daty zakupu',
     'assets_by_status'      => 'Zasoby wg statusu',
     'assets_by_status_type'      => 'Zasoby według typu statusu',
     'pie_chart_type'        => 'Typ wykresu Pie Dashboard',
     'hello_name'            => 'Witaj, :name!',
-    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'Masz jeden przedmiot wymagający akceptacji. Kliknij tutaj, aby zaakceptować lub odrzucić | Masz :count elementów wymagających akceptacji. Kliknij tutaj, aby je zaakceptować lub odrzucić',
     'start_date'            => 'Data rozpoczęcia',
     'end_date'            => 'Data zakończenia',
     'alt_uploaded_image_thumbnail' => 'Przesłano miniaturę',
@@ -519,8 +523,8 @@ return [
         'address2' => 'Druga linia adresu',
         'import_note' => 'Zaimportowano przy użyciu importera csv',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'Usuń to pole z zestawu pól. To nie usunie pola niestandardowego, tylko powiązanie tego pola z tym zestawem pól.',
+    'checked_out_to_fields' => 'Zaznaczone pola',
     'percent_complete' => '% ukończone',
     'uploading' => 'Wgrywanie... ',
     'upload_error' => 'Błąd podczas przesyłania pliku. Sprawdź, czy nie ma pustych wierszy i czy nazwy kolumn nie są zduplikowane.',
@@ -539,7 +543,7 @@ return [
     'permission_denied_superuser_demo' => 'Odmowa uprawnień. Nie można zaktualizować informacji użytkownika dla superadminów na demo.',
     'pwd_reset_not_sent' => 'Użytkownik nie jest aktywny, jest zsynchronizowany z LDAP lub nie posiada adresu e-mail',
     'error_sending_email' => 'Błąd podczas wysyłania wiadomości e-mail',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Nie masz uprawnień, aby to zrobić. Może <a href=":link">wróć do panelu</a>lub skontaktuj się z administratorem.',
     'bulk' => [
             'delete' =>
                 [
@@ -561,20 +565,26 @@ return [
         'consumables'  => ':count Materiał|:count Materiałów|:count Materiałów',
         'components'  => ':count Składnik|:count Składniki',
     ],
+
     'more_info' => 'Więcej informacji',
-    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'quickscan_bulk_help' => 'Zaznaczenie tego pola spowoduje edycję rekordu aktywów, aby odzwierciedlić tę nową lokalizację. Pozostawienie go niezaznaczone spowoduje po prostu odnotowanie lokalizacji w dzienniku audytu.Zauważ, że jeśli ten zasób jest zablokowany, nie zmieni lokalizacji osoby, składnika aktywów lub miejsca, w którym jest ona kontrolowana.',
     'whoops' => 'Uuuups!',
     'something_went_wrong' => 'Coś poszło nie tak z twoim żądaniem.',
     'close' => 'Zamknij',
     'expires' => 'Wygasa',
-    'map_fields'=> 'Map :item_type Fields',
-    'remaining_var' => ':count Remaining',
-    'label' => 'Label',
+    'map_fields'=> 'Mapa pola :item_type',
+    'remaining_var' => 'Pozostało :count',
+    'label' => 'Etykieta',
     'import_asset_tag_exists' => 'Zasób z tagiem aktywów :asset_tag już istnieje i nie zażądano aktualizacji. Nie dokonano żadnych zmian.',
     'countries_manually_entered_help' => 'Wartości z gwiazdką (*) zostały wprowadzone ręcznie i nie odpowiadają istniejącym wartościom rozwijanym ISO 3166',
-    'accessories_assigned' => 'Assigned Accessories',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'accessories_assigned' => 'Przypisane akcesoria',
+    'user_managed_passwords' => 'Zarządzanie hasłami',
+    'user_managed_passwords_disallow' => 'Nie zezwalaj użytkownikom na zarządzanie własnymi hasłami',
+    'user_managed_passwords_allow' => 'Zezwalaj użytkownikom na zarządzanie własnymi hasłami',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Dodaj notatkę',
+    ],
 
 ];
diff --git a/resources/lang/pl-PL/localizations.php b/resources/lang/pl-PL/localizations.php
index cbda13a9a..8252058ec 100644
--- a/resources/lang/pl-PL/localizations.php
+++ b/resources/lang/pl-PL/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a Language',
+    'select_language' => 'Wybierz język',
     'languages' => [
         'en-US'=> 'angielski (USA)',
         'en-GB'=> 'angielski (UK)',
@@ -41,7 +41,7 @@ return [
         'mi-NZ'=> 'maoryski',
         'mn-MN'=> 'mongolski',
         //'no-NO'=> 'Norwegian',
-        'nb-NO'=> 'Norwegian Bokmål',
+        'nb-NO'=> 'Norweski',
         //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'perski',
         'pl-PL'=> 'polski',
@@ -68,7 +68,7 @@ return [
         'zu-ZA'=> 'zuluski',
     ],
 
-    'select_country' => 'Select a Country',
+    'select_country' => 'Wybierz kraj',
     
     'countries' => [
         'AC'=>'Wyspa Wniebowstąpienia',
@@ -135,7 +135,7 @@ return [
         'EC'=>'Ekwador',
         'EE'=>'Estonia',
         'EG'=>'Egipt',
-        'GB-ENG'=>'England',
+        'GB-ENG'=>'Anglia',
         'ER'=>'Erytrea',
         'ES'=>'Hiszpania',
         'ET'=>'Etiopia',
@@ -234,7 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nikaragua',
         'NL'=>'Holandia',
-        'GB-NIR' => 'Northern Ireland',
+        'GB-NIR' => 'Irlandia Północna',
         'NO'=>'Norwegia',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -314,7 +314,7 @@ return [
         'VI'=>'Wyspy Dziewicze Stanów Zjednoczonych',
         'VN'=>'Wietnam',
         'VU'=>'Vanuatu',
-        'GB-WLS' =>'Wales',
+        'GB-WLS' =>'Walia',
         'WF'=>'Wallis i Futuna',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
diff --git a/resources/lang/pl-PL/mail.php b/resources/lang/pl-PL/mail.php
index f5a1c3a6a..623b53d8e 100644
--- a/resources/lang/pl-PL/mail.php
+++ b/resources/lang/pl-PL/mail.php
@@ -23,7 +23,7 @@ return [
     'Item_Requested' => 'Pozycja Zamówiona',
     'License_Checkin_Notification' => 'Akcesorium zwrócono',
     'License_Checkout_Notification' => 'Licencja wyczyszczona',
-    'license_for'   => 'License for',
+    'license_for'   => 'Licencja dla',
     'Low_Inventory_Report' => 'Raport niskiego stanu zasobów',
     'a_user_canceled' => 'Użytkownik anulował zapotrzebowanie na sprzęt na stronie www',
     'a_user_requested' => 'Użytkownik zamówił pozycję na stronie internetowej',
@@ -57,7 +57,7 @@ return [
     'i_have_read' => 'Przeczytałem i zgadzam się z warunkami użytkowania oraz potwierdzam otrzymanie niniejszej pozycji.',
     'inventory_report' => 'Raport z magazynu',
     'item' => 'Przedmiot',
-    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
+    'item_checked_reminder' => 'To jest przypomnienie, że aktualnie masz :count elementów przydzielonych do Ciebie, których nie zaakceptowałeś lub nie odrzuciłeś. Kliknij poniższy link, aby potwierdzić swoją decyzję.',
     'license_expiring_alert' => 'Istnieje: liczba licencja wygasająca w ciągu następnych: dni progowe. | Istnieje: liczba licencji wygasających w ciągu następnych: dni progowe.',
     'link_to_update_password' => 'Proszę kliknąć na poniższy link, aby zaktualizować swoje hasło na :web:',
     'login' => 'Login',
@@ -88,7 +88,7 @@ return [
     'upcoming-audits' => 'Istnieje :count aktywa, które nadchodzą do rewizji w ciągu :threshold days.|Istnieje :count aktywów, które nadchodzą do rewizji w ciągu :threshold dni.',
     'user' => 'Użytkownik',
     'username' => 'Nazwa użytkownika',
-    'unaccepted_asset_reminder' => 'You have Unaccepted Assets.',
+    'unaccepted_asset_reminder' => 'Masz nieakceptowane aktywa.',
     'welcome' => 'Witaj :name',
     'welcome_to' => 'Witamy na :web!',
     'your_assets' => 'Zobacz swój sprzęt',
diff --git a/resources/lang/pl-PL/validation.php b/resources/lang/pl-PL/validation.php
index a4aea0c47..daff4d8d7 100644
--- a/resources/lang/pl-PL/validation.php
+++ b/resources/lang/pl-PL/validation.php
@@ -13,148 +13,148 @@ return [
     |
     */
 
-    'accepted' => 'The :attribute field must be accepted.',
-    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
-    'active_url' => 'The :attribute field must be a valid URL.',
-    'after' => 'The :attribute field must be a date after :date.',
-    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
-    'alpha' => 'The :attribute field must only contain letters.',
-    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
-    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
-    'array' => 'The :attribute field must be an array.',
-    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
-    'before' => 'The :attribute field must be a date before :date.',
-    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'accepted' => ':attribute musi zostać zaakceptowany.',
+    'accepted_if' => ':attribute musi być zaakceptowany, gdy :other ma wartość :value.',
+    'active_url' => 'Pole :attribute musi być prawidłowym adresem URL.',
+    'after' => 'Pole :attribute musi być datą po :date.',
+    'after_or_equal' => 'Pole :attribute musi być datą po lub równą :date.',
+    'alpha' => ':attribute może zawierać tylko litery.',
+    'alpha_dash' => ':attribute może zawierać tylko litery, cyfry i myślniki.',
+    'alpha_num' => ':attribute może zawierać tylko litery i cyfry.',
+    'array' => 'Pole :attribute nie może być tablicą.',
+    'ascii' => 'Pole :attribute musi zawierać tylko jednobajtowe znaki alfanumeryczne i symbole.',
+    'before' => 'Pole :attribute musi być datą przed :date.',
+    'before_or_equal' => 'Pole :attribute musi być datą przed lub równą :date.',
     'between' => [
-        'array' => 'The :attribute field must have between :min and :max items.',
-        'file' => 'The :attribute field must be between :min and :max kilobytes.',
-        'numeric' => 'The :attribute field must be between :min and :max.',
-        'string' => 'The :attribute field must be between :min and :max characters.',
+        'array' => ':attribute musi mieć pomiędzy :min a :max elementów.',
+        'file' => 'Pole :attribute musi być pomiędzy :min a :max kilobajtów.',
+        'numeric' => 'Pole :attribute musi być pomiędzy :min a :max.',
+        'string' => 'Pole :attribute musi zawierać się między :min a :max znaków.',
     ],
     'boolean' => 'Pole atrybutu: musi być prawdziwe lub fałszywe.',
-    'can' => 'The :attribute field contains an unauthorized value.',
-    'confirmed' => 'The :attribute field confirmation does not match.',
-    'contains' => 'The :attribute field is missing a required value.',
-    'current_password' => 'The password is incorrect.',
-    'date' => 'The :attribute field must be a valid date.',
-    'date_equals' => 'The :attribute field must be a date equal to :date.',
-    'date_format' => 'The :attribute field must match the format :format.',
-    'decimal' => 'The :attribute field must have :decimal decimal places.',
-    'declined' => 'The :attribute field must be declined.',
-    'declined_if' => 'The :attribute field must be declined when :other is :value.',
-    'different' => 'The :attribute field and :other must be different.',
-    'digits' => 'The :attribute field must be :digits digits.',
-    'digits_between' => 'The :attribute field must be between :min and :max digits.',
-    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'can' => 'Pole :attribute zawiera nieautoryzowaną wartość.',
+    'confirmed' => 'Potwierdzenie pola :attribute nie pasuje.',
+    'contains' => 'Pole :attribute nie posiada wymaganej wartości.',
+    'current_password' => 'Hasło jest nieprawidłowe.',
+    'date' => 'Pole :attribute musi być prawidłową datą.',
+    'date_equals' => 'Pole :attribute musi być datą równą :date.',
+    'date_format' => 'Pole :attribute musi pasować do formatu :format.',
+    'decimal' => 'Pole :attribute musi mieć :dziesiętne miejsca po przecinku.',
+    'declined' => 'Pole :attribute musi zostać odrzucone.',
+    'declined_if' => 'Pole :attribute musi zostać odrzucone, gdy :other jest :value.',
+    'different' => 'Pole :attribute i :other muszą być różne.',
+    'digits' => 'Pole :attribute musi zawierać :digits cyfry.',
+    'digits_between' => 'Pole :attribute musi zawierać się między :min a :max cyfr.',
+    'dimensions' => 'Pole :attribute ma nieprawidłowe wymiary obrazu.',
     'distinct' => 'Pole :attribute ma zduplikowane wartości.',
-    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
-    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
-    'email' => 'The :attribute field must be a valid email address.',
-    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'doesnt_end_with' => 'Pole :attribute nie może kończyć się jednym z następujących: :values.',
+    'doesnt_start_with' => 'Pole :attribute nie może zaczynać się od jednego z następujących: :values.',
+    'email' => 'Pole :attribute musi być poprawnym adresem e-mail.',
+    'ends_with' => 'Pole :attribute musi kończyć się jednym z następujących: :values.',
     'enum' => 'Wybrany :attribute jest nieprawidłowy.',
     'exists' => 'Wybrane :attribute jest niewłaściwe.',
-    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
-    'file' => 'The :attribute field must be a file.',
+    'extensions' => 'Pole :attribute musi mieć jedno z następujących rozszerzeń: :values.',
+    'file' => 'Pole :attribute musi być plikiem.',
     'filled' => 'Pole :attribute musi posiadać wartość.',
     'gt' => [
-        'array' => 'The :attribute field must have more than :value items.',
-        'file' => 'The :attribute field must be greater than :value kilobytes.',
-        'numeric' => 'The :attribute field must be greater than :value.',
-        'string' => 'The :attribute field must be greater than :value characters.',
+        'array' => ':attribute musi mieć więcej niż :value elementów.',
+        'file' => 'Pole :attribute musi być większe niż :value kilobajtów.',
+        'numeric' => 'Pole :attribute musi być większe niż :value.',
+        'string' => 'Pole :attribute musi być większe niż :value znaków.',
     ],
     'gte' => [
-        'array' => 'The :attribute field must have :value items or more.',
-        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
-        'numeric' => 'The :attribute field must be greater than or equal to :value.',
-        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+        'array' => ':attribute musi mieć :value elementów lub więcej.',
+        'file' => 'Pole :attribute musi być większe lub równe :value kilobajtów.',
+        'numeric' => 'Pole :attribute musi być większe lub równe :value.',
+        'string' => 'Pole :attribute musi być większe lub równe :value znaków.',
     ],
-    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
-    'image' => 'The :attribute field must be an image.',
+    'hex_color' => 'Pole :attribute musi być prawidłowym kolorem szesnastkowym.',
+    'image' => 'Pole :attribute musi być obrazem.',
     'import_field_empty'    => 'Wartość dla :fieldname nie może być pusta.',
     'in' => 'Wybrane :attribute jest niewłaściwe.',
-    'in_array' => 'The :attribute field must exist in :other.',
-    'integer' => 'The :attribute field must be an integer.',
-    'ip' => 'The :attribute field must be a valid IP address.',
+    'in_array' => 'Pole :attribute musi istnieć w :other.',
+    'integer' => 'Pole :attribute musi być liczbą całkowitą.',
+    'ip' => 'Pole :attribute musi być prawidłowym adresem IP.',
     'ipv4' => 'Atrybut: musi być prawidłowym adresem IPv4.',
-    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'ipv6' => 'Pole :attribute musi być prawidłowym adresem IPv6.',
     'json' => 'Atrybut: musi być prawidłowym ciągiem JSON.',
-    'list' => 'The :attribute field must be a list.',
-    'lowercase' => 'The :attribute field must be lowercase.',
+    'list' => 'Pole :attribute musi być listą.',
+    'lowercase' => 'Pole :attribute musi być małą literą.',
     'lt' => [
-        'array' => 'The :attribute field must have less than :value items.',
-        'file' => 'The :attribute field must be less than :value kilobytes.',
-        'numeric' => 'The :attribute field must be less than :value.',
-        'string' => 'The :attribute field must be less than :value characters.',
+        'array' => ':attribute musi mieć mniej niż :value elementów.',
+        'file' => 'Pole :attribute musi być mniejsze niż :value kilobajtów.',
+        'numeric' => 'Pole :attribute musi być mniejsze niż :value.',
+        'string' => 'Pole :attribute musi być mniejsze niż :value znaków.',
     ],
     'lte' => [
-        'array' => 'The :attribute field must not have more than :value items.',
-        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
-        'numeric' => 'The :attribute field must be less than or equal to :value.',
-        'string' => 'The :attribute field must be less than or equal to :value characters.',
+        'array' => ':attribute nie może mieć więcej niż :value elementów.',
+        'file' => 'Pole :attribute musi być mniejsze lub równe :value kilobajtów.',
+        'numeric' => 'Pole :attribute musi być mniejsze lub równe :value.',
+        'string' => 'Pole :attribute musi być mniejsze lub równe :value znaków.',
     ],
-    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'mac_address' => 'Pole :attribute musi być prawidłowym adresem MAC.',
     'max' => [
-        'array' => 'The :attribute field must not have more than :max items.',
-        'file' => 'The :attribute field must not be greater than :max kilobytes.',
-        'numeric' => 'The :attribute field must not be greater than :max.',
-        'string' => 'The :attribute field must not be greater than :max characters.',
+        'array' => ':attribute nie może mieć więcej niż :max elementów.',
+        'file' => 'Pole :attribute nie może być większe niż :max kilobajtów.',
+        'numeric' => 'Pole :attribute nie może być większe niż :max.',
+        'string' => 'Pole :attribute nie może być większe niż :max znaków.',
     ],
-    'max_digits' => 'The :attribute field must not have more than :max digits.',
-    'mimes' => 'The :attribute field must be a file of type: :values.',
-    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'max_digits' => 'Pole :attribute nie może zawierać więcej niż :max cyfr.',
+    'mimes' => 'Pole :attribute musi być plikiem typu: :values.',
+    'mimetypes' => 'Pole :attribute musi być plikiem typu: :values.',
     'min' => [
-        'array' => 'The :attribute field must have at least :min items.',
-        'file' => 'The :attribute field must be at least :min kilobytes.',
-        'numeric' => 'The :attribute field must be at least :min.',
-        'string' => 'The :attribute field must be at least :min characters.',
+        'array' => 'Pole :attribute musi mieć co najmniej :min elementów.',
+        'file' => 'Pole :attribute musi mieć co najmniej :min kilobajtów.',
+        'numeric' => 'Pole :attribute musi być co najmniej :min.',
+        'string' => 'Pole :attribute musi mieć co najmniej :min znaków.',
     ],
-    'min_digits' => 'The :attribute field must have at least :min digits.',
-    'missing' => 'The :attribute field must be missing.',
-    'missing_if' => 'The :attribute field must be missing when :other is :value.',
-    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
-    'missing_with' => 'The :attribute field must be missing when :values is present.',
-    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
-    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'min_digits' => 'Pole :attribute musi zawierać co najmniej :min cyfr.',
+    'missing' => 'Brakuje pola :attribute',
+    'missing_if' => 'Pole :attribute musi być puste, gdy :other jest :value.',
+    'missing_unless' => 'Pole :attribute musi być puste, chyba że :other jest :value.',
+    'missing_with' => 'Pole :attribute musi być puste, gdy :values jest obecne.',
+    'missing_with_all' => 'Pole :attribute musi być puste, gdy :values są obecne.',
+    'multiple_of' => 'Pole :attribute musi być wielokrotnością :value.',
     'not_in' => 'Wybrany :attribute jest nieprawidłowy.',
-    'not_regex' => 'The :attribute field format is invalid.',
-    'numeric' => 'The :attribute field must be a number.',
+    'not_regex' => 'Format pola :attribute jest nieprawidłowy.',
+    'numeric' => 'Pole :attribute musi być liczbą.',
     'password' => [
-        'letters' => 'The :attribute field must contain at least one letter.',
-        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
-        'numbers' => 'The :attribute field must contain at least one number.',
-        'symbols' => 'The :attribute field must contain at least one symbol.',
-        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+        'letters' => 'Pole :attribute musi zawierać co najmniej jedną literę.',
+        'mixed' => 'Pole :attribute musi zawierać co najmniej jedną wielką literę i jedną małą literę.',
+        'numbers' => 'Pole :attribute musi zawierać co najmniej jedną liczbę.',
+        'symbols' => 'Pole :attribute musi zawierać co najmniej jeden symbol.',
+        'uncompromised' => 'Podany :attribute pojawił się w wycieku danych. Proszę wybrać inny :attribute.',
     ],
-    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+    'percent'       => 'Minimalna amortyzacja musi wynosić od 0 do 100 w przypadku gdy wartość procentowa amortyzacji jest wyrażona w procentach.',
 
     'present' => ':attribute nie może być puste.',
-    'present_if' => 'The :attribute field must be present when :other is :value.',
-    'present_unless' => 'The :attribute field must be present unless :other is :value.',
-    'present_with' => 'The :attribute field must be present when :values is present.',
-    'present_with_all' => 'The :attribute field must be present when :values are present.',
-    'prohibited' => 'The :attribute field is prohibited.',
-    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
-    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
-    'prohibits' => 'The :attribute field prohibits :other from being present.',
-    'regex' => 'The :attribute field format is invalid.',
+    'present_if' => 'Pole :attribute musi być obecne, gdy :other jest :value.',
+    'present_unless' => 'Pole :attribute musi być obecne, chyba że :other jest :value.',
+    'present_with' => ':attribute musi być obecny, gdy :values jest obecny.',
+    'present_with_all' => ':attribute musi być obecny, gdy :values są obecne.',
+    'prohibited' => 'Pole :attribute jest zabronione.',
+    'prohibited_if' => 'Pole :attribute jest zabronione, gdy :other to :value.',
+    'prohibited_unless' => 'Pole :attribute jest zabronione, chyba że :other znajduje się w :values.',
+    'prohibits' => 'Pole :attribute zabrania :other obecności .',
+    'regex' => 'Format pola :attribute jest nieprawidłowy.',
     'required' => ':attribute nie może być puste.',
-    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_array_keys' => 'Pole :attribute musi zawierać wpisy dla: :values.',
     'required_if' => 'Pole :attribute jest wymagane gdy :other jest :value.',
-    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
-    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_if_accepted' => 'Pole :attribute jest wymagane, gdy :other jest zaakceptowane.',
+    'required_if_declined' => 'Pole :attribute jest wymagane, gdy :other jest odrzucone.',
     'required_unless' => 'Pole atrybutów: wymagane jest, chyba że inne są w: wartościach.',
     'required_with' => 'Pole :attribute jest wymagane gdy :values jest podana.',
-    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_with_all' => 'Pole :attribute jest wymagane, gdy :values są obecne.',
     'required_without' => 'Pole :attribute jest wymagane gdy :values nie jest podana.',
     'required_without_all' => 'Pole atrybutu: attribute jest wymagane, gdy żadna z: wartości nie jest obecna.',
-    'same' => 'The :attribute field must match :other.',
+    'same' => 'Pole :attribute musi pasować do :other.',
     'size' => [
-        'array' => 'The :attribute field must contain :size items.',
-        'file' => 'The :attribute field must be :size kilobytes.',
-        'numeric' => 'The :attribute field must be :size.',
-        'string' => 'The :attribute field must be :size characters.',
+        'array' => ':attribute musi zawierać :size elementów.',
+        'file' => 'Pole :attribute musi mieć :size kilobajtów.',
+        'numeric' => 'Pole :attribute musi być :size.',
+        'string' => 'Pole :attribute musi mieć :size znaków.',
     ],
-    'starts_with' => 'The :attribute field must start with one of the following: :values.',
+    'starts_with' => 'Pole :attribute musi zaczynać się od jednego z następujących: :values.',
     'string'               => 'Atrybut: atrybut musi być ciągiem.',
     'two_column_unique_undeleted' => ':attribute musi być unikalny pomiędzy :table1 i :table2. ',
     'unique_undeleted'     => 'Wartość :attribute musi być unikalna.',
@@ -165,13 +165,13 @@ return [
     'numbers'              => 'Hasło musi zawierać co najmniej jedną cyfrę.',
     'case_diff'            => 'Hasło musi zawierać małe i wielkie litery.',
     'symbols'              => 'Hasło musi zawierać znaki specjalne.',
-    'timezone' => 'The :attribute field must be a valid timezone.',
+    'timezone' => 'Pole :attribute musi być poprawną strefą czasową.',
     'unique' => ':attribute został już wzięty.',
     'uploaded' => 'Nie udało się przesłać atrybutu:.',
-    'uppercase' => 'The :attribute field must be uppercase.',
-    'url' => 'The :attribute field must be a valid URL.',
-    'ulid' => 'The :attribute field must be a valid ULID.',
-    'uuid' => 'The :attribute field must be a valid UUID.',
+    'uppercase' => 'Pole :attribute musi być wielkimi literami.',
+    'url' => 'Pole :attribute musi być prawidłowym adresem URL.',
+    'ulid' => 'Pole :attribute musi być poprawnym ULID.',
+    'uuid' => 'Pole :attribute musi być prawidłowym UUID.',
 
 
     /*
@@ -191,8 +191,8 @@ return [
         'hashed_pass'      => 'Twoje bieżące hasło jest niepoprawne',
         'dumbpwd'          => 'To hasło jest zbyt powszechne.',
         'statuslabel_type' => 'Musisz wybrać odpowiedni typ etykiety statusu',
-        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
-        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
+        'custom_field_not_found'          => 'To pole nie istnieje, sprawdź dokładnie nazwy pól niestandardowych.',
+        'custom_field_not_found_on_model' => 'To pole wydaje się istnieć, ale nie jest dostępne w tym zestawie pól Modelu Zasobów.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
         // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
@@ -209,10 +209,10 @@ return [
         'invalid_value_in_field' => 'Nieprawidłowa wartość dołączona do tego pola',
 
         'ldap_username_field' => [
-            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+            'not_in' =>         '<code>sAMAccountName</code> (przypadek mieszany) prawdopodobnie nie zadziała. Zamiast tego powinieneś użyć <code>samaccountname</code> (małe przypadki).'
         ],
-        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
-        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> prawdopodobnie nie jest prawidłowym filtrem uwierzytelniającym. Prawdopodobnie chcesz <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Ta wartość prawdopodobnie nie powinna być zawijana w nawiasy.'],
 
         ],
     /*
@@ -237,8 +237,8 @@ return [
 
     'generic' => [
         'invalid_value_in_field' => 'Nieprawidłowa wartość dołączona do tego pola',
-        'required' => 'This field is required',
-        'email' => 'Please enter a valid email address',
+        'required' => 'To pole jest wymagane',
+        'email' => 'Podaj poprawny adres e-mail',
     ],
 
 
diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php
index 4c2113198..9c8d06ffe 100644
--- a/resources/lang/pt-BR/admin/settings/general.php
+++ b/resources/lang/pt-BR/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Senha do usuário LDAP',
     'ldap_basedn'               => 'DN de Atribuição Básico',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronização de senha do LDAP',
-    'ldap_pw_sync_help'         => 'Desmarque esta caixa se não deseja guardar as passwords LDAP com passwords locais. Ao desativar esta opção quer dizer que os utilizadores poderão não conseguir fazer login se o seu servidor LDAP não estiver disponível por alguma razão.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Nome do utilizador',
     'ldap_lname_field'          => 'Último Nome',
     'ldap_fname_field'          => 'Primeiro nome',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Limpar Registros Excluídos',
     'ldap_extension_warning' => 'Não parece que a extensão LDAP esteja instalada ou ativada neste servidor. Você ainda pode salvar suas configurações, mas precisará ativar a extensão LDAP para PHP antes de a sincronização LDAP ou login funcionar.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de funcionário',
     'create_admin_user' => 'Criar Usuário ::',
     'create_admin_success' => 'Sucesso! Seu administrador foi adicionado!',
diff --git a/resources/lang/pt-BR/admin/settings/message.php b/resources/lang/pt-BR/admin/settings/message.php
index e7a72172c..a2caa580e 100644
--- a/resources/lang/pt-BR/admin/settings/message.php
+++ b/resources/lang/pt-BR/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testando Autenticação LDAP...',
         'authentication_success' => 'Usuário autenticado no LDAP com sucesso!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Enviando mensagem :app de teste...',
         'success' => 'Sua integração com :webhook_name funciona!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERRO: 301/302 :endpoint retorna um redirecionamento. Por razões de segurança, não seguimos redirecionamentos. Por favor, use o ponto de extremidade atual.',
         'error_misc' => 'Algo deu errado. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php
index 487f5ba4d..e7b77a343 100644
--- a/resources/lang/pt-BR/general.php
+++ b/resources/lang/pt-BR/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Personalizar Relatório',
     'custom_report'         => 'Relatório de Ativos Personalizado',
     'dashboard'				=> 'Painel de Controle',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dias',
     'days_to_next_audit'    => 'Dias Até a Próxima Auditoria',
     'date'					=> 'Data',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Primeiro Nome com Sobrenome (jose.silva@exemplo.com.br)',
     'lastnamefirstinitial_format' =>  'Sobrenome Inicial do Nome (silvaj@exemplo.com.br)',
     'firstintial_dot_lastname_format' => 'Inicial do Nome com Sobrenome (j.silva@exemplo.com.br)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Primeiro nome com sobrenome (João Silva)',
     'lastname_firstname_display'	=> 'Sobrenome com Primeiro Nome (Silva João)',
     'name_display_format'	=> 'Formato de exibição de nome',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Não',
     'notes'  				=> 'Notas',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -562,6 +566,7 @@ Resultados da Sincronização',
         'consumables'  => ':count Consumível|:count Consumíveis',
         'components'  => ':count Componente|:count Componentes',
     ],
+
     'more_info' => 'Mais Informações',
     'quickscan_bulk_help' => 'Marcar esta caixa irá editar o registro do ativo para refletir este novo local. Deixar desmarcado irá apenas registrar a localização no log de auditoria. Observe que, se este ativo estiver emprestado, não alterará o local da pessoa, do ativo ou do local para onde ele foi emprestado.',
     'whoops' => 'Opa!',
@@ -578,4 +583,9 @@ Resultados da Sincronização',
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php
index 743afc1ac..6df04b302 100644
--- a/resources/lang/pt-PT/admin/settings/general.php
+++ b/resources/lang/pt-PT/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Password bind LDAP',
     'ldap_basedn'               => 'Base bind DN',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronização de password LDAP',
-    'ldap_pw_sync_help'         => 'Desmarque esta caixa se não deseja guardar as passwords LDAP com passwords locais. Ao desativar esta opção quer dizer que os utilizadores poderão não conseguir fazer login se o seu servidor LDAP não estiver disponível por alguma rasão.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Campo nome de utilizador',
     'ldap_lname_field'          => 'Campo Último nome',
     'ldap_fname_field'          => 'Campo Primeiro nome',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Remover registos apagados',
     'ldap_extension_warning' => 'Não parece que a extensão LDAP esteja instalada ou ativada neste servidor. Ainda pode salvar as suas configurações, mas precisará de ativar a extensão LDAP para PHP antes de a sincronização LDAP ou login funcionar.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de Funcionário',
     'create_admin_user' => 'Criar um utilizador ::',
     'create_admin_success' => 'Sucesso! O seu administrador foi adicionado!',
diff --git a/resources/lang/pt-PT/admin/settings/message.php b/resources/lang/pt-PT/admin/settings/message.php
index 7449f17b2..00dca99c7 100644
--- a/resources/lang/pt-PT/admin/settings/message.php
+++ b/resources/lang/pt-PT/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testando Autenticação LDAP...',
         'authentication_success' => 'Utilizador autenticado no LDAP com sucesso!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'A enviar mensagem :app de teste...',
         'success' => 'Sua integração com :webhook_name funciona!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERRO: 301/302 :endpoint retorna um redirecionamento. Por razões de segurança, não seguimos redirecionamentos. Por favor, use o ponto de extremidade atual.',
         'error_misc' => 'Algo deu erro. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php
index 3072e5f6a..d7a809143 100644
--- a/resources/lang/pt-PT/general.php
+++ b/resources/lang/pt-PT/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Personalizar relatório',
     'custom_report'         => 'Relatório de Artigo personalizado',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dias',
     'days_to_next_audit'    => 'Dias para próxima auditoria',
     'date'					=> 'Data',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Nome próprio e Sobrenome (jane_smith@exemplo.com)',
     'lastnamefirstinitial_format' =>  'Sobrenome Primeira Inicial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Inicial Nome Próprio Sobrenome (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Primeiro nome com sobrenome (Jane Smith)',
     'lastname_firstname_display'	=> 'Primeiro Nome do Último Nome (Smith Jane)',
     'name_display_format'	=> 'Formato de exibição de nome',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Não',
     'notes'  				=> 'Notas',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumível|:count Consumíveis',
         'components'  => ':count Componente|:count Componentes',
     ],
+
     'more_info' => 'Mais Informações',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/ro-RO/admin/settings/general.php b/resources/lang/ro-RO/admin/settings/general.php
index 794e95afd..bd7020a5b 100644
--- a/resources/lang/ro-RO/admin/settings/general.php
+++ b/resources/lang/ro-RO/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Parola de legare LDAP',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'Filtrul LDAP',
-    'ldap_pw_sync'              => 'Sincronizare parolă LDAP',
-    'ldap_pw_sync_help'         => 'Debifați această casetă dacă nu doriți să păstrați parolele LDAP sincronizate cu parolele locale. Dacă dezactivați acest lucru, este posibil ca utilizatorii dvs. să nu poată să se conecteze dacă serverul dvs. LDAP nu este accesibil din anumite motive.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Nume câmp',
     'ldap_lname_field'          => 'Numele de familie',
     'ldap_fname_field'          => 'Numele LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Eliminați înregistrările șterse',
     'ldap_extension_warning' => 'Nu arată ca și cum extensia LDAP este instalată sau activată pe acest server. Încă puteți salva setările, dar va trebui să activați extensia LDAP pentru PHP înainte ca logarea sau sincronizarea LDAP să funcționeze.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Număr angajat',
     'create_admin_user' => 'Creează un utilizator ::',
     'create_admin_success' => 'Succes! Utilizatorul dvs. admin a fost adăugat!',
diff --git a/resources/lang/ro-RO/admin/settings/message.php b/resources/lang/ro-RO/admin/settings/message.php
index 1c5ce7edf..b5c4a5daa 100644
--- a/resources/lang/ro-RO/admin/settings/message.php
+++ b/resources/lang/ro-RO/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testare autentificare LDAP...',
         'authentication_success' => 'Utilizatorul s-a autentificat cu succes împotriva LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Se trimite mesajul de testare :app...',
         'success' => 'Integrarea ta :webhook_name funcționează!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'EROARE: 301/302 :endpoint returnează o redirecționare. Din motive de securitate, nu urmărim redirecționările. Vă rugăm să folosiți obiectivul final.',
         'error_misc' => 'Ceva nu a mers bine. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ro-RO/general.php b/resources/lang/ro-RO/general.php
index 9daadbcde..3ea01425e 100644
--- a/resources/lang/ro-RO/general.php
+++ b/resources/lang/ro-RO/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Personalizați raportul',
     'custom_report'         => 'Raport active custom',
     'dashboard'				=> 'Bord',
+    'data_source'           => 'Data Source',
     'days'      			=> 'zi',
     'days_to_next_audit'    => 'Zile până la următorul audit',
     'date'					=> 'Data',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Prenume Nume Nume (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Numele de familie Prima Inițială (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Primul nume inițial (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Prenume nume nume (Jane Smith)',
     'lastname_firstname_display'	=> 'Numele de familie (Smith Jane)',
     'name_display_format'	=> 'Nume Format Afișat',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Nr',
     'notes'  				=> 'Note',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumabile|:count Consumabile',
         'components'  => ':count Component|:count Componente',
     ],
+
     'more_info' => 'Mai multe',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/ru-RU/admin/settings/general.php b/resources/lang/ru-RU/admin/settings/general.php
index 786c8413c..65a62fceb 100644
--- a/resources/lang/ru-RU/admin/settings/general.php
+++ b/resources/lang/ru-RU/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Пароль LDAP Bind',
     'ldap_basedn'               => 'Основной Bind DN',
     'ldap_filter'               => 'Фильтр LDAP',
-    'ldap_pw_sync'              => 'LDAP синхронизация паролей',
-    'ldap_pw_sync_help'         => 'Снимите галку, если вы не хотите синхронизировать LDAP пароли с локальными. Отключение этого означает, что ваши пользователи не смогут зайти в систему, если ваш LDAP сервер станет недоступным.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Поле имени пользователя',
     'ldap_lname_field'          => 'Фамилия',
     'ldap_fname_field'          => 'LDAP Имя',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Очистка удалённых записей',
     'ldap_extension_warning' => 'Похоже на вашем сервере не установлен или не включен модуль LDAP синхронизации. Вы можете сохранить ваши параметры, но вам потребуется установить\\включить модуль для PHP прежде выполнить синхронизацию с доменом.',
     'ldap_ad' => 'LDAP/Active Directory',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Номер сотрудника',
     'create_admin_user' => 'Создать пользователя ::',
     'create_admin_success' => 'Отлично! Администратор успешно добавлен!',
diff --git a/resources/lang/ru-RU/admin/settings/message.php b/resources/lang/ru-RU/admin/settings/message.php
index 84e3fc8b8..0ea0383d2 100644
--- a/resources/lang/ru-RU/admin/settings/message.php
+++ b/resources/lang/ru-RU/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Тестирование LDAP аутентификации...',
         'authentication_success' => 'Пользователь успешно аутентифицирован с LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Отправка тестового сообщения в :app...',
         'success' => 'Ваша интеграция :webhook_name работает!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ОШИБКА: 301/302 :endpoint возвращает редирект. По соображениям безопасности мы не переходим по редиректам. Пожалуйста, используйте фактическую конечную точку.',
         'error_misc' => 'Что-то пошло не так. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ru-RU/general.php b/resources/lang/ru-RU/general.php
index 6b17455b8..e2703e135 100644
--- a/resources/lang/ru-RU/general.php
+++ b/resources/lang/ru-RU/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Настройка отчета',
     'custom_report'         => 'Пользовательский отчет по активам',
     'dashboard'				=> 'Панель мониторинга',
+    'data_source'           => 'Data Source',
     'days'      			=> 'дней',
     'days_to_next_audit'    => 'Дней на следующий аудит',
     'date'					=> 'Дата',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Имя и фамилия (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Фамилия и первая буква имени (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Первая буква имени Фамилия (i.ivanov@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Имя Фамилия (Иван Иванов)',
     'lastname_firstname_display'	=> 'Фамилия Имя (Иванов Иван)',
     'name_display_format'	=> 'Формат имени',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Нет',
     'notes'  				=> 'Примечания',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count расходный материал|:count расходников',
         'components'  => ':count компонент|:count компонентов',
     ],
+
     'more_info' => 'Подробнее',
     'quickscan_bulk_help' => 'Установка этого флажка приведет к изменению записи об активе с учетом нового местоположения. Если флажок не установлен, то местоположение будет просто отмечено в журнале аудита. Обратите внимание, что если этот актив выписан, то он не изменит местоположение человека, актива или места, на которое он выписан.',
     'whoops' => 'Упс!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/si-LK/admin/settings/general.php b/resources/lang/si-LK/admin/settings/general.php
index 97567df8d..ad21bbb64 100644
--- a/resources/lang/si-LK/admin/settings/general.php
+++ b/resources/lang/si-LK/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/si-LK/admin/settings/message.php b/resources/lang/si-LK/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/si-LK/admin/settings/message.php
+++ b/resources/lang/si-LK/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/si-LK/general.php b/resources/lang/si-LK/general.php
index f81d5b914..b6066c554 100644
--- a/resources/lang/si-LK/general.php
+++ b/resources/lang/si-LK/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'දින',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'සටහන්',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/sk-SK/admin/categories/general.php b/resources/lang/sk-SK/admin/categories/general.php
index a89d8c708..c7d191e1c 100644
--- a/resources/lang/sk-SK/admin/categories/general.php
+++ b/resources/lang/sk-SK/admin/categories/general.php
@@ -3,17 +3,17 @@
 return array(
     'asset_categories' 					=> 'Kategórie majetku',
     'category_name'  					=> 'Názov kategórie',
-    'checkin_email'                     => 'Poslať email používateľovi pri prijatí / odovzdaní.',
-    'checkin_email_notification'        => 'Používateľovi bude odoslaný mail pri prijatí / odovzdaní.',
+    'checkin_email'                     => 'Poslať email používateľovi pri prevzatí / odovzdaní.',
+    'checkin_email_notification'        => 'Používateľovi bude odoslaný mail pri prevzatí / odovzdaní.',
     'clone'                             => 'Duplikovať kategóriu',
     'create'  							=> 'Vytvoriť kategóriu',
     'edit'                              => 'Upraviť kategóriu',
     'email_will_be_sent_due_to_global_eula' => 'Používateľovi bude zaslaný mail pretože sa používa globálna EULA.',
     'email_will_be_sent_due_to_category_eula' => 'Používateľovi bude zaslaný mail pretože je pre zvolenú kategóriu nastavená EULA.',
     'eula_text'							=> 'Kategória EULA',
-    'eula_text_help'					=> 'Toto políčko umožňuje prispôsobiť dokument EULA špecifikcému typu majetku. Ak máte iba jeden dokument EULA pre všetky typy majetku, môžete oznaciť možnosť nižšie, aby sa použil predvolený dokument.',
+    'eula_text_help'					=> 'Toto políčko umožňuje prispôsobiť EULA špecifickému typu majetku. Ak máte iba jednu EULA pre všetky typy majetku, môžete označiť možnosť nižšie, aby sa použila predvolená.',
     'name'                              => 'Názov kategórie',
-    'require_acceptance'				=> 'Vyžadovač od používatľov aby potvrdili prijatie majetku v tejto kategórii.',
+    'require_acceptance'				=> 'Vyžadovať od používateľov aby potvrdili prijatie majetku v tejto kategórii.',
     'required_acceptance'				=> 'Tomuto používateľovi bude zaslaný mailom odkaz na potvrdenie prijatia tejto položky.',
     'required_eula'						=> 'Tomuto používateľovi bude zaslaná kópia dokumentu EULA',
     'no_default_eula'					=> 'Žiaden predvolený EULA dokument nebol nájdený. Pridajte nový v Nastaveniach.',
diff --git a/resources/lang/sk-SK/admin/hardware/form.php b/resources/lang/sk-SK/admin/hardware/form.php
index 01c989fe2..b37d5f1a4 100644
--- a/resources/lang/sk-SK/admin/hardware/form.php
+++ b/resources/lang/sk-SK/admin/hardware/form.php
@@ -1,13 +1,13 @@
 <?php
 
 return [
-    'bulk_delete'		=> 'Potvrdiť hromadné odstránenie majetku',
-    'bulk_restore'      => 'Potvrdiť hromadnú obnovu majetkov', 
+    'bulk_delete'		=> 'Potvrdiť hromadné odstránenie položiek majetku',
+    'bulk_restore'      => 'Potvrdiť hromadnú obnovu položiek majetku', 
   'bulk_delete_help'	=> 'Nižšie skontrolujte zoznam majetku na odstránenie. Po odstránení je možné tieto majetky obnoviť, nebudú už ale priradené k žiadnym používateľom, ku ktorým sú momentálne priradení.',
   'bulk_restore_help'	=> 'Skontrolujte zoznam majetkov pre hromadnú obnovu. Po obnovní nebude majetok prepojený so žiadnymi používateľmi, s ktorým bol predtým priradený.',
   'bulk_delete_warn'	=> 'Chystáte sa odstrániť :asset_count majetky.',
   'bulk_restore_warn'	=> 'Chystáte sa obnoviť :asset_count majetkov.',
-    'bulk_update'		=> 'Hromadná úprava majetku',
+    'bulk_update'		=> 'Hromadná úprava položiek majetku',
     'bulk_update_help'	=> 'Tento formulár umožňuje hromadnú úpravu majetku. Vyplňte iba položky, ktoré chcete zmeniť. Akékoľvek prázdne položky zostanú nezmenené. ',
     'bulk_update_warn'	=> 'Chystáte sa upraviť vlastnosti jedného majetku.|Chystáte sa obnoviť vlastnosti :asset_count majetkov.',
     'bulk_update_with_custom_field' => 'Upozorňujeme, že majetky sú :asset_mode_count rôznych typov modelov.',
@@ -15,7 +15,7 @@ return [
     'bulk_update_custom_field_unique' => 'Toto je unikátne pole, preto nemôže byť hromadne upravené.',
     'checkedout_to'		=> 'Odovzdané',
     'checkout_date'		=> 'Dátum odovzdania',
-    'checkin_date'		=> 'Dátum prijatia',
+    'checkin_date'		=> 'Dátum prevzatia',
     'checkout_to'		=> 'Odovzdať',
     'cost'				=> 'Kúpna cena',
     'create'			=> 'Pridať majetok',
@@ -25,11 +25,11 @@ return [
     'default_location'	=> 'Povodná lokalita',
     'default_location_phone' => 'Telefón východzej lokality',
     'eol_date'			=> 'Dátum EOL',
-    'eol_rate'			=> 'Miera EOL',
-    'expected_checkin'  => 'Očakávaný dátum prijatia',
+    'eol_rate'			=> 'Interval EOL',
+    'expected_checkin'  => 'Očakávaný dátum prevzatia',
     'expires'			=> 'Exspiruje',
     'fully_depreciated'	=> 'Plne odpísaný',
-    'help_checkout'		=> 'Ak si prajete priradiť tento majetok okamžite, zvoľte možnosť "Pripravený na odovzdanie" z vyššie dostupného zoznamu stavov. ',
+    'help_checkout'		=> 'Ak si prajete priradiť tento majetok okamžite, zvoľte možnosť "Pripravený na odovzdanie" z dostupného zoznamu stavov. ',
     'mac_address'		=> 'MAC adresa',
     'manufacturer'		=> 'Výrobca',
     'model'				=> 'Model',
@@ -46,7 +46,7 @@ return [
     'serial'			=> 'Sériové číslo',
     'status'			=> 'Stav',
     'tag'				=> 'Označenie majetku',
-    'update'			=> 'Aktualizácia majetku',
+    'update'			=> 'Úprava majetku',
     'warranty'			=> 'Záruka',
         'warranty_expires'		=> 'Koniec záruky',
     'years'				=> 'roky/ov',
@@ -54,9 +54,9 @@ return [
     'asset_location_update_default_current' => 'Upraviť predvolenú lokalitu A aktulánu lokalitu',
     'asset_location_update_default' => 'Upraviť iba predvolenú lokalitu',
     'asset_location_update_actual' => 'Upraviť iba aktuálnu lokalitu',
-    'asset_not_deployable' => 'Tento majetok nie je vyskladniteľný. Tento majetok nemôže byť priradený.',
-    'asset_not_deployable_checkin' => 'Tento majetok nie je vyskladniteľný. Použitím tohto typu stavu budú majetok prevzatý od priradeného používateľa.',
-    'asset_deployable' => 'Tneto majetok je vyskladniteľný. Tento majetok môže byť priradený.',
+    'asset_not_deployable' => 'Tento majetok nie je odovzdateľný. Tento majetok nemôže byť priradený.',
+    'asset_not_deployable_checkin' => 'Tento majetok nie je odovzdateľný. Použitím tohto typu stavu bude majetok prevzatý od priradeného používateľa.',
+    'asset_deployable' => 'Tento majetok je odovzdateľný. Tento majetok môže byť priradený.',
     'processing_spinner' => 'Procesujem... (Môže to chvíľu trvať v prípade veľkých súborov)',
     'optional_infos'  => 'Nepovinné informácie',
     'order_details'   => 'Informácie súvisiace s objednávkou',
diff --git a/resources/lang/sk-SK/admin/hardware/general.php b/resources/lang/sk-SK/admin/hardware/general.php
index f6628da69..a2858809a 100644
--- a/resources/lang/sk-SK/admin/hardware/general.php
+++ b/resources/lang/sk-SK/admin/hardware/general.php
@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'about_assets_title'           => 'O majetkoch',
-    'about_assets_text'            => 'Majetkom sú položky identifikované sériovým čislom alebo značkou majetku. Väčšinou ide o položky s vyššou hodnotou, pri ktorých je dôležité identifikovať konkrétnu položku.',
+    'about_assets_title'           => 'O položkách majetku',
+    'about_assets_text'            => 'Položky majetku sú identifikované sériovým číslom alebo značkou majetku. Väčšinou ide o položky s vyššou hodnotou, pri ktorých je dôležité identifikovať konkrétnu položku.',
     'archived'  				=> 'Archivované',
     'asset'  					=> 'Majetok',
-    'bulk_checkout'             => 'Vyskladniť majetky',
-    'bulk_checkin'              => 'Prevziať majetok',
+    'bulk_checkout'             => 'Odovzdať položky majetku',
+    'bulk_checkin'              => 'Prevziať položky majetku',
     'checkin'  					=> 'Prevziať majetok',
-    'checkout'  				=> 'Vyskladniť majetok',
+    'checkout'  				=> 'Odovzdať majetok',
     'clone'  					=> 'Duplikovať majetok',
-    'deployable'  				=> 'Vyskladniteľný',
+    'deployable'  				=> 'Odovzdateľný',
     'deleted'  					=> 'Tento majetok bol zmazaný.',
     'delete_confirm'            => 'Ste si istý, že chcete zmazať tento majetok?',
     'edit'  					=> 'Upraviť majetok',
@@ -23,7 +23,7 @@ return [
     'requestable_status_warning' => 'Nemeniť stav vyžiadateľnosti',
     'restore'  					=> 'Obnoviť majetok',
     'pending'  					=> 'Čakajúce',
-    'undeployable'  			=> 'Nevyskladniteľný',
+    'undeployable'  			=> 'Neodovzdateľný',
     'undeployable_tooltip'  	=> 'Tento majetok je v stave, ktorý neumožňuje odovzdanie a preto nemôže byť teraz odovzdaný.',
     'view'  					=> 'Zobraziť majetok',
     'csv_error' => 'V CSV súbore sa nachádza chyba:',
diff --git a/resources/lang/sk-SK/admin/hardware/message.php b/resources/lang/sk-SK/admin/hardware/message.php
index a06869857..46f8751e5 100644
--- a/resources/lang/sk-SK/admin/hardware/message.php
+++ b/resources/lang/sk-SK/admin/hardware/message.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'undeployable' 		 => '<strong>Varovanie: </strong> Tento majetok bol označný ako nepriraditeľný. Ak došlo k zmene, prosím upravte aktuálny stav majetku.',
+    'undeployable' 		 => '<strong>Varovanie: </strong> Tento majetok bol označný ako neodovzdateľný. Ak došlo k zmene, prosím upravte aktuálny stav majetku.',
     'does_not_exist' 	 => 'Majetok neexistuje.',
     'does_not_exist_var' => 'Majetok s označením :asset_tag nebol nájdený.',
     'no_tag' 	         => 'Nebolo zadané žiadne označenie majetku.',
@@ -11,7 +11,7 @@ return [
     'warning_audit_date_mismatch' 	=> 'Nastavený dátum nasledujúceho auditu (:next_audit_date) je skorší ako dátum posledného auditu (:last_audit_date). Prosím upravte dátum nasledujúceho auditu.',
     'labels_generated'   => 'Štítky boli úspešne vygenerované.',
     'error_generating_labels' => 'Pri generovaní štítkov nastala chyba.',
-    'no_assets_selected' => 'Neboli zvolené žiadne majetky.',
+    'no_assets_selected' => 'Neboli zvolené žiadne položky majetku.',
 
     'create' => [
         'error'   		=> 'Majetok nebol vytvorený, prosím skúste znovu. :(',
@@ -27,14 +27,14 @@ return [
         'encrypted_warning' => 'Majetok bol úspešne upravený, avšak šifrované vlastné polia neboli upravené z dôvodu oprávnení',
         'nothing_updated'	=>  'Neboli vybrané žiadne položky, preto nebolo nič upravené.',
         'no_assets_selected'  =>  'Neboli vybrané žiadne majetky, preto nebolo nič upravené.',
-        'assets_do_not_exist_or_are_invalid' => 'Vybratné majetky nemôzu byť upravené.',
+        'assets_do_not_exist_or_are_invalid' => 'Zvolené položky majetku nemôžu byť upravené.',
     ],
 
     'restore' => [
         'error'   		=> 'Majetok nebol obnovený, prosím skúste znovu',
         'success' 		=> 'Majetok bol úspešne obnovený.',
         'bulk_success' 		=> 'Majetok bol úspešne obnovený.',
-        'nothing_updated'   => 'Nebol vybraný žiaden majetok, preto nebolo nič obnovené.', 
+        'nothing_updated'   => 'Neboli zvolené žiadne položky majetku, preto nebolo nič obnovené.', 
     ],
 
     'audit' => [
@@ -72,26 +72,26 @@ return [
     'delete' => [
         'confirm'   	=> 'Ste si istý, že chcete odstrániť tento majetok?',
         'error'   		=> 'Pri odstraňovaní majetku sa vyskytla chyba. Skúste prosím znovu.',
-        'nothing_updated'   => 'Neboli zvolený žiaden majetok, preto nebolo nič odstránené.',
+        'nothing_updated'   => 'Neboli zvolený žiadne položky majetku, preto nebolo nič odstránené.',
         'success' 		=> 'Majetok bol úspešne odstránený.',
     ],
 
     'checkout' => [
-        'error'   		=> 'Majetok sa nepodarilo priradiť, skúste prosím znovu',
-        'success' 		=> 'Majetok bol úspešne priradený.',
+        'error'   		=> 'Majetok sa nepodarilo odovzdať, skúste prosím znovu',
+        'success' 		=> 'Majetok bol úspešne odovzdaný.',
         'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.',
-        'not_available' => 'Tento majetok nie je k dospozícii pre priradenie!',
+        'not_available' => 'Tento majetok nie je k dospozícii pre odovzdanie!',
         'no_assets_selected' => 'Musíte vybrať najmenej jednu položku majetku zo zoznamu',
     ],
 
     'multi-checkout' => [
-        'error'   => 'Majetok nebol odovzadený, prosím skúste znovu|Majetky neboli odovzadné, prosím skúste znovu',
-        'success' => 'Majetok bol úspešne odovzadný.|Majetky boli úspešne odovzdané.',
+        'error'   => 'Majetok nebol odovzdaný, prosím skúste znovu|Majetky neboli odovzdané, prosím skúste znovu',
+        'success' => 'Majetok bol úspešne odovzdaný.|Majetky boli úspešne odovzdané.',
     ],
 
     'checkin' => [
-        'error'   		=> 'Majetok sa nepodarilo prijať, skúste prosím znovu',
-        'success' 		=> 'Majetok bol úspešne prijatý.',
+        'error'   		=> 'Majetok sa nepodarilo prevziať, skúste prosím znovu',
+        'success' 		=> 'Majetok bol úspešne prevzatý.',
         'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.',
         'already_checked_in'  => 'Tento majetok je už prevzatý.',
 
@@ -100,7 +100,7 @@ return [
     'requests' => [
         'error'   		=> 'Majetok nebol vyžiadaný, prosím skúste znovu',
         'success' 		=> 'Majetok úspešne vyžiadaný.',
-        'canceled'      => 'Požiadavka na priradenie bola úspešne zrušená',
+        'canceled'      => 'Požiadavka na odovzdanie bola úspešne zrušená',
     ],
 
 ];
diff --git a/resources/lang/sk-SK/admin/hardware/table.php b/resources/lang/sk-SK/admin/hardware/table.php
index 4f3fc1616..9b44efc97 100644
--- a/resources/lang/sk-SK/admin/hardware/table.php
+++ b/resources/lang/sk-SK/admin/hardware/table.php
@@ -15,7 +15,7 @@ return [
     'dl_csv' 		=> 'Stiahnuť CSV',
     'eol' 			=> 'Koniec životnosti',
     'id'      		=> 'ID',
-    'last_checkin_date' => 'Posledný dátum vrátenia',
+    'last_checkin_date' => 'Dátum posledného prevzatia',
     'location' 		=> 'Umiestnenie',
     'purchase_cost'	=> 'Cena',
     'purchase_date'	=> 'Zakúpené',
diff --git a/resources/lang/sk-SK/admin/licenses/form.php b/resources/lang/sk-SK/admin/licenses/form.php
index 910a6a75a..a2f7389a4 100644
--- a/resources/lang/sk-SK/admin/licenses/form.php
+++ b/resources/lang/sk-SK/admin/licenses/form.php
@@ -3,7 +3,7 @@
 return array(
 
     'asset'             => 'Majetok',
-    'checkin'           => 'Vrátenie',
+    'checkin'           => 'Prevzatie',
     'create'            => 'Pridať licenciu',
     'expiration'        => 'Exspirácia licencie',
     'license_key'       => 'Produktový kľúč',
diff --git a/resources/lang/sk-SK/admin/licenses/general.php b/resources/lang/sk-SK/admin/licenses/general.php
index e5f78139f..aaa55dbde 100644
--- a/resources/lang/sk-SK/admin/licenses/general.php
+++ b/resources/lang/sk-SK/admin/licenses/general.php
@@ -3,9 +3,9 @@
 return array(
     'about_licenses_title'      => 'O licenciach',
     'about_licenses'            => 'Licencie sa využívajú k sledovaniu softvéru. Majú stanovený počet slotov, ktoré môžu byť odovzdané používateľom',
-    'checkin'  					=> 'Odovzdať licenčný slot',
-    'checkout_history'  		=> 'História',
-    'checkout'  				=> 'Odovzdať licenčných slotov',
+    'checkin'  					=> 'Prevziať licenčný slot',
+    'checkout_history'  		=> 'História odovzdania',
+    'checkout'  				=> 'Odovzdať licenčný slot',
     'edit'  					=> 'Upraviť licenciu',
     'filetype_info'				=> 'Podporované typy súborov: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip a rar.',
     'clone'  					=> 'Duplikovať licenciu',
@@ -37,11 +37,11 @@ return array(
                 'modal'                 => 'Táto akcia odovzdá jeden slot prvému dostupnému používateľovi. | Táto akcia odovzdá všetkých :available_seats_count slotov prvých dostupných používateľom. Používateľ je považovaný za dostupného v prípade, ak mu ešte nebola odovzdaná táto licencia a daný používateľ ma povolené automatické priradzovanie licencií.',
                 'enabled_tooltip'   => 'Odovzdať všetky (dostupné) sloty všetkých používateľom',
                 'disabled_tooltip'  => 'Táto možnosť je zablokovaná pretože nie sú dostupné žiadne sloty',
-                'success'           => 'Licencia bola úspešne priradená! | :count licencií bolo úspešne priradených!',
+                'success'           => 'Licencia bola úspešne odovzdaná! | :count licencií bolo úspešne odovzdaných!',
                 'error_no_seats'    => 'Nezostávajú žiadne voľné sloty pri tejto licencii.',
                 'warn_not_enough_seats'    => ':count používateľom bola licencia priradená, avšak už nezostali žiadne voľné sloty.',
-                'warn_no_avail_users'    => 'Nie je možné zrealizovať. Nezostali žiadny používateľlia, ktorí by túto licenciu ešte nemali priradenú.',
-                'log_msg'           => 'Hromadne priradiť v rozhraní pre správu licencií',
+                'warn_no_avail_users'    => 'Nie je možné zrealizovať. Nezostal žiaden používateľ, ktorý by túto licenciu ešte nemal priradenú.',
+                'log_msg'           => 'Hromadne odovzdať v rozhraní pre správu licencií',
 
 
             ],
diff --git a/resources/lang/sk-SK/admin/licenses/message.php b/resources/lang/sk-SK/admin/licenses/message.php
index c15fe9e10..b76b49d01 100644
--- a/resources/lang/sk-SK/admin/licenses/message.php
+++ b/resources/lang/sk-SK/admin/licenses/message.php
@@ -41,17 +41,17 @@ return array(
     ),
 
     'checkout' => array(
-        'error'   => 'Pri priraďovaní licencie nastala chyba. Skúste prosím znovu.',
-        'success' => 'Licencia bola úspešne priradená',
-        'not_enough_seats' => 'Nedostatok licenčných miest pre priradenie',
-        'mismatch' => 'Poskytnuté licenčne miest sa nezhodujú s licenciou',
-        'unavailable' => 'Toto miesto nie je dostupné pre priradenie.',
+        'error'   => 'Pri odovzdaní licencie nastala chyba. Skúste prosím znovu.',
+        'success' => 'Licencia bola úspešne odovzdaná',
+        'not_enough_seats' => 'Nedostatok licenčných miest pre odovzdanie',
+        'mismatch' => 'Poskytnutý licenčný slot sa nezhoduje s licenciou',
+        'unavailable' => 'Tento slot nie je dostupné pre odovzdanie.',
     ),
 
     'checkin' => array(
-        'error'   => 'Pri odoberaní licencie nastala chyba. Skúste prosím znovu.',
+        'error'   => 'Pri prevzatí licencie nastala chyba. Skúste prosím znovu.',
         'not_reassignable' => 'Licencia nie je preraditeľná',
-        'success' => 'Licencia bola úspešne odobratá'
+        'success' => 'Licencia bola úspešne prevzatá'
     ),
 
 );
diff --git a/resources/lang/sk-SK/admin/locations/message.php b/resources/lang/sk-SK/admin/locations/message.php
index 7fc842faf..d84da6c6d 100644
--- a/resources/lang/sk-SK/admin/locations/message.php
+++ b/resources/lang/sk-SK/admin/locations/message.php
@@ -6,7 +6,7 @@ return array(
     'assoc_users'    => 'Túto lokalitu nie je možné odstrániť nakoľko je využívaná pri minimálne jednom majetku alebo užívateľovi, má priradené majetky alebo je nadradenou lokalitou inej lokality. Prosím upravte ostatné záznamy, aby nevyužívali túto lokalitu a skúste znovu. ',
     'assoc_assets'	 => 'Táto lokalita je priradená minimálne jednému majetku, preto nemôže byť odstránená. Prosím odstráňte referenciu na túto lokalitu z príslušného majetku a skúste znovu. ',
     'assoc_child_loc'	 => 'Táto lokalita je nadradenou minimálne jednej podradenej lokalite, preto nemôže byť odstránená. Prosím odstráňte referenciu s príslušnej lokality a skúste znovu. ',
-    'assigned_assets' => 'Priradené majetky',
+    'assigned_assets' => 'Priradené položky majetku',
     'current_location' => 'Aktuálna lokalita',
     'open_map' => 'Otvoriť v :map_provider_icon mapách',
 
diff --git a/resources/lang/sk-SK/admin/locations/table.php b/resources/lang/sk-SK/admin/locations/table.php
index b25bbfee3..5139cc2a8 100644
--- a/resources/lang/sk-SK/admin/locations/table.php
+++ b/resources/lang/sk-SK/admin/locations/table.php
@@ -2,8 +2,8 @@
 
 return [
     'about_locations_title'     => 'O lokalitách',
-    'about_locations'           => 'Lokality sa využívajú na sledovanie umiestnenia používateľov, majetku a ostatných položiek',
-    'assets_rtd'                => 'Majetok', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'about_locations'           => 'Lokality sa využívajú na sledovanie umiestnenia používateľov, položiek majetku a ostatných položiek',
+    'assets_rtd'                => 'Položky majetku', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Priradený majetok',
     'id'                        => 'ID',
     'city'                      => 'Mesto',
@@ -24,7 +24,7 @@ return [
     'user_name'                 => 'Meno používateľa',
     'department'                => 'Oddelenie',
     'location'                  => 'Lokalita',
-    'asset_tag'                 => 'Označenie majetku',
+    'asset_tag'                 => 'Označenia majetku',
     'asset_name'                => 'Názov',
     'asset_category'            => 'Kategória',
     'asset_manufacturer'        => 'Výrobca',
@@ -32,7 +32,7 @@ return [
     'asset_serial'              => 'Sériové číslo',
     'asset_location'            => 'Lokalita',
     'asset_checked_out'         => 'Odovzdané',
-    'asset_expected_checkin'    => 'Očakávaný dátum prijatia',
+    'asset_expected_checkin'    => 'Očakávaný dátum prevzatia',
     'date'                      => 'Dátum:',
     'phone'                     => 'Telefónne čislo lokality',
     'signed_by_asset_auditor'   => 'Podpísané (Audítor majetku):',
diff --git a/resources/lang/sk-SK/admin/models/message.php b/resources/lang/sk-SK/admin/models/message.php
index 9fe40c3f8..2dfad97cd 100644
--- a/resources/lang/sk-SK/admin/models/message.php
+++ b/resources/lang/sk-SK/admin/models/message.php
@@ -6,7 +6,7 @@ return array(
     'does_not_exist' => 'Model neexistuje.',
     'no_association' => 'VAROVANIE! Model majetku pre túto položku je neplatný alebo neexistuje!',
     'no_association_fix' => 'Tento stav môže spôsobiť nepredvídateľné problémy. Priraďte danému majetku správny model.',
-    'assoc_users'	 => 'Tento model je použítý v jednom alebo viacerých majetkoch, preto nemôže byť odstránený. Prosím odstráňte príslušný majetok a skúste odstrániť znovu. ',
+    'assoc_users'	 => 'Tento model je použitý v jednom alebo viacerých majetkoch, preto nemôže byť odstránený. Prosím odstráňte príslušný majetok a skúste odstrániť znovu. ',
     'invalid_category_type' => 'Táto kategória musí byť kategóriou majetku.',
 
     'create' => array(
diff --git a/resources/lang/sk-SK/admin/models/table.php b/resources/lang/sk-SK/admin/models/table.php
index ec6a5b607..718b57b0e 100644
--- a/resources/lang/sk-SK/admin/models/table.php
+++ b/resources/lang/sk-SK/admin/models/table.php
@@ -7,7 +7,7 @@ return array(
     'eol'	 				=> 'EOL',
     'modelnumber'   		=> 'Číslo modelu',
     'name'      			=> 'Názov modelu majetku',
-    'numassets' 			=> 'Majetok',
+    'numassets' 			=> 'Položky majetku',
     'title'					=> 'Typy majetku',
     'update'				=> 'Upraviť typ majetku',
     'view'					=> 'Zobraziť typ majetku',
diff --git a/resources/lang/sk-SK/admin/settings/general.php b/resources/lang/sk-SK/admin/settings/general.php
index 351878f7e..fae666dcc 100644
--- a/resources/lang/sk-SK/admin/settings/general.php
+++ b/resources/lang/sk-SK/admin/settings/general.php
@@ -19,7 +19,7 @@ return [
     'alert_interval'			=> 'Interval pre varovania o exspirácií (v dňoch)',
     'alert_inv_threshold'		=> 'Interval pre varovania o skladových zásobách',
     'allow_user_skin'           => 'Povoliť používateľské tému',
-    'allow_user_skin_help_text' => 'Zaškrtnutím tohto políčka sa povolíí používateľovi nahradiť UI tému vlastnou.',
+    'allow_user_skin_help_text' => 'Zaškrtnutím tohto políčka sa povolí používateľovi nahradiť UI tému vlastnou.',
     'asset_ids'					=> 'ID-čka majetku',
     'audit_interval'            => 'Interval pre auditovanie',
     'audit_interval_help'       => 'Ak je požadovaný pravidelný fyzický audit majetku, zadajte interval v mesiacoch, ktorý používate. Ak túto hodnotu aktualizujete, aktualizujú sa všetky „dátumy ďalšieho auditu“ pre majetok s blížiacim sa dátumom auditu.',
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP heslo spojenia',
     'ldap_basedn'               => 'Základné Bind DN',
     'ldap_filter'               => 'LDAP filter',
-    'ldap_pw_sync'              => 'LDAP synhronizácia hesla',
-    'ldap_pw_sync_help'         => 'Zrušte zaškrtnutie tohoto políčka, ak si neželáte uchovávať heslá LDAP synchronizované s lokálnymi heslami. Ak to zakážete, znamená to, že sa používatelia nemusia vedieť prihlásiť pokiaľ je Váš LDAP server z nejaké dôvodu nedostupný.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Pole s používateľským menom',
     'ldap_lname_field'          => 'Priezvisko',
     'ldap_fname_field'          => 'LDAP meno',
@@ -277,8 +277,8 @@ return [
     'two_factor_enrollment_text'	=> "Je vyžadované dvojfaktorové overenie, avšak vaše zariadenie ešte nebolo zaregistrované. Otvorte aplikáciu Google Authenticator a oskenujte nižšie uvedený QR kód pre registráciu vášho zariadenia. Akonáhle zaregistrujete svoje zariadenie, zadajte nižšie uvedený kód",
     'require_accept_signature'      => 'Vyžadovať podpis',
     'require_accept_signature_help_text'      => 'Aktiváciou tejto funkcie bude vyžadovať, aby sa používatelia fyzicky podpísali k potvrdeniu prijatia majetku.',
-    'require_checkinout_notes'  => 'Vyžadovať poznámky pri odovzdaní a prevzatí',
-    'require_checkinout_notes_help_text'    => 'Aktiváciou tejto funkcie bude vyžadovať, aby bolo pole s poznámkou vždy vyplnené, keď je realizované odovzdanie alebo prijatie majetku.',
+    'require_checkinout_notes'  => 'Vyžadovať poznámky pri prevzatí / odovzdaní',
+    'require_checkinout_notes_help_text'    => 'Aktiváciou tejto funkcie bude vyžadovať, aby bolo pole s poznámkou vždy vyplnené, keď je realizované odovzdanie alebo prevzatie majetku.',
     'left'        => 'vľavo',
     'right'        => 'vpravo',
     'top'        => 'hore',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Odstrániť odmazané záznamy',
     'ldap_extension_warning' => 'Nevypadá to, že LDAP rozšírenie je nainštalované alebo povolené na tomto servere. Stále môžete uložiť vaše nastavenia ale budete musieť povoliť LDAP rozšírenie pre PHP, aby začala LDAP synchronizácia alebo prihlásenie fungovať.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Číslo zamestnanca',
     'create_admin_user' => 'Vytvoriť Užívateľa ::',
     'create_admin_success' => 'Úspech! Váš admin užívateľ bol pridaný!',
diff --git a/resources/lang/sk-SK/admin/settings/message.php b/resources/lang/sk-SK/admin/settings/message.php
index c1ca1d0d6..d46b6fc01 100644
--- a/resources/lang/sk-SK/admin/settings/message.php
+++ b/resources/lang/sk-SK/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testujem LDAP autentifikáciu...',
         'authentication_success' => 'Používateľ sa úspešne autentifikoval voči LDAP-u!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Posielam :app testovaciu správu...',
         'success' => 'Vaša :webhook_name integrácia funguje!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'CHBA: 301/302 :endpoint vrátil presmerovanie. Z bezpečnostných dôvodov nenasledujeme presmerovania. Prosím použite správny koncový bod.',
         'error_misc' => 'Niečo sa pokazilo. :( ',
         'webhook_fail' => ' webhook notifikácia zlyhala: Overte správnosť zadanej URL adresy.',
+        'webhook_channel_not_found' => ' kanál webhooku nebol nájdený.'
     ]
 ];
diff --git a/resources/lang/sk-SK/admin/statuslabels/message.php b/resources/lang/sk-SK/admin/statuslabels/message.php
index e81f6dad3..e2dea48e2 100644
--- a/resources/lang/sk-SK/admin/statuslabels/message.php
+++ b/resources/lang/sk-SK/admin/statuslabels/message.php
@@ -23,7 +23,7 @@ return [
     ],
 
     'help' => [
-        'undeployable'   => 'Tieto majetky nemôžu byť nikomu priradené.',
+        'undeployable'   => 'Tieto položky majetku nemôžu byť nikomu priradené.',
         'deployable'   => 'Tieto majetky môžu byť priradené. Akonáhle sú priradené nadobudnú stav <i class="fas fa-circle text-blue"></i> <strong>Priradené</strong>.',
         'archived'   => 'Tieto majetky nemôžu byť priradené, budú zobrazené iba vo výpise Archovavné. Tento stav je vhodný, ak si chcete ponechať informácie o predchádzajúcom majetku pre historické účely alebo prípravu rozpočtu, ale zároveň ich nechcete mať zobrazené v prehľade aktuálneho majetku.',
         'pending'   => 'Tieto majetky nemôžu byť ešte nikomu priradené. Často sa používa na predmety, ktoré čakajú na opravu ale očakáva sa ich návrat do obehu.',
diff --git a/resources/lang/sk-SK/admin/statuslabels/table.php b/resources/lang/sk-SK/admin/statuslabels/table.php
index 7063dc53c..e45a953dc 100644
--- a/resources/lang/sk-SK/admin/statuslabels/table.php
+++ b/resources/lang/sk-SK/admin/statuslabels/table.php
@@ -7,13 +7,13 @@ return array(
     'color'      	=> 'Farba grafu',
     'default_label' => 'Predvolený štítok',
     'default_label_help' => 'Používa sa k zabezpečeniu, aby sa najčastejšie používé stavy zobrazili na vrchu zoznamu pri vytváraní / úprave majetku.',
-    'deployable'      	=> 'Priraditeľný',
-    'info'      	=> 'Stavy sa využívajú k popísaniu rozličných fáz, ktorými môže majetok prechádzť. Môžu byť vytvorené pre prípad opravy, straty / krádeže, atď. Môžete vytvoriť nový stav pre priraditeľlné, čakajúce a archivované položky majetku.',
+    'deployable'      	=> 'Odovzdateľný',
+    'info'      	=> 'Stavy sa využívajú k popisu rozličných fáz, ktorými môžu položky majetku prechádzať. Môžu byť vytvorené pre prípad opravy, straty / krádeže, atď. Môžete vytvoriť nový stav pre odovzdateľné, čakajúce a archivované položky majetku.',
     'name'      	=> 'Názov stavu',
     'pending'      	=> 'Čakajúce',
     'status_type'   => 'Typ stavu',
     'show_in_nav'   => 'Zobraziť v bočnom menu',
     'title'      	=> 'Stavy',
-    'undeployable'  => 'Nepriraditeľný',
+    'undeployable'  => 'Neodovzdateľný',
     'update'      	=> 'Upraviť stav',
 );
diff --git a/resources/lang/sk-SK/admin/users/table.php b/resources/lang/sk-SK/admin/users/table.php
index d932e69b0..429dd1c86 100644
--- a/resources/lang/sk-SK/admin/users/table.php
+++ b/resources/lang/sk-SK/admin/users/table.php
@@ -3,7 +3,7 @@
 return array(
     'activated'  			=> 'Aktívny',
     'allow'  				=> 'Povoliť',
-    'checkedout'  			=> 'Majetok',
+    'checkedout'  			=> 'Položky majetku',
     'created_at' 			=> 'Vytvorený',
     'createuser' 			=> 'Vytvoriť používateľa',
     'deny'  				=> 'Odmietnuť',
diff --git a/resources/lang/sk-SK/button.php b/resources/lang/sk-SK/button.php
index b8860b7fd..e5d24c49c 100644
--- a/resources/lang/sk-SK/button.php
+++ b/resources/lang/sk-SK/button.php
@@ -29,6 +29,6 @@ return [
         'restore'   => 'Obnoviť :item_type',
         'create'    => 'Vytvoriť nový :item_type',
         'checkout'  => 'Odovzdať :item_type',
-        'checkin'   => 'Prijať :item_type',
+        'checkin'   => 'Prevziať :item_type',
     ]
 ];
diff --git a/resources/lang/sk-SK/general.php b/resources/lang/sk-SK/general.php
index 035115034..76eb50b38 100644
--- a/resources/lang/sk-SK/general.php
+++ b/resources/lang/sk-SK/general.php
@@ -15,7 +15,7 @@ return [
     'superuser'				=> 'Superadmin',
     'superuser_tooltip'		=> 'Tento používateľ má superadmin oprávnenia',
     'administrator'			=> 'Administrátor',
-    'add_seats'             => 'Pridať licenčné miesta',
+    'add_seats'             => 'Pridané licenčné sloty',
     'age'                   => "Vek",
     'all_assets'			=> 'Všetky zariadenia',
     'all'       			=> 'Všetky',
@@ -45,11 +45,11 @@ return [
     'bad_data'      		=> 'Nič nebolo nájdené. Možno zadávate zlé dáta?',
     'bulkaudit'             => 'Hromadný audit',
     'bulkaudit_status'      => 'Stav auditu',
-    'bulk_checkout'  		=> 'Hromadné pridelenie',
+    'bulk_checkout'  		=> 'Hromadné odovzdanie',
     'bulk_edit'             => 'Hromadná editácia',
     'bulk_delete'           => 'Hromadné vymazanie',
     'bulk_actions'          => 'Hromadné akcie',
-    'bulk_checkin_delete'   => 'Hromadné prijatie / Odstránenie užívateľov',
+    'bulk_checkin_delete'   => 'Hromadné prevzatie / Odstránenie užívateľov',
     'byod'                  => 'BYOD',
     'byod_help'             => 'Toto zariadenie je vlastnené používateľom',
     'bystatus'              => 'podľa Stavu',
@@ -59,12 +59,12 @@ return [
     'change' 		        => 'Vsetup/Výstup',
     'changeemail'  			=> 'Zmeniť emailovú adresu',
     'changepassword'  		=> 'Zmena hesla',
-    'checkin'  				=> 'Vrátiť',
-    'checkin_from'  		=> 'Vrátiť od',
-    'checkout'  			=> 'Priradiť',
-    'checkouts_count'       => 'Odovzdané',
-    'checkins_count'        => 'Vrátené',
-    'checkin_and_delete'  	=> 'Vrátiť a vymazať',
+    'checkin'  				=> 'Prevziať',
+    'checkin_from'  		=> 'Prevziať od',
+    'checkout'  			=> 'Odovzdať',
+    'checkouts_count'       => 'Odovzdania',
+    'checkins_count'        => 'Prevzatia',
+    'checkin_and_delete'  	=> 'Prevziať a vymazať',
     'user_requests_count'   => 'Požidavky',
     'city'  				=> 'Mesto',
     'click_here'			=> 'Klikni sem',
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Prispôsobiť report',
     'custom_report'         => 'Vlastný report majetku',
     'dashboard'				=> 'Prehľad',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dni',
     'days_to_next_audit'    => 'Do najbližšieho auditu',
     'date'					=> 'Dátum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Meno Priezvisko (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Priezvisko Iniciálka mena (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Iniciálka mena Priezvisko (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Meno Priezvisko (Jane Smith)',
     'lastname_firstname_display'	=> 'Priezvisko Meno (Smith Jane)',
     'name_display_format'	=> 'Formát zobrazenia mena',
@@ -183,7 +185,7 @@ return [
     'license_report'        => 'Report licencií',
     'licenses_available'	=> 'Dostupné licencie',
     'licenses'				=> 'Licencie',
-    'list_all'				=> 'Zobraziť všetky',
+    'list_all'				=> 'Zobraziť všetko',
     'loading'				=> 'Načítavanie... prosím čakajte...',
     'lock_passwords'        => 'Hodnota tohto poľa nebude uložená v demo verzii.',
     'feature_disabled'      => 'Táto funkcionalita bola zakázaná v demo verzii.',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Nie',
     'notes'  				=> 'Poznámky',
     'note_added'            => 'Poznámka pridaná',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Pridať poznámku',
     'note_edited'            => 'Poznámka upravená',
     'edit_note'              => 'Upraviť poznámku',
@@ -237,7 +241,7 @@ return [
     'qty'		            => 'Množstvo',
     'quantity'		        => 'Množstvo',
     'quantity_minimum'      => 'Máte jednu položku pod alebo takmer na minimálnom množstve|Máte :count položiek pod alebo takmer na minimálnom množstve',
-    'quickscan_checkin'  	=> 'Rýchle skenovania prijatých zariadení',
+    'quickscan_checkin'  	=> 'Rýchle skenovania prevzatých zariadení',
     'quickscan_checkin_status'  	=> 'Stav prijatia',
     'ready_to_deploy'		=> 'Pripravené na odovzdanie',
     'recent_activity'		=> 'Posledná aktivita',
@@ -303,11 +307,11 @@ return [
     'total_accessories'		=> 'celkom príslušenstva',
     'total_consumables'		=> 'celkom spotrebného materiálu',
     'type'  				=> 'Typ',
-    'undeployable'			=> 'Ne-priraditeľné',
+    'undeployable'			=> 'Neodovzdateľné',
     'unknown_admin'			=> 'Neznámy admin',
     'username_format'		=> 'Formát používateľského mena',
     'username'              => 'Používateľské meno',
-    'update'                => 'Aktualizácia',
+    'update'                => 'Aktualizovať',
     'updating_item' => 'Aktualizujem :item',
     'upload_filetypes_help'      => 'Povolené typy súborov sú png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Maximálna povolená veľkosť :size.',
     'uploaded'              => 'Odoslané',
@@ -334,9 +338,9 @@ return [
     'login_enabled'         => 'Prihlásenie povolené',
     'audit_due'             => 'K inventúre',
     'audit_due_days'        => 'Majetky k inventúre behom :days dňa|Majetky k inventúre behom :days dní',
-    'checkin_due'           => 'Do prijatia',
-    'checkin_overdue'       => 'Po termíne vrátenia',
-    'checkin_due_days'      => 'Majetok k prijatiu počas :days dňa|Majetok k prijatiu počas :days dní',
+    'checkin_due'           => 'Do prevzatia',
+    'checkin_overdue'       => 'Po termíne prevzatia',
+    'checkin_due_days'      => 'Majetok k prevzatiu počas :days dňa|Majetok k prevzatiu počas :days dní',
     'audit_overdue'         => 'Po termíne na inventúru',
     'accept'                => 'Prijať :asset',
     'i_accept'              => 'Príjmam',
@@ -414,9 +418,9 @@ return [
     'accessory_information' => 'Príslušenstvo - informácie:',
     'accessory_name'       => 'Názov príslušenstva:',
     'clone_item'            => 'Duplikovať položku',
-    'checkout_tooltip' => 'Odovydať túto položku',
+    'checkout_tooltip' => 'Odovzdať túto položku',
     'checkin_tooltip' => 'Prevziať túto položku tak, aby bola dostupná pre opätovné vydanie, zobrazenie, atď.',
-    'checkout_user_tooltip' => 'Odovzdať tút položku používateľovi',
+    'checkout_user_tooltip' => 'Odovzdať túto položku používateľovi',
     'checkin_to_diff_location' => 'Môžete sa rozhodnúť, že tento majetok zaradíte to inej lokality ako je predvolená lokalita tohto majetku :default_location, ak je nastavená',
     'maintenance_mode'      => 'Služba je dočasne nedostupná pre aktualizácie systému. Skúste to neskôr.',
     'maintenance_mode_title' => 'Systém je dočasne nedostupný',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count spotrebný materiál|:count spotrebných matriálov',
         'components'  => ':count komponent|:count komponentov',
     ],
+
     'more_info' => 'Viac info',
     'quickscan_bulk_help' => 'Zakliknutím tohto poľa upravíte majetkové záznamy tak, aby reflektovali novú lokalitu. Ak ho nezakliknete, tak sa iba poznačí lokalita v logovacom zázname. Majte na pamäti, že pri priradení majetku nedochádza k zmene lokality používateľa, majetku alebo lokality, do ktorej na priradený.',
     'whoops' => 'Hopsla!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Neumožniť používateľom spravovať ich vlastné heslá',
     'user_managed_passwords_allow' => 'Povoliť používateľom spravovať ich vlastné heslá',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/sk-SK/mail.php b/resources/lang/sk-SK/mail.php
index 56bd4fc2e..ef983739d 100644
--- a/resources/lang/sk-SK/mail.php
+++ b/resources/lang/sk-SK/mail.php
@@ -16,7 +16,7 @@ return [
     'Days' => 'Dni',
     'Expected_Checkin_Date' => 'Majetok, ktorý vám bol odovzdaný, musí byť vrátený späť do :date',
     'Expected_Checkin_Notification' => 'Pripomienka: Termín na vrátenie :name sa blíži',
-    'Expected_Checkin_Report' => 'Report očakávaných návratov majetku',
+    'Expected_Checkin_Report' => 'Report očakávaných vrátení majetku',
     'Expiring_Assets_Report' => 'Report majetku s končiacou zárukou.',
     'Expiring_Licenses_Report' => 'Report exspirujúcich licencií.',
     'Item_Request_Canceled' => 'Požiadavka na položku zrušená',
@@ -26,7 +26,7 @@ return [
     'license_for'   => 'Licencia pre',
     'Low_Inventory_Report' => 'Report nízkych zásob',
     'a_user_canceled' => 'Používateľ zrušil žiadosť o položku na webe',
-    'a_user_requested' => 'Používateľ vytvorit žiadosť o položku na webe',
+    'a_user_requested' => 'Používateľ vytvoril žiadosť o položku na webe',
     'acceptance_asset_accepted' => 'Používateľ potvrdil prijatie položky',
     'acceptance_asset_declined' => 'Používateľ zamietol prijatie položky',
     'accessory_name' => 'Názov príslušenstva',
@@ -42,7 +42,7 @@ return [
     'canceled' => 'Zrušené',
     'checkin_date' => 'Dátum vrátenia',
     'checkout_date' => 'Dátum odovzdania',
-    'checkedout_from' => 'Odovzadené',
+    'checkedout_from' => 'Odovzadené od',
     'checkedin_from'  => 'Prijaté od',
     'checked_into' => 'Priradené do',
     'click_on_the_link_accessory' => 'Prosím kliknite na nižšie priložený odkaz pre potvrdenie prevzatia príslušenstva.',
@@ -65,7 +65,7 @@ return [
     'low_inventory_alert' => 'Existuje :count položka, ktorá je alebo čoskoro bude pod hranicou minimálnych skladových zásob.|Existuje :count položiek, ktoré sú alebo čoskoro budú pod hranicou minimálnych skladových zásob.',
     'min_QTY' => 'Minimálne množstvo',
     'name' => 'Názov',
-    'new_item_checked' => 'Nová položka bola odovzdaná pod vašim menom, podrobnosti sú uvedené nižšie.',
+    'new_item_checked' => 'bola ti odovzdaná nová položka, podrobnosti sú uvedené nižšie.',
     'notes' => 'Poznámky',
     'password' => 'Heslo',
     'password_reset' => 'Reset hesla',
@@ -82,7 +82,7 @@ return [
     'tag' => 'Značka',
     'test_email' => 'Testovací mail zo Snipe-IT',
     'test_mail_text' => 'Toto je test odoslaný zo Snipe-IT Asset Manažmentu. Všetko funguje, ak ste obdržali tento mail :)',
-    'the_following_item' => 'Nasledujúca položka bola vrátená: ',
+    'the_following_item' => 'nasledujúca položka bola vrátená: ',
     'to_reset' => 'Pre resetovanie vášho :web hesla, prosím vyplňte nasledujúci formulár:',
     'type' => 'Typ',
     'upcoming-audits' => 'Existuje :count položka, ktorá bude podliehať auditu v priebehu :threshold dní.|Existujú :count položky, ktoré budú podliehať auditu v priebehu :threshold dní.',
diff --git a/resources/lang/sl-SI/admin/settings/general.php b/resources/lang/sl-SI/admin/settings/general.php
index 42f3d6e60..e539f555c 100644
--- a/resources/lang/sl-SI/admin/settings/general.php
+++ b/resources/lang/sl-SI/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP uporabniško geslo',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP sinhronizacija gesla',
-    'ldap_pw_sync_help'         => 'Počistite polje, če ne želite, da se gesla LDAP sinhronizirajo z lokalnimi gesli. Če funkcijo onemogočite, se vaši uporabniki morda ne bodo mogli prijaviti, če vaš strežnik LDAP iz neznanega razloga ni dosegljiv.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Uporabniško polje',
     'ldap_lname_field'          => 'Priimek',
     'ldap_fname_field'          => 'LDAP ime',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Počisti izbrisane zapise',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Ustvari uporabnika ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/sl-SI/admin/settings/message.php b/resources/lang/sl-SI/admin/settings/message.php
index cf0a3b10f..7863b0ab8 100644
--- a/resources/lang/sl-SI/admin/settings/message.php
+++ b/resources/lang/sl-SI/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testiranje LDAP Avtentikacije...',
         'authentication_success' => 'Uporabnik se je uspešno avtoriziral z LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Pošiljanje :apikacija testirno sporočilo...',
         'success' => 'Tvoj :ime_webhooka integracija deluje!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Nekaj je šlo narobe. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/sl-SI/general.php b/resources/lang/sl-SI/general.php
index 73cbb9e97..20f10bd70 100644
--- a/resources/lang/sl-SI/general.php
+++ b/resources/lang/sl-SI/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Poročilo o sredstvih po meri',
     'dashboard'				=> 'Nadzorna plošča',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dni',
     'days_to_next_audit'    => 'Dnevi do naslednje revizije',
     'date'					=> 'Datum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Ime priimek (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  'Priimek s prvo črko imena (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Prva črka imena s priimkom (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -218,6 +220,8 @@ return [
     'no'  					=> 'Ne',
     'notes'  				=> 'Opombe',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -562,6 +566,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Več informacij',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Ups!',
@@ -578,4 +583,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/so-SO/admin/settings/general.php b/resources/lang/so-SO/admin/settings/general.php
index 7cce7cb27..656ba805b 100644
--- a/resources/lang/so-SO/admin/settings/general.php
+++ b/resources/lang/so-SO/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'Pasowrd ku xiran',
     'ldap_basedn'               => 'Saldhig Bind DN',
     'ldap_filter'               => 'Shaandhaynta LDAP',
-    'ldap_pw_sync'              => 'Password ku beegan',
-    'ldap_pw_sync_help'         => 'Ka saar sanduuqan haddii aadan rabin inaad ku hayso furaha LDAP ee erayga sirta ah ee gudaha. Deminta tani waxay la macno tahay in isticmaalayaashaadu ay awoodi waayaan inay soo galaan haddii server-kaaga LDAP aan la heli karin sabab qaar ka mid ah.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Magaca isticmaalaha Field',
     'ldap_lname_field'          => 'Magaca dambe',
     'ldap_fname_field'          => 'Magaca Hore ee LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Nadiifi Diiwaanada La Tiray',
     'ldap_extension_warning' => 'Uma eka in kordhinta LDAP lagu rakibay ama lagu furay serfarkan. Weli waad kaydin kartaa dejimahaaga, laakiin waxaad u baahan doontaa inaad awood u siiso kordhinta LDAP ee PHP ka hor inta LDAP isku-xidhka ama galitaanka aanu shaqayn.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Lambarka Shaqaalaha',
     'create_admin_user' => 'Abuur Isticmaale ::',
     'create_admin_success' => 'Guul! Isticmaalahaaga maamulka ayaa lagu daray!',
diff --git a/resources/lang/so-SO/admin/settings/message.php b/resources/lang/so-SO/admin/settings/message.php
index c518883c3..cd9c59bbd 100644
--- a/resources/lang/so-SO/admin/settings/message.php
+++ b/resources/lang/so-SO/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Tijaabi aqoonsiga LDAP...',
         'authentication_success' => 'Isticmaaluhu wuxuu ka xaqiijiyay LDAP si guul leh!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Diraya :app fariinta tijaabada abka...',
         'success' => 'Magacaaga:webhook_name Isdhexgalka wuu shaqeeyaa!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'CILAD: 301/302 :endpoint Sababo ammaan dartood, ma raacno dib u jiheynta Fadlan isticmaal barta dhamaadka dhabta ah.',
         'error_misc' => 'Waxbaa qaldamay. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/so-SO/general.php b/resources/lang/so-SO/general.php
index 803b6133b..f5af947e8 100644
--- a/resources/lang/so-SO/general.php
+++ b/resources/lang/so-SO/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Habbee Warbixinta',
     'custom_report'         => 'Warbixinta Hantida Gaarka ah',
     'dashboard'				=> 'Dashboard-ka',
+    'data_source'           => 'Data Source',
     'days'      			=> 'maalmo',
     'days_to_next_audit'    => 'Maalmo ku xiga Hanti-dhawrka',
     'date'					=> 'Taariikhda',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Magaca Hore Magaca Dambe (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Magaca Dambe ee Hore (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Magaca Dambe ee Koowaad (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Magaca Hore Magaca Dambe (Jane Smith)',
     'lastname_firstname_display'	=> 'Magaca Dambe Magaca Hore (Smith Jane)',
     'name_display_format'	=> 'Qaabka Muujinta Magaca',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Maya',
     'notes'  				=> 'Xusuusin',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -560,6 +564,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Macluumaad dheeraad ah',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -576,4 +581,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/sq-AL/admin/settings/general.php b/resources/lang/sq-AL/admin/settings/general.php
index 97567df8d..ad21bbb64 100644
--- a/resources/lang/sq-AL/admin/settings/general.php
+++ b/resources/lang/sq-AL/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/sq-AL/admin/settings/message.php b/resources/lang/sq-AL/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/sq-AL/admin/settings/message.php
+++ b/resources/lang/sq-AL/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/sq-AL/general.php b/resources/lang/sq-AL/general.php
index 77670b5a7..53482e853 100644
--- a/resources/lang/sq-AL/general.php
+++ b/resources/lang/sq-AL/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/sr-CS/admin/settings/general.php b/resources/lang/sr-CS/admin/settings/general.php
index 50226237b..04544ed3e 100644
--- a/resources/lang/sr-CS/admin/settings/general.php
+++ b/resources/lang/sr-CS/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind lozinka',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP sinhronizacija lozinke',
-    'ldap_pw_sync_help'         => 'Poništite izbor ovog polja ako ne želite da LDAP lozinke budu sinhronizovane sa lokalnim lozinkama. Onemogućavanje ovoga znači da vaši korisnici možda neće moći da se prijave ako je vaš LDAP server iz nekog razloga nedostupan.',
+    'ldap_pw_sync'              => 'Keširaj LDAP lozinke',
+    'ldap_pw_sync_help'         => 'Isključite ovu opciju ako ne želite da LDAP lozinke držite keširane kao lokalne hešovane lozinke. Onemogućavanje ovoga znači da vaši korisnici neće moći da se prijave ako vaš LDAP server nije dostupan iz nekog razloga.',
     'ldap_username_field'       => 'Polje za korisničko ime',
     'ldap_lname_field'          => 'Prezime',
     'ldap_fname_field'          => 'LDAP Ime',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Očistite izbrisane zapise',
     'ldap_extension_warning' => 'Ne izgleda da je LDAP ekstenzija instalirana ili omogućena na ovom serveru. I dalje možete da sačuvate svoja podešavanja, ali ćete morati da omogućite LDAP ekstenziju za PHP pre nego što LDAP sinhronizacija ili prijavljivanje budu funkcionisali.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Testiraj LDAP sinhronizaciju',
+    'ldap_test_login' => ' Testiraj LDAP prijavu',
+    'ldap_username_placeholder' => 'LDAP korisničko ime',
+    'ldap_password_placeholder' => 'LDAP lozinka',
     'employee_number' => 'Broj zaposlenog',
     'create_admin_user' => 'Kreiraj korisnika ::',
     'create_admin_success' => 'Uspešno! Vaš admin korisnik je dodat!',
diff --git a/resources/lang/sr-CS/admin/settings/message.php b/resources/lang/sr-CS/admin/settings/message.php
index 2c45f0634..dc05beed5 100644
--- a/resources/lang/sr-CS/admin/settings/message.php
+++ b/resources/lang/sr-CS/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testiranje LDAP autentifikacije...',
         'authentication_success' => 'Autentifikacija korisnika na LDAP-u je uspešna!'
     ],
+    'labels' => [
+        'null_template' => 'Nije pronađen šablon oznake. Molim vas izaberite šablon.',
+        ],
     'webhook' => [
         'sending' => 'Slanje :app probne poruke...',
         'success' => 'Vaša :webhook_name integracija funkcioniše!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint vraća preusmerenje. Zbog bezbednosnih razloga, mi ne sledimo preusmerenja. Molim vas koristite direktnu krajnju tačku.',
         'error_misc' => 'Nešto nije u redu. :( ',
         'webhook_fail' => ' neuspelo obaveštavanje putem veb zakačke: Proverite da li je URL i dalje validan.',
+        'webhook_channel_not_found' => ' kanal veb zakačke nije pronađen.'
     ]
 ];
diff --git a/resources/lang/sr-CS/general.php b/resources/lang/sr-CS/general.php
index 07d6d8dc3..baa36ca0d 100644
--- a/resources/lang/sr-CS/general.php
+++ b/resources/lang/sr-CS/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Prilagodi izveštaj',
     'custom_report'         => 'Prilagođeni izveštaj o imovini',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Izvor podataka',
     'days'      			=> 'dana',
     'days_to_next_audit'    => 'Dana do sledeće revizije',
     'date'					=> 'Datum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Ime Prezime (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Prezime Prvo slovo imena (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Inicijal imena Prezime (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Prezime Prvo slovo imena (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Ime Prezime (Petar Petrović)',
     'lastname_firstname_display'	=> 'Prezime Ime (Petrović Petar)',
     'name_display_format'	=> 'Format prikaza imena',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Ne',
     'notes'  				=> 'Zabeleške',
     'note_added'            => 'Napomena je dodata',
+    'options'				=> 'Opcije',
+    'preview'				=> 'Pregled',
     'add_note'              => 'Dodaj napomenu',
     'note_edited'            => 'Napomena je izmenjena',
     'edit_note'              => 'Izmeni napomenu',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count potrošni materijal|:count potrošnih materijala',
         'components'  => ':count komponenta|:count komponenti',
     ],
+
     'more_info' => 'Više informacija',
     'quickscan_bulk_help' => 'Potvrđivanjem ovog polja će izmeniti zapis imovine kako bi se ažurirala ova nova lokacija. Ukoliko ostane nepotvrđeno lokacija će se evidentirati samo u zapisu popisa. Imajte na umu da, ukoliko je imovina zadužena, neće promeniti lokaciju osobe, imovine ili lokacije za koju je zadužena.',
     'whoops' => 'Ups!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Onemogući korisnicima da upravljaju svojim lozinkama',
     'user_managed_passwords_allow' => 'Omogući korisnicima da upravljaju svojim lozinkama',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Dodaj napomenu',
+    ],
+
 ];
diff --git a/resources/lang/sv-SE/admin/licenses/message.php b/resources/lang/sv-SE/admin/licenses/message.php
index b31b352be..1f3e73e64 100644
--- a/resources/lang/sv-SE/admin/licenses/message.php
+++ b/resources/lang/sv-SE/admin/licenses/message.php
@@ -50,7 +50,7 @@ return array(
 
     'checkin' => array(
         'error'   => 'Det gick inte att checka in licensen. Vänligen försök igen.',
-        'not_reassignable' => 'License not reassignable',
+        'not_reassignable' => 'Licens ej omfördelningsbar',
         'success' => 'Licens incheckad.'
     ),
 
diff --git a/resources/lang/sv-SE/admin/reports/general.php b/resources/lang/sv-SE/admin/reports/general.php
index 2a3d19229..bc8360ce9 100644
--- a/resources/lang/sv-SE/admin/reports/general.php
+++ b/resources/lang/sv-SE/admin/reports/general.php
@@ -14,9 +14,9 @@ return [
         'user_country' => 'Användarens land',
         'user_zip' => 'Användarens postnummer'
     ],
-    'open_saved_template' => 'Open Saved Template',
-    'save_template' =>  'Save Template',
-    'select_a_template' => 'Select a Template',
-    'template_name' => 'Template Name',
-    'update_template' => 'Update Template',
+    'open_saved_template' => 'Öppna sparad mall',
+    'save_template' =>  'Spara mall',
+    'select_a_template' => 'Välj mall',
+    'template_name' => 'Mallnamn',
+    'update_template' => 'Uppdatera mall',
 ];
diff --git a/resources/lang/sv-SE/admin/reports/message.php b/resources/lang/sv-SE/admin/reports/message.php
index 2800bbdf0..3f105a58a 100644
--- a/resources/lang/sv-SE/admin/reports/message.php
+++ b/resources/lang/sv-SE/admin/reports/message.php
@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'about_templates' => 'About Saved Templates',
-    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'about_templates' => 'Om sparade mallar',
+    'saving_templates_description' => 'Gör dina val, skriv sedan in namnet på din mall i rutan ovanför och tryck på "Spara mall"-knappen. Använd listrutan för att välja en tidigare sparad mall.',
     'create'  => [
-        'success' => 'Template saved successfully',
+        'success' => 'Mall sparad',
     ],
     'update' => [
-        'success' => 'Template updated successfully',
+        'success' => 'Mall uppdaterad',
     ],
     'delete' => [
-        'success' => 'Template deleted',
-        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+        'success' => 'Mall borttagen',
+        'no_delete_permission' => 'Mallen existerar inte eller så har du inte tillgång till att ta bort den.',
     ],
 ];
diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php
index 03c030ee2..a5547fd6e 100644
--- a/resources/lang/sv-SE/admin/settings/general.php
+++ b/resources/lang/sv-SE/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP-bindlösenord',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP-filter',
-    'ldap_pw_sync'              => 'LDAP-lösenordssynkronisering',
-    'ldap_pw_sync_help'         => 'Avmarkera den här rutan om du inte vill behålla LDAP-lösenord synkroniserade med lokala lösenord. Inaktivera detta innebär att dina användare kanske inte kan logga in om din LDAP-server inte är tillgänglig för någon anledning.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Användarnamn',
     'ldap_lname_field'          => 'Efternamn',
     'ldap_fname_field'          => 'LDAP förnamn',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Rensa borttagna poster',
     'ldap_extension_warning' => 'Det ser inte ut som LDAP-tillägget är installerat eller aktiverat på denna server. Du kan fortfarande spara dina inställningar, men du måste aktivera LDAP-tillägget för PHP innan LDAP-synkronisering eller inloggning fungerar.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Anställningsnummer',
     'create_admin_user' => 'Skapa användare ::',
     'create_admin_success' => 'Klart! Din administratörsanvändare har lagts till!',
@@ -361,7 +365,7 @@ return [
     'help_asterisk_bold'    => 'Text inlagd som <code>**text**</code> kommer att visas som fetstilad',
     'help_blank_to_use'     => 'Lämna tomt för att använda värdet från <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'asset_id'              => 'Asset ID',
+    'asset_id'              => 'Tillgångs-ID',
     'data'               => 'Data',
     'default'               => 'Standard',
     'none'                  => 'Inga',
@@ -390,7 +394,7 @@ return [
         'brand'             => 'sidfot, logotyp, tryck, tema, hud, rubrik, färger, färg, css',
         'general_settings'  => 'företagets support, signatur, acceptans, e-postformat, användarnamnsformat, bilder, per sida, miniatyr, eula, gravatar, tos, instrumentpanel, integritet',
         'groups'            => 'behörigheter, behörighetsgrupper, auktorisation',
-        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'labels'            => 'etiketter, streckkoder, streckkod, ark, utskrift, upc, qr, 1d, 2d',
         'localization'      => 'lokalisering, valuta, lokal, lokal, tidszon, tidszon, internationell, internatinalisering, språk, språk, översättning',
         'php_overview'      => 'phpinfo, system, info',
         'purge'             => 'radera permanent',
diff --git a/resources/lang/sv-SE/admin/settings/message.php b/resources/lang/sv-SE/admin/settings/message.php
index b924cbace..710e39cee 100644
--- a/resources/lang/sv-SE/admin/settings/message.php
+++ b/resources/lang/sv-SE/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testar LDAP-autentisering...',
         'authentication_success' => 'Användaren har autentiserats via LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Skickar :app testmeddelande...',
         'success' => 'Din :webhook_name-integration fungerar!',
@@ -45,6 +48,7 @@ return [
         'error' => 'Något gick snett! :app svarade med: :error_message',
         'error_redirect' => 'FEL: 301/302 :endpoint returnerar en redirect. Av säkerhetsskäl följer vi inte redirects. Använd den faktiska endpointen.',
         'error_misc' => 'Någonting gick snett :( ',
-        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_fail' => 'webhook-notis misslyckades. Kontrollera att URL\'en fortfarande är giltig.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/sv-SE/button.php b/resources/lang/sv-SE/button.php
index 94cd0f848..aff6e284e 100644
--- a/resources/lang/sv-SE/button.php
+++ b/resources/lang/sv-SE/button.php
@@ -15,7 +15,7 @@ return [
     'upload'                    => 'Ladda upp',
     'select_file'				=> 'Välj fil...',
     'select_files'				=> 'Välj filer...',
-    'generate_labels'           => '{1} Generera etikett|[2,*]] Generera etiketter',
+    'generate_labels'           => '{1} Generera etikett|[2,*] Generera etiketter',
     'send_password_link'        => 'Skicka länk för lösenordsåterställning',
     'go'                        => 'Kör',
     'bulk_actions'              => 'Massåtgärder',
diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php
index cb52ec78f..66b5a5230 100644
--- a/resources/lang/sv-SE/general.php
+++ b/resources/lang/sv-SE/general.php
@@ -59,9 +59,9 @@ return [
     'change' 		        => 'In/ut',
     'changeemail'  			=> 'Ändra E-postadress',
     'changepassword'  		=> 'Byt lösenord',
-    'checkin'  				=> 'Incheckning',
+    'checkin'  				=> 'Checka in',
     'checkin_from'  		=> 'Incheckning från',
-    'checkout'  			=> 'Utcheckning',
+    'checkout'  			=> 'Checka ut',
     'checkouts_count'       => 'Utcheckningar',
     'checkins_count'        => 'Incheckningar',
     'checkin_and_delete'  	=> 'Checka in och ta bort',
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Anpassa rapport',
     'custom_report'         => 'Anpassad tillgångsrapport',
     'dashboard'				=> 'Instrumentpanel',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dagar',
     'days_to_next_audit'    => 'Dagar till nästa inventering',
     'date'					=> 'Datum',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Förnamn + Efternamn (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  'Efternamn + Första initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Första initial + Efternamn (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Förnamn + Efternamn (Jane Smith)',
     'lastname_firstname_display'	=> 'Efternamn + Förnamn (Smith Jane)',
     'name_display_format'	=> 'Visningsformat för namn',
@@ -216,12 +218,14 @@ return [
     'no_results'			=> 'Inga resultat.',
     'no'  					=> 'Nej',
     'notes'  				=> 'Anteckningar',
-    'note_added'            => 'Note Added',
-    'add_note'              => 'Add Note',
-    'note_edited'            => 'Note Edited',
-    'edit_note'              => 'Edit Note',
-    'note_deleted'            => 'Note Deleted',
-    'delete_note'              => 'Delete Note',
+    'note_added'            => 'Notering tillagd',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Lägg till notering',
+    'note_edited'            => 'Notering redigerad',
+    'edit_note'              => 'Redigera notering',
+    'note_deleted'            => 'Notering borttagen',
+    'delete_note'              => 'Ta bort notering',
     'order_number'          => 'Ordernummer',
     'only_deleted'          => 'Endast borttagna tillgångar',
     'page_menu'				=> 'Visar _MENU_ objekt',
@@ -308,7 +312,7 @@ return [
     'username_format'		=> 'Användarnamnsformat',
     'username'              => 'Användarnamn',
     'update'                => 'Uppdatera',
-    'updating_item' => 'Updating :item',
+    'updating_item' => 'Uppdaterar :item',
     'upload_filetypes_help'      => 'Tillåtna filtyper är png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip och rar. Max tillåten uppladdningsstorlek är: storlek.',
     'uploaded'              => 'Uppladdad',
     'user'					=> 'Användare',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Förbrukningsvara|:count Förbrukningsvaror',
         'components'  => ':count Component|:count Komponenter',
     ],
+
     'more_info' => 'Mer information',
     'quickscan_bulk_help' => 'Markering av denna ruta kommer att justera tillgångshistoriken till att visa den nya platsen. Om du lämnar rutan omarkerad noteras platsen i inventeringsloggen. Observera att om tillgången är utcheckad kommer inte ändringar hos användaren, tillgången eller platsen att göras.',
     'whoops' => 'Hoppsan!',
@@ -572,9 +577,14 @@ return [
     'label' => 'Etikett',
     'import_asset_tag_exists' => 'En tillgång med tillgångstaggen :asset_tag finns redan och en uppdatering begärdes inte. Ingen ändring gjordes.',
     'countries_manually_entered_help' => 'Värden med en asterisk (*) matades in manuellt och matchar inte befintliga ISO 3166 rullgardinsvärden',
-    'accessories_assigned' => 'Assigned Accessories',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'accessories_assigned' => 'Tilldelade tillbehör',
+    'user_managed_passwords' => 'Lösenordshantering',
+    'user_managed_passwords_disallow' => 'Neka användare att hantera sina egna lösenord',
+    'user_managed_passwords_allow' => 'Tillåt användare att hantera sina egna lösenord',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
 
 ];
diff --git a/resources/lang/ta-IN/admin/settings/general.php b/resources/lang/ta-IN/admin/settings/general.php
index a09a11da9..9e1e3db67 100644
--- a/resources/lang/ta-IN/admin/settings/general.php
+++ b/resources/lang/ta-IN/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind கடவுச்சொல்',
     'ldap_basedn'               => 'அடிப்படை பிணை DN',
     'ldap_filter'               => 'LDAP வடிகட்டி',
-    'ldap_pw_sync'              => 'LDAP கடவுச்சொல் ஒத்திசைவு',
-    'ldap_pw_sync_help'         => 'உள்ளூர் கடவுச்சொற்களை ஒத்திசைத்த LDAP கடவுச்சொற்களை வைத்திருக்க விரும்பவில்லை என்றால், இந்த பெட்டியை தேர்வுநீக்கம் செய்யவும். இதன் விளைவாக உங்கள் LDAP சேவையகம் சில காரணங்களுக்காக கிடைக்கவில்லை என்றால் உங்கள் பயனர் உள்நுழைய முடியாது என்று அர்த்தம்.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'பயனாளர் புலம்',
     'ldap_lname_field'          => 'கடைசி பெயர்',
     'ldap_fname_field'          => 'LDAP முதல் பெயர்',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'நீக்கப்பட்ட ரெகார்டுகளை அகற்றவும்',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/ta-IN/admin/settings/message.php b/resources/lang/ta-IN/admin/settings/message.php
index 3ac95cdd7..2be88871e 100644
--- a/resources/lang/ta-IN/admin/settings/message.php
+++ b/resources/lang/ta-IN/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ta-IN/general.php b/resources/lang/ta-IN/general.php
index 2af760dca..79c6f1655 100644
--- a/resources/lang/ta-IN/general.php
+++ b/resources/lang/ta-IN/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'விருப்ப சொத்து அறிக்கை',
     'dashboard'				=> 'டாஷ்போர்டு',
+    'data_source'           => 'Data Source',
     'days'      			=> 'நாட்களில்',
     'days_to_next_audit'    => 'அடுத்த ஆடிட்டிற்கு நாட்கள்',
     'date'					=> 'தேதி',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'முதல் பெயர் கடைசி பெயர் (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'இல்லை',
     'notes'  				=> 'குறிப்புக்கள்',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'மேலும் தகவல்',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/th-TH/admin/settings/general.php b/resources/lang/th-TH/admin/settings/general.php
index b115cf7a1..088364c62 100644
--- a/resources/lang/th-TH/admin/settings/general.php
+++ b/resources/lang/th-TH/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'รหัสผ่าน LDAP Bind',
     'ldap_basedn'               => 'ฐานผูก DN',
     'ldap_filter'               => 'ตัวกรอง LDAP',
-    'ldap_pw_sync'              => 'การซิงค์รหัสผ่าน LDAP',
-    'ldap_pw_sync_help'         => 'ยกเลิกการเลือกช่องนี้หากคุณไม่ต้องการเก็บรหัสผ่าน LDAP ที่ซิงค์กับรหัสผ่านเฉพาะที่ การปิดใช้งานนี้หมายความว่าผู้ใช้ของคุณอาจไม่สามารถเข้าสู่ระบบได้หากเซิร์ฟเวอร์ LDAP ของคุณไม่สามารถเข้าถึงได้เนื่องจากเหตุผลบางประการ',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'ฟิลด์ชื่อผู้ใช้',
     'ldap_lname_field'          => 'นามสกุล',
     'ldap_fname_field'          => 'ชื่อแรกของ LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'ล้างข้อมูลที่ถูกลบ',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'หมายเลขพนักงาน',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/th-TH/admin/settings/message.php b/resources/lang/th-TH/admin/settings/message.php
index 2a80b8465..8296eebee 100644
--- a/resources/lang/th-TH/admin/settings/message.php
+++ b/resources/lang/th-TH/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/th-TH/general.php b/resources/lang/th-TH/general.php
index 20b7047f4..e6a04293b 100644
--- a/resources/lang/th-TH/general.php
+++ b/resources/lang/th-TH/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'รายงานทรัพย์สินแบบกำหนดเอง',
     'custom_report'         => 'รายงานทรัพย์สินแบบกำหนดเอง',
     'dashboard'				=> 'หน้าหลัก',
+    'data_source'           => 'Data Source',
     'days'      			=> 'วัน',
     'days_to_next_audit'    => 'วันที่จะตรวจสอบถัดไป',
     'date'					=> 'วันเดือนปี',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'ชื่อนามสกุล (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  'นามสกุล ชื่อ Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'อักษรต้นชื่อ.นามสกุล  (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'ไม่',
     'notes'  				=> 'หมายเหตุ',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'ข้อมูลเพิ่มเติม',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/tl-PH/admin/settings/general.php b/resources/lang/tl-PH/admin/settings/general.php
index 704e31a68..de012b899 100644
--- a/resources/lang/tl-PH/admin/settings/general.php
+++ b/resources/lang/tl-PH/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/tl-PH/admin/settings/message.php b/resources/lang/tl-PH/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/tl-PH/admin/settings/message.php
+++ b/resources/lang/tl-PH/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/tl-PH/general.php b/resources/lang/tl-PH/general.php
index 5053efe3b..df714b19c 100644
--- a/resources/lang/tl-PH/general.php
+++ b/resources/lang/tl-PH/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ang mga araw',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Ang mga Palatandaan',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/tr-TR/admin/settings/general.php b/resources/lang/tr-TR/admin/settings/general.php
index 857be1029..80a2f1c0d 100644
--- a/resources/lang/tr-TR/admin/settings/general.php
+++ b/resources/lang/tr-TR/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Parola',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP filtre',
-    'ldap_pw_sync'              => 'LDAP Parola Senkronu',
-    'ldap_pw_sync_help'         => 'LDAP şifrelerinin yerel parolalarla senkronize edilmesini istemiyorsanız, bu onay kutusunun işaretini kaldırın. Bu durumun devre dışı bırakılması, LDAP sunucunuza herhangi bir nedenle ulaşılamazsa, kullanıcılarınızın oturum açamayabileceği anlamına gelir.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Kullanıcı Adı Alanı',
     'ldap_lname_field'          => 'Soyadı',
     'ldap_fname_field'          => 'LDAP adı',
@@ -331,6 +331,10 @@ return [
     'purge_help' => 'Silinen kayıtları temizle',
     'ldap_extension_warning' => 'Bu sunucuda LDAP uzantısı yüklü veya etkin değil gibi görünüyor. Ayarlarınızı yine de kaydedebilirsiniz, ancak LDAP senkronizasyonu veya oturum açma işleminin çalışması için PHP için LDAP uzantısını etkinleştirmeniz gerekir.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Çalışan Sayısı',
     'create_admin_user' => 'Kullanıcı Oluştur::',
     'create_admin_success' => 'Başarılı! Admin kullanıcısı eklendi!',
diff --git a/resources/lang/tr-TR/admin/settings/message.php b/resources/lang/tr-TR/admin/settings/message.php
index a70c25df0..d1c982462 100644
--- a/resources/lang/tr-TR/admin/settings/message.php
+++ b/resources/lang/tr-TR/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP kimlik doğrulaması deneniyor...',
         'authentication_success' => 'LDAP kullanıcı kimliği başarıyla doğrulandı!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app test mesajı gönderiliyor...',
         'success' => ':webhook_name entegrasyonunuz çalışıyor!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'HATA: 301/302: bağlantı başka bir yere yönlendiriyor. Güvenlik nedeniyle yönlendirmeleri takip etmiyoruz. Lütfen direk adresi kullanın.',
         'error_misc' => 'Bir şeyler yanlış gitti. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/tr-TR/general.php b/resources/lang/tr-TR/general.php
index 040ed1b31..24cc016b7 100644
--- a/resources/lang/tr-TR/general.php
+++ b/resources/lang/tr-TR/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Raporu Özelleştir',
     'custom_report'         => 'Özel demirbaş raporu',
     'dashboard'				=> 'Pano',
+    'data_source'           => 'Data Source',
     'days'      			=> 'günler',
     'days_to_next_audit'    => 'Sonraki Denetime Günden Gün Sayısı',
     'date'					=> 'Tarih',
@@ -130,6 +131,7 @@ Context | Request Context
     'firstname_lastname_underscore_format' => 'Adı Soyadı (jane.smith@example.com)',
     'lastnamefirstinitial_format' =>  'Soyadı İlk Başlangıç (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Adın İlk Harfi ve Soyad (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'İsim Soyisim (Bahri SAGIRLI)',
     'lastname_firstname_display'	=> 'Soyisim İsim (SAGIRLI Bahri)',
     'name_display_format'	=> 'İsim görüntüleme şekli',
@@ -220,6 +222,8 @@ Context | Request Context
     'no'  					=> 'Hayır',
     'notes'  				=> 'Notlar',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -564,6 +568,7 @@ Context | Request Context
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Daha Fazla Bilgi',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -580,4 +585,9 @@ Context | Request Context
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/uk-UA/admin/settings/general.php b/resources/lang/uk-UA/admin/settings/general.php
index a3d6704e4..fc0581856 100644
--- a/resources/lang/uk-UA/admin/settings/general.php
+++ b/resources/lang/uk-UA/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP-зв\'язуйте пароль',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP-фільтр',
-    'ldap_pw_sync'              => 'Синхронізація паролів LDAP',
-    'ldap_pw_sync_help'         => 'Зніміть цей прапорець, якщо ви не хочете зберігати паролі LDAP з локальними паролями. Відключення означає, що ваші користувачі можуть не входити в систему, якщо ваш сервер LDAP недосяжний з певних причин.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Поле для імені користувача',
     'ldap_lname_field'          => 'Прізвище',
     'ldap_fname_field'          => 'Ім\'я в LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Знищити вилучені записи',
     'ldap_extension_warning' => 'Схоже, що розширення LDAP встановлено або увімкнено на цьому сервері. Ви все ще можете зберігати ваші налаштування, але вам потрібно буде увімкнути розширення LDAP для PHP перед синхронізацією LDAP або можливістю входу в систему.',
     'ldap_ad' => 'LDAP/реклама',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Номер співробітника',
     'create_admin_user' => 'Створити користувача ::',
     'create_admin_success' => 'Успіх! Ваш адміністратор був доданий!',
diff --git a/resources/lang/uk-UA/admin/settings/message.php b/resources/lang/uk-UA/admin/settings/message.php
index c4afe0fec..31efa9424 100644
--- a/resources/lang/uk-UA/admin/settings/message.php
+++ b/resources/lang/uk-UA/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Тестування авторизації LDAP...',
         'authentication_success' => 'Користувач успішно пройшов перевірку на зв\'язку з LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Відправка :app тестове повідомлення...',
         'success' => 'Ваша функція з інтеграцією :webhook_name!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ПОМИЛКА: 301/302 :endpoint повертає редиректор. З міркувань безпеки ми не слідуємо перенаправленням. Будь ласка, використовуйте фактичну кінцеву точку.',
         'error_misc' => 'Щось пішло не так. :( ',
         'webhook_fail' => 'не вдалося надіслати повідомлення webhook для перевірки: Переконайтесь, що посилання ще дійсне.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/uk-UA/general.php b/resources/lang/uk-UA/general.php
index 367fa8ab3..d7b2ef9e3 100644
--- a/resources/lang/uk-UA/general.php
+++ b/resources/lang/uk-UA/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Налаштувати звіт',
     'custom_report'         => 'Персоналізований звіт про активи',
     'dashboard'				=> 'Дашборд',
+    'data_source'           => 'Data Source',
     'days'      			=> 'днів',
     'days_to_next_audit'    => 'Дні до наступного аудиту',
     'date'					=> 'Дата',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Прізвище (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Прізвище Першою початковою (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Перше початкове ім\'я (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Прізвище (Jane Smith)',
     'lastname_firstname_display'	=> 'Прізвище Ім\'я (Ковальська Січка)',
     'name_display_format'	=> 'Формат відображення імені',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Ні',
     'notes'  				=> 'Примітки.',
     'note_added'            => 'Примітку додано',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Додати примітку',
     'note_edited'            => 'Нотатку відредаговано',
     'edit_note'              => 'Редагувати примітку',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count витратно|:count витратних товарів',
         'components'  => ':count компонент|:count компонентів',
     ],
+
     'more_info' => 'Детальніше',
     'quickscan_bulk_help' => 'Поставивши цю позначку, ви зміните запис активу, щоб він відображав нове розташування. Якщо залишити поле без позначки, розташування буде лише зафіксовано в журналі аудиту. Зверніть увагу, що якщо актив перебуває в статусі "видано", це не змінить місцеперебування особи, активу чи місця, куди його видано.',
     'whoops' => 'Упс!',
@@ -573,8 +578,13 @@ return [
     'import_asset_tag_exists' => 'Медіафайл з тегом активів :asset_tag вже існує, і оновлення не було запитано. Зміни не були зроблені.',
     'countries_manually_entered_help' => 'Значення з зірочкою (*) були введені вручну і не збігаються з існуючими значеннями ISO 3166',
     'accessories_assigned' => 'Призначені аксесуари',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'user_managed_passwords' => 'Керування паролями',
+    'user_managed_passwords_disallow' => 'Заборонити користувачам керувати власними паролями',
+    'user_managed_passwords_allow' => 'Дозволити користувачам керувати своїми паролями',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
 
 ];
diff --git a/resources/lang/ur-PK/admin/settings/general.php b/resources/lang/ur-PK/admin/settings/general.php
index 97567df8d..ad21bbb64 100644
--- a/resources/lang/ur-PK/admin/settings/general.php
+++ b/resources/lang/ur-PK/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/ur-PK/admin/settings/message.php b/resources/lang/ur-PK/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/ur-PK/admin/settings/message.php
+++ b/resources/lang/ur-PK/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/ur-PK/general.php b/resources/lang/ur-PK/general.php
index 77670b5a7..53482e853 100644
--- a/resources/lang/ur-PK/general.php
+++ b/resources/lang/ur-PK/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/vi-VN/admin/settings/general.php b/resources/lang/vi-VN/admin/settings/general.php
index f25a2a17a..b24870794 100644
--- a/resources/lang/vi-VN/admin/settings/general.php
+++ b/resources/lang/vi-VN/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'Bộ lọc LDAP',
-    'ldap_pw_sync'              => 'Đồng bộ hóa mật khẩu LDAP',
-    'ldap_pw_sync_help'         => 'Bỏ chọn hộp này nếu bạn không muốn giữ mật khẩu LDAP được đồng bộ với mật khẩu cục bộ. Tắt tính năng này có nghĩa là người dùng của bạn không thể đăng nhập nếu máy chủ LDAP của bạn không thể truy cập được vì một số lý do.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Trường tên người dùng',
     'ldap_lname_field'          => 'Họ',
     'ldap_fname_field'          => 'Tên LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Xóa các bản ghi đã xóa',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Mã số nhân viên',
     'create_admin_user' => 'Tạo người dùng ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/vi-VN/admin/settings/message.php b/resources/lang/vi-VN/admin/settings/message.php
index 740dc7080..15dbd59b6 100644
--- a/resources/lang/vi-VN/admin/settings/message.php
+++ b/resources/lang/vi-VN/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Đã xảy ra lỗi. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/vi-VN/general.php b/resources/lang/vi-VN/general.php
index ad868c615..3d754bfff 100644
--- a/resources/lang/vi-VN/general.php
+++ b/resources/lang/vi-VN/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Điều chỉnh báo cáo',
     'custom_report'         => 'Điều chỉnh báo cáo tài sản',
     'dashboard'				=> 'Bảng điều khiển',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ngày',
     'days_to_next_audit'    => 'Ngày kiểm tra tiếp theo',
     'date'					=> 'Ngày',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'Tên họ (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Tên của bạn (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'Ký tự đầu Tên Họ (jsmith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'Tên Họ (jane_smith)',
     'lastname_firstname_display'	=> 'Họ và tên (Smith Jane)',
     'name_display_format'	=> 'Định dạng hiển thị tên',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Ghi chú',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Xem thêm thông tin',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php
index bc02101cc..e88021a26 100644
--- a/resources/lang/zh-CN/admin/settings/general.php
+++ b/resources/lang/zh-CN/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP 密码',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP 过滤器',
-    'ldap_pw_sync'              => 'LDAP 密码同步',
-    'ldap_pw_sync_help'         => '若您不想让 LDAP 密码与系统密码同步，请勿勾选此项。取消同步设置将造成当系统与 LDAP 失去连接时，用户无法登录。',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => '用户名字段',
     'ldap_lname_field'          => '姓氏',
     'ldap_fname_field'          => 'LDAP用户名字字段',
@@ -330,6 +330,10 @@ return [
     'purge_help' => '清除已删除的记录',
     'ldap_extension_warning' => '它看起来不像在这个服务器上安装或启用LDAP扩展。 您仍然可以保存您的设置，但您需要启用 PHP 的 LDAP 扩展，然后LDAP 同步或登录才能正常工作。',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => '员工号码',
     'create_admin_user' => '创建用户 ::',
     'create_admin_success' => '成功！您的管理员用户已添加！',
diff --git a/resources/lang/zh-CN/admin/settings/message.php b/resources/lang/zh-CN/admin/settings/message.php
index c07939c88..00f97b020 100644
--- a/resources/lang/zh-CN/admin/settings/message.php
+++ b/resources/lang/zh-CN/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => '测试 LDAP 身份验证...',
         'authentication_success' => '用户已成功通过LDAP认证！'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => '正在发送 :app 测试消息...',
         'success' => '您的 :webhook_name 集成工作！',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => '错误：301/302 :endpoint 返回重定向。出于安全原因，我们不跟随重定向。请使用实际端点。',
         'error_misc' => '出错了:( ',
         'webhook_fail' => ' webhook 通知失败：请检查以确保URL仍然有效。',
+        'webhook_channel_not_found' => ' 未找到 webhook 频道。'
     ]
 ];
diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php
index cb3ab0a6e..8c39b3d8e 100644
--- a/resources/lang/zh-CN/general.php
+++ b/resources/lang/zh-CN/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => '自定义报告',
     'custom_report'         => '自定义资产报表',
     'dashboard'				=> '控制面板',
+    'data_source'           => 'Data Source',
     'days'      			=> '天数',
     'days_to_next_audit'    => '距离下一次盘点的天数',
     'date'					=> '日期',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => '名 姓，例如(jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  '姓氏首字母（smithj@example.com）',
     'firstintial_dot_lastname_format' => '缩写名 姓，例如(jsmith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> '名 姓，例如 (Jane Smith)',
     'lastname_firstname_display'	=> '姓 名，例如 (Smith Jane)',
     'name_display_format'	=> '姓名显示格式',
@@ -217,6 +219,8 @@ return [
     'no'  					=> '否',
     'notes'  				=> '备注',
     'note_added'            => '备注已添加',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => '添加备注',
     'note_edited'            => '备注已编辑',
     'edit_note'              => '编辑备注',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count 个耗材|:count 个耗材',
         'components'  => ':count 组件|:count 组件',
     ],
+
     'more_info' => '更多信息',
     'quickscan_bulk_help' => '勾选此框将编辑资产记录以反映其新的位置。不勾选则只会在盘点日志中记录该位置。注意，如果此资产已被借出，则不会更改其借出到的人员、资产或位置的位置。',
     'whoops' => '哎呀！',
@@ -573,8 +578,13 @@ return [
     'import_asset_tag_exists' => '资产标签为:asset_tag的资产已经存在，且未请求更新。没有做任何更改。',
     'countries_manually_entered_help' => '带星号(*) 的值是手动输入的，与现有的 ISO 3166 下拉值不匹配',
     'accessories_assigned' => '已分配的配件',
-    'user_managed_passwords' => 'Password Management',
-    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
-    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'user_managed_passwords' => '密码管理',
+    'user_managed_passwords_disallow' => '禁止用户管理自己的密码',
+    'user_managed_passwords_allow' => '允许用户管理自己的密码',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
 
 ];
diff --git a/resources/lang/zh-HK/admin/settings/general.php b/resources/lang/zh-HK/admin/settings/general.php
index 97567df8d..ad21bbb64 100644
--- a/resources/lang/zh-HK/admin/settings/general.php
+++ b/resources/lang/zh-HK/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/zh-HK/admin/settings/message.php b/resources/lang/zh-HK/admin/settings/message.php
index 98a889393..9be290174 100644
--- a/resources/lang/zh-HK/admin/settings/message.php
+++ b/resources/lang/zh-HK/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/zh-HK/general.php b/resources/lang/zh-HK/general.php
index 5eeed4447..36c9e22ac 100644
--- a/resources/lang/zh-HK/general.php
+++ b/resources/lang/zh-HK/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php
index 4efa16fda..10afedf6e 100644
--- a/resources/lang/zh-TW/admin/settings/general.php
+++ b/resources/lang/zh-TW/admin/settings/general.php
@@ -109,9 +109,8 @@ return [
     'ldap_pword'                => 'LDAP密碼',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP篩選',
-    'ldap_pw_sync'              => 'LDAP 密碼同步',
-    'ldap_pw_sync_help'         => '如果您不想要LDAP密碼與本地端密碼同步，請取消勾選。取消同步設定將造成當本地端與LDAP失去連線時，使用者無法登入。
-',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => '使用者名稱',
     'ldap_lname_field'          => '姓',
     'ldap_fname_field'          => 'LDAP 名',
@@ -331,6 +330,10 @@ return [
     'purge_help' => '清除已刪除的記錄',
     'ldap_extension_warning' => '似乎此伺服器上未安裝或啟用 LDAP 擴充套件。您仍然可以儲存您的設定，但在 LDAP 同步或登入將正常工作之前，您需要啟用 LDAP 擴充套件。',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => '員工編號',
     'create_admin_user' => '新增使用者 ::',
     'create_admin_success' => '成功! 您的管理員使用者已新增!',
diff --git a/resources/lang/zh-TW/admin/settings/message.php b/resources/lang/zh-TW/admin/settings/message.php
index 33ef18aa3..100d21db9 100644
--- a/resources/lang/zh-TW/admin/settings/message.php
+++ b/resources/lang/zh-TW/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP 授權測試中...',
         'authentication_success' => '用戶成功透過 LDAP 驗證'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => '正在傳送 :app 測試訊息...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => '發生了一些錯誤。 :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php
index 1eaa5fb03..6943f52e1 100644
--- a/resources/lang/zh-TW/general.php
+++ b/resources/lang/zh-TW/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => '自訂報告',
     'custom_report'         => '自訂資產報告',
     'dashboard'				=> '儀表板',
+    'data_source'           => 'Data Source',
     'days'      			=> '天',
     'days_to_next_audit'    => '下次稽核時間（天）',
     'date'					=> '日期',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => '名字姓氏，例如（jane_smith@example.com）',
     'lastnamefirstinitial_format' =>  '姓氏首字母（smithj@example.com）',
     'firstintial_dot_lastname_format' => '姓氏與名首子母 (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> '名稱及姓氏(小明 王)',
     'lastname_firstname_display'	=> '姓氏及名稱(王 小明)',
     'name_display_format'	=> '名稱顯示格式',
@@ -217,6 +219,8 @@ return [
     'no'  					=> '否',
     'notes'  				=> '備註',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => '更多資訊',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/lang/zu-ZA/admin/settings/general.php b/resources/lang/zu-ZA/admin/settings/general.php
index 380c6c3e4..bdd0df7e3 100644
--- a/resources/lang/zu-ZA/admin/settings/general.php
+++ b/resources/lang/zu-ZA/admin/settings/general.php
@@ -109,8 +109,8 @@ return [
     'ldap_pword'                => 'I-LDAP Ukubopha Iphasiwedi',
     'ldap_basedn'               => 'I-Base Bind DN',
     'ldap_filter'               => 'Isihlungi se-LDAP',
-    'ldap_pw_sync'              => 'Ukuvumelanisa kwephasiwedi ye-LDAP',
-    'ldap_pw_sync_help'         => 'Ungawukhipheli leli bhokisi uma ungafisi ukugcina amaphasiwedi e-LDAP avumelanisiwe namaphasiwedi wendawo. Ukukhubaza lokhu kusho ukuthi abasebenzisi bakho bangakwazi ukungena ngemvume uma ngabe iseva yakho ye-LDAP ayitholakali ngesizathu esithile.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Insimu yomsebenzisi',
     'ldap_lname_field'          => 'Isibongo',
     'ldap_fname_field'          => 'Igama Lokuqala LDAP',
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Phenya Amarekhodi Asusiwe',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/lang/zu-ZA/admin/settings/message.php b/resources/lang/zu-ZA/admin/settings/message.php
index f18bfb63f..893d17ff2 100644
--- a/resources/lang/zu-ZA/admin/settings/message.php
+++ b/resources/lang/zu-ZA/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -46,5 +49,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];
diff --git a/resources/lang/zu-ZA/general.php b/resources/lang/zu-ZA/general.php
index 1fa19640f..60e850215 100644
--- a/resources/lang/zu-ZA/general.php
+++ b/resources/lang/zu-ZA/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Umbiko wezezimali ngokwezifiso',
     'dashboard'				=> 'Ideshibhodi',
+    'data_source'           => 'Data Source',
     'days'      			=> 'izinsuku',
     'days_to_next_audit'    => 'Izinsuku kuya ku-Audit Elandelayo',
     'date'					=> 'Usuku',
@@ -127,6 +128,7 @@ return [
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
     'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
     'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
     'name_display_format'	=> 'Name Display Format',
@@ -217,6 +219,8 @@ return [
     'no'  					=> 'Cha',
     'notes'  				=> 'Amanothi',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
@@ -561,6 +565,7 @@ return [
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
     ],
+
     'more_info' => 'Ulwazi oluningi',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',
@@ -577,4 +582,9 @@ return [
     'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
 ];
diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index d02f842fe..7a6ad69da 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -115,7 +115,7 @@
           <div class="col-md-8">
             <input class="form-control" type="text" name="gravatar" id="gravatar" value="{{ old('gravatar', $user->gravatar) }}" />
             {!! $errors->first('gravatar', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-            <p>
+            <p style="padding-top: 3px;">
               <img src="//secure.gravatar.com/avatar/{{ md5(strtolower(trim($user->gravatar))) }}" width="30" height="30" alt="{{ $user->present()->fullName() }} avatar image">
               {!! trans('general.gravatar_url') !!}
             </p>
diff --git a/resources/views/asset_maintenances/view.blade.php b/resources/views/asset_maintenances/view.blade.php
index 58abdbc7f..d46d46d48 100644
--- a/resources/views/asset_maintenances/view.blade.php
+++ b/resources/views/asset_maintenances/view.blade.php
@@ -9,95 +9,127 @@ use Carbon\Carbon;
 @parent
 @stop
 
+@section('header_right')
+  <div class="pull-right">
+    <a href="{{ route('maintenances.edit', $assetMaintenance) }}" class="btn btn-default pull-right">
+      {{ trans('general.update') }}</a>
+
+    <a href="{{ route('maintenances.index') }}" class="btn btn-primary text-right" style="margin-right: 10px;">{{ trans('general.back') }}</a>
+  </div>
+@stop
+
+
 {{-- Page content --}}
 @section('content')
-<div class="row header">
-  <div class="col-md-12">
-    <h2 class="title">
-      {{ trans('admin/asset_maintenances/general.view') }}
-      {{ " - " . $assetMaintenance->title }}
-    </h2>
+  <div class="row">
+    <div class="col-md-9">
 
-    <div class="btn-group pull-right">
-      <div class="dropdown">
-        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu1">
-          <li role="presentation"><a href="{{ route('maintenances.update', $assetMaintenance->id) }}">{{ trans('admin/asset_maintenances/general.edit') }}</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>
+      <div class="box box-default">
+        <div class="box-body">
+          <div class="row-new-striped">
+            <div class="row">
 
-<div class="user-profile ">
-  <div class="row profile">
-    <div class="col-md-9 bio">
-      <!-- 1st Row Begin -->
-      <div class="row">
-        <div class="col-md-12 col-sm-12" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}: </strong>
-          {{ $assetMaintenance->asset_maintenance_type }}
-        </div>
-      </div>
-      <!-- 1st Row End -->
+                <div class="col-md-3">
+                  {{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}
+                </div>
+                <div class="col-md-9">
+                  {{ $assetMaintenance->asset_maintenance_type }}
+                </div>
+
+            </div> <!-- /row -->
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('general.asset') }}
+              </div>
+              <div class="col-md-9">
+                <a href="{{ route('hardware.show', $assetMaintenance->asset_id) }}">
+                  {{ $assetMaintenance->asset->present()->fullName }}
+                </a>
+              </div>
+            </div> <!-- /row -->
+
+
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('general.supplier') }}
+              </div>
+              <div class="col-md-9">
+                <a href="{{ route('suppliers.show', $assetMaintenance->supplier_id) }}">
+                  {{ $assetMaintenance->supplier->name }}
+                </a>
+              </div>
+            </div> <!-- /row -->
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.start_date') }}
+              </div>
+              <div class="col-md-9">
+                {{ Helper::getFormattedDateObject($assetMaintenance->start_date, 'date', false) }}
+              </div>
+            </div> <!-- /row -->
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.completion_date') }}
+              </div>
+              <div class="col-md-9">
+                @if ($assetMaintenance->completion_date)
+                  {{ Helper::getFormattedDateObject($assetMaintenance->completion_date, 'date', false) }}
+                @else
+                  {{ trans('admin/asset_maintenances/message.asset_maintenance_incomplete') }}
+                @endif
+              </div>
+            </div> <!-- /row -->
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}
+              </div>
+              <div class="col-md-9">
+                {{ $assetMaintenance->asset_maintenance_time }}
+              </div>
+            </div> <!-- /row -->
+
+            @if ($assetMaintenance->cost > 0)
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.cost') }}
+              </div>
+              <div class="col-md-9">
+                {{ trans( 'general.currency' ) . Helper::formatCurrencyOutput($assetMaintenance->cost) }}
+              </div>
+            </div> <!-- /row -->
+            @endif
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.is_warranty') }}
+              </div>
+              <div class="col-md-9">
+                {{ $assetMaintenance->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}
+              </div>
+            </div> <!-- /row -->
+
+            @if ($assetMaintenance->notes)
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.notes') }}
+              </div>
+              <div class="col-md-9">
+                {!! nl2br(Helper::parseEscapedMarkedownInline($assetMaintenance->notes)) !!}
+              </div>
+            </div> <!-- /row -->
+            @endif
+
+
+          </div><!-- /row-new-striped -->
+      </div><!-- /box-body -->
+    </div><!-- /box -->
+
+    </div> <!-- col-md-9  end -->
+  </div> <!-- row  end -->
 
-      <!-- 2nd Row Begin -->
-      <div class="row">
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/table.asset_name') }}: </strong>
-          <a href="{{ route('hardware.show', $assetMaintenance->asset_id) }}">
-            {{ $assetMaintenance->asset->name }}
-          </a>
-        </div>
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('general.supplier') }}: </strong>
-          <a href="{{ route('suppliers.show', $assetMaintenance->supplier_id) }}">
-            {{ $assetMaintenance->supplier->name }}
-          </a>
-        </div>
-      </div>
-      <!-- 2nd Row End -->
-      <!-- 3rd Row Begin -->
-      <div class="row">
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.start_date') }}: </strong>
-            <?php $startDate = Carbon::parse($assetMaintenance->start_date); ?>
-          {{ $startDate->toDateString() }}
-        </div>
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.completion_date') }}: </strong>
-          {{ $completionDate = $assetMaintenance->completion_date }}
-          {{ $completionDate ? $completionDate : trans('admin/asset_maintenances/message.asset_maintenance_incomplete') }}
-        </div>
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}: </strong>
-          {{ $assetMaintenance->asset_maintenance_time }}
-        </div>
-      </div>
-      <!-- 3rd Row End -->
-      <!-- 4th Row Begin -->
-      <div class="row">
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.cost') }}: </strong>
-          {{ trans( 'general.currency' ) . Helper::formatCurrencyOutput($assetMaintenance->cost) }}
-        </div>
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.is_warranty') }}: </strong>
-          {{ $assetMaintenance->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}
-        </div>
-      </div>
-      <!-- 4th Row End -->
-      <!-- 5th Row Begin -->
-      <div class="row">
-        <div class="col-md-12 col-sm-12" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.notes') }}: </strong>
-          {!! nl2br(Helper::parseEscapedMarkedownInline($assetMaintenance->notes)) !!}
-        </div>
-      </div>
-      <!-- 5th Row End -->
-    </div> <!-- col-md-9 bio end -->
-  </div> <!-- row profile end -->
-</div> <!-- user-profile end -->
 @stop
diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php
index 2801a9ed8..baeb56d59 100644
--- a/resources/views/hardware/audit.blade.php
+++ b/resources/views/hardware/audit.blade.php
@@ -21,7 +21,7 @@
         <div class="col-md-8 col-md-offset-2">
             <div class="box box-default">
 
-                <form method="POST" action="{{ route('asset.audit.store', $asset->id) }}" accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
+                <form method="POST" action="{{ route('asset.audit.store', $asset) }}" accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
 
                     <div class="box-header with-border">
                         <h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
@@ -54,6 +54,8 @@
 
 
                     <!-- Asset Name -->
+
+                        @if ($asset->name)
                         <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
                             <label for="name" class="col-sm-3 control-label">
                                 {{ trans('general.name') }}
@@ -62,6 +64,7 @@
                                 <p class="form-control-static">{{ $asset->name }}</p>
                             </div>
                         </div>
+                        @endif
 
                         <!-- Locations -->
                     @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index efd5d24b9..fa2c008c9 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -5,7 +5,7 @@
     'topSubmit' => true,
     'helpText' => trans('help.assets'),
     'helpPosition' => 'right',
-    'formAction' => ($item->id) ? route('hardware.update', ['hardware' => $item->id]) : route('hardware.store'),
+    'formAction' => ($item->id) ? route('hardware.update', $item) : route('hardware.store'),
     'index_route' => 'hardware.index',
     'options' => [
                 'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'assets']),
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 1fb0acfb4..531bfa63f 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -181,7 +181,7 @@
                                 @if ($asset->deleted_at=='')
                                     @can('update', $asset)
                                         <div class="col-md-12 hidden-print" style="padding-top: 5px;">
-                                            <a href="{{ route('hardware.edit', $asset->id) }}" class="btn btn-sm btn-warning btn-social btn-block hidden-print">
+                                            <a href="{{ route('hardware.edit', $asset) }}" class="btn btn-sm btn-warning btn-social btn-block hidden-print">
                                                 <x-icon type="edit" />
                                                 {{ trans('admin/hardware/general.edit') }}
                                             </a>
diff --git a/resources/views/kits/model-edit.blade.php b/resources/views/kits/model-edit.blade.php
index 8a843d401..4372265b9 100644
--- a/resources/views/kits/model-edit.blade.php
+++ b/resources/views/kits/model-edit.blade.php
@@ -1,12 +1,13 @@
 @extends('layouts/edit-form', [
     'createText' => trans('admin/kits/general.append_model'),
     'updateText' => trans('admin/kits/general.update_appended_model'),
-    'formAction' => (isset($item->id)) ? route('kits.models.update', ['kit_id' => $kit->id, 'model_id' => $item->model_id]) : route('kits.models.store', ['kit_id' => $kit->id]),
+    'formAction' => (isset($item->id)) ? route('kits.models.update', ['kit' => $kit->id, 'model_id' => $item->model_id]) : route('kits.models.store', ['kit_id' => $kit->id]),
 ])
 
 {{-- Page content --}}
 @section('inputFields')
 @include ('partials.forms.edit.model-select', ['translated_name' => trans('admin/hardware/form.model'), 'fieldname' => 'model_id', 'required' => 'true'])
+
 <div class="form-group {{ $errors->has('quantity') ? ' has-error' : '' }}">
     <label for="quantity" class="col-md-3 control-label">{{ trans('general.quantity') }}</label>
     <div class="col-md-7 required">
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index eb02277a0..5740fb939 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -214,7 +214,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
                                     </a>
                                     <ul class="dropdown-menu">
                                         @can('create', \App\Models\Asset::class)
-                                            <li {!! (Request::is('hardware/create') ? 'class="active>"' : '') !!}>
+                                            <li{!! (Request::is('hardware/create') ? ' class="active">' : '') !!}>
                                                 <a href="{{ route('hardware.create') }}" tabindex="-1">
                                                     <x-icon type="assets" />
                                                     {{ trans('general.asset') }}
@@ -222,7 +222,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
                                             </li>
                                         @endcan
                                         @can('create', \App\Models\License::class)
-                                            <li {!! (Request::is('licenses/create') ? 'class="active"' : '') !!}>
+                                            <li{!! (Request::is('licenses/create') ? ' class="active"' : '') !!}>
                                                 <a href="{{ route('licenses.create') }}" tabindex="-1">
                                                     <x-icon type="licenses" />
                                                     {{ trans('general.license') }}
@@ -813,7 +813,6 @@ dir="{{ Helper::determineLanguageDirection() }}">
             <!-- Content Wrapper. Contains page content -->
 
             <div class="content-wrapper" role="main" id="setting-list">
-                <barepay></barepay>
 
                 @if ($debug_in_production)
                     <div class="row" style="margin-bottom: 0px; background-color: red; color: white; font-size: 15px;">
@@ -827,21 +826,68 @@ dir="{{ Helper::determineLanguageDirection() }}">
                 @endif
 
                 <!-- Content Header (Page header) -->
-                <section class="content-header" style="padding-bottom: 30px;">
-                    <h1 class="pull-left pagetitle">@yield('title') </h1>
+                <section class="content-header">
 
-                    @if (isset($helpText))
-                        @include ('partials.more-info',
-                                               [
-                                                   'helpText' => $helpText,
-                                                   'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left'
-                                               ])
-                    @endif
-                    <div class="pull-right">
-                        @yield('header_right')
+
+                    <div class="row">
+                        <div class="col-md-12">
+
+                        <style>
+                            .breadcrumb-item {
+                                display: inline;
+                                list-style: none;
+                            }
+                        </style>
+
+                            <h1 class="pull-left pagetitle" style="font-size: 22px; margin-top: 10px;">
+
+                                @if (Breadcrumbs::has() && (Breadcrumbs::current()->count() > 1))
+                                    <ul style="padding-left: 0;">
+
+                                    @foreach (Breadcrumbs::current() as $crumbs)
+                                        @if ($crumbs->url() && !$loop->last)
+                                            <li class="breadcrumb-item">
+                                                <a href="{{ $crumbs->url() }}">
+                                                    @if ($loop->first)
+                                                        {!! Blade::render($crumbs->title()) !!}
+                                                    @else
+                                                        {{ Blade::render($crumbs->title()) }}
+                                                    @endif
+                                                </a>
+                                                <x-icon type="angle-right" />
+                                            </li>
+                                        @elseif (is_null($crumbs->url()) && !$loop->last)
+                                            <li class="breadcrumb-item active">
+                                                {{ $crumbs->title() }}
+                                                <x-icon type="angle-right" />
+                                            </li>
+                                       @else
+                                            <li class="breadcrumb-item active">
+                                                {{ $crumbs->title() }}
+                                            </li>
+                                        @endif
+                                    @endforeach
+
+                                    </ul>
+                                @else
+                                    @yield('title')
+                                @endif
+
+                            </h1>
+
+                                @if (isset($helpText))
+                                    @include ('partials.more-info',
+                                                           [
+                                                               'helpText' => $helpText,
+                                                               'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left'
+                                                           ])
+                                @endif
+                                <div class="pull-right">
+                                    @yield('header_right')
+                                </div>
+
+                        </div>
                     </div>
-
-
                 </section>
 
 
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 099640f0b..36ac4de50 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -290,9 +290,6 @@
                 var dest = 'admin/groups';
             }
 
-            if (dest =='maintenances') {
-                var dest = 'hardware/maintenances';
-            }
 
             if(element_name != '') {
                 dest = dest + '/' + row.owner_id + '/' + element_name;
diff --git a/resources/views/partials/more-info.blade.php b/resources/views/partials/more-info.blade.php
index 370eb350d..1ba80c160 100644
--- a/resources/views/partials/more-info.blade.php
+++ b/resources/views/partials/more-info.blade.php
@@ -1,4 +1,4 @@
-<a style="padding-left: 10px; font-size: 18px;" class="text-dark-gray hidden-print" data-trigger="focus" tabindex="0" role="button" data-toggle="popover" title="{{ trans('general.more_info') }}" data-placement="right" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Help Info Missing'  }}">
-    <x-icon type="more-info" />
+<a style="padding-left: 5px; font-size: 15px;" class="text-dark-gray hidden-print" data-trigger="focus" tabindex="0" role="button" data-toggle="popover" title="{{ trans('general.more_info') }}" data-placement="right" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Help Info Missing'  }}">
+    <x-icon type="more-info" style="padding-top: 14px;" />
     <span class="sr-only">{{ trans('general.moreinfo') }}</span>
 </a>
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 766d0beb9..e7802651b 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -33,7 +33,7 @@
 @section('content')
 
 <div class="row">
-    <div class="col-md-8 col-md-offset-1">
+    <div class="col-md-9">
 
         <form
             method="POST"
@@ -48,13 +48,15 @@
         <div class="box box-default">
             <div class="box-header with-border">
                 @if (request()->routeIs('reports/custom') || request()->routeIs('report-templates.show'))
-                    <h2 class="box-title">
+                    <h2 class="box-title" style="padding-top: 7px;">
                         {{ trans('general.customize_report') }}
                     </h2>
+
                 @endif
+
                 @if (request()->routeIs('report-templates.edit'))
                     <div class="row">
-                        <div class="col-md-7 col-md-offset-5">
+                        <div class="col-md-7 col-md-offset-4">
                             <div class="{{ $errors->has('name') ? ' has-error' : '' }}">
                                 <label
                                     for="name"
@@ -78,29 +80,7 @@
                         </div>
                     </div>
                 @endif
-                @if (request()->routeIs('report-templates.show'))
-                    <div class="box-tools pull-right">
-                        <a
-                            href="{{ route('report-templates.edit', $template) }}"
-                            class="btn btn-sm btn-warning"
-                            data-tooltip="true"
-                            title="{{ trans('admin/reports/general.update_template') }}"
-                        >
-                            <i class="fas fa-pencil-alt" aria-hidden="true"></i>
-                            <span class="sr-only">{{ trans('general.update') }}</span>
-                        </a>
-                        <button
-                            class="btn btn-sm btn-danger delete-asset"
-                            data-toggle="modal"
-                            data-title="{{ trans('general.delete') }}"
-                            data-content="{{ trans('general.delete_confirm', ['item' => $template->name]) }}"
-                            data-target="#dataConfirmModal"
-                            type="button"
-                        >
-                            <i class="fas fa-trash" aria-hidden="true"></i><span class="sr-only">{{ trans('general.delete') }}</span>
-                        </button>
-                    </div>
-                @endif
+
         </div><!-- /.box-header -->
 
         <div class="box-body">
@@ -636,7 +616,7 @@
     </div>
 
     <!-- Saved Reports right column -->
-    <div class="col-md-2">
+    <div class="col-md-3">
         @if (! request()->routeIs('report-templates.edit'))
             <div class="form-group">
                 <label for="saved_report_select">{{ trans('admin/reports/general.open_saved_template') }}</label>
@@ -653,6 +633,41 @@
                     @endforeach
                 </select>
             </div>
+
+            <div class="row">
+                <div class="col-md-12">
+                @if (request()->routeIs('report-templates.show'))
+                        <a
+                                href="{{ route('report-templates.edit', $template) }}"
+                                class="btn btn-sm btn-warning btn-social btn-block"
+                                data-tooltip="true"
+                                title="{{ trans('admin/reports/general.update_template') }}"
+                                style="margin-bottom: 5px;"
+                        >
+                            <x-icon type="edit" />
+                            {{ trans('general.update') }}
+                        </a>
+
+                    <span data-tooltip="true" title="{{ trans('general.delete') }}">
+                        <a href="#"
+                                class="btn btn-sm btn-danger btn-social btn-block"
+                                data-toggle="modal"
+                                data-title="{{ trans('general.delete') }}"
+                                data-content="{{ trans('general.delete_confirm', ['item' => $template->name]) }}"
+                                data-target="#dataConfirmModal"
+                                type="button"
+                        >
+
+                                <x-icon type="delete" />
+                                {{ trans('general.delete') }}
+
+                        </a>
+                    </span>
+
+
+                @endif
+                </div>
+            </div>
         @endif
         @if (request()->routeIs('reports/custom'))
             <hr>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 0d53c7ad2..aee61a40a 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -863,7 +863,7 @@
                   </td>
                   <td class="hidden-print col-md-2">
                     @can('update', $license)
-                      <a href="{{ route('licenses.checkin', array('licenseSeatId'=> $license->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
+                      <a href="{{ route('licenses.checkin', $license->pivot->id, ['backto'=>'user']) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
                      @endcan
                   </td>
                 </tr>
diff --git a/routes/web.php b/routes/web.php
index fac651dea..a3df05ac7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,6 +2,9 @@
 
 use App\Http\Controllers\Account;
 use App\Http\Controllers\ActionlogController;
+use App\Http\Controllers\Auth\ForgotPasswordController;
+use App\Http\Controllers\Auth\LoginController;
+use App\Http\Controllers\Auth\ResetPasswordController;
 use App\Http\Controllers\CategoriesController;
 use App\Http\Controllers\CompaniesController;
 use App\Http\Controllers\DashboardController;
@@ -9,25 +12,22 @@ use App\Http\Controllers\DepartmentsController;
 use App\Http\Controllers\DepreciationsController;
 use App\Http\Controllers\GroupsController;
 use App\Http\Controllers\HealthController;
-use App\Http\Controllers\ImportsController;
 use App\Http\Controllers\LabelsController;
 use App\Http\Controllers\LocationsController;
 use App\Http\Controllers\ManufacturersController;
 use App\Http\Controllers\ModalController;
 use App\Http\Controllers\NotesController;
 use App\Http\Controllers\ProfileController;
-use App\Http\Controllers\ReportsController;
 use App\Http\Controllers\ReportTemplatesController;
+use App\Http\Controllers\ReportsController;
 use App\Http\Controllers\SettingsController;
 use App\Http\Controllers\StatuslabelsController;
 use App\Http\Controllers\SuppliersController;
 use App\Http\Controllers\ViewAssetsController;
-use App\Http\Controllers\Auth\LoginController;
-use App\Http\Controllers\Auth\ForgotPasswordController;
-use App\Http\Controllers\Auth\ResetPasswordController;
 use App\Livewire\Importer;
+use App\Models\ReportTemplate;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\Auth;
+use Tabuna\Breadcrumbs\Trail;
 
 Route::group(['middleware' => 'auth'], function () {
     /*
@@ -102,37 +102,27 @@ Route::group(['middleware' => 'auth'], function () {
         Route::post('{manufacturers_id}/restore', [ManufacturersController::class, 'restore'] )->name('restore/manufacturer');
     });
 
-    Route::resource('manufacturers', ManufacturersController::class, [
-        'parameters' => ['manufacturer' => 'manufacturers_id'],
-    ]);
+    Route::resource('manufacturers', ManufacturersController::class);
 
     /*
     * Suppliers
     */
-    Route::resource('suppliers', SuppliersController::class, [
-        'parameters' => ['supplier' => 'supplier_id'],
-    ]);
+    Route::resource('suppliers', SuppliersController::class);
 
     /*
     * Depreciations
      */
-    Route::resource('depreciations', DepreciationsController::class, [
-         'parameters' => ['depreciation' => 'depreciation_id'],
-     ]);
+    Route::resource('depreciations', DepreciationsController::class);
 
     /*
     * Status Labels
      */
-    Route::resource('statuslabels', StatuslabelsController::class, [
-          'parameters' => ['statuslabel' => 'statuslabel_id'],
-      ]);
+    Route::resource('statuslabels', StatuslabelsController::class);
 
     /*
     * Departments
     */
-    Route::resource('departments', DepartmentsController::class, [
-        'parameters' => ['department' => 'department_id'],
-    ]);
+    Route::resource('departments', DepartmentsController::class);
 });
 
 /*
@@ -179,46 +169,137 @@ Route::group(['middleware' => 'auth'], function () {
 */
 
 Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser']], function () {
-    Route::get('settings', [SettingsController::class, 'getSettings'])->name('settings.general.index');
-    Route::post('settings', [SettingsController::class, 'postSettings'])->name('settings.general.save');
 
-    Route::get('branding', [SettingsController::class, 'getBranding'])->name('settings.branding.index');
-    Route::post('branding', [SettingsController::class, 'postBranding'])->name('settings.branding.save');
+    Route::get('settings', [SettingsController::class, 'getSettings'])
+        ->name('settings.general.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.general_title'), route('settings.general.index')));
 
-    Route::get('security', [SettingsController::class, 'getSecurity'])->name('settings.security.index');
-    Route::post('security', [SettingsController::class, 'postSecurity'])->name('settings.security.save');
+    Route::post('settings', [SettingsController::class, 'postSettings'])
+        ->name('settings.general.save');
 
-    Route::get('groups', [GroupsController::class, 'index'])->name('settings.groups.index');
+    Route::get('branding', [SettingsController::class, 'getBranding'])
+        ->name('settings.branding.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.branding_title'), route('settings.branding.index')));
 
-    Route::get('localization', [SettingsController::class, 'getLocalization'])->name('settings.localization.index');
-    Route::post('localization', [SettingsController::class, 'postLocalization'])->name('settings.localization.save');
+    Route::post('branding', [SettingsController::class, 'postBranding'])
+        ->name('settings.branding.save');
 
-    Route::get('notifications', [SettingsController::class, 'getAlerts'])->name('settings.alerts.index');
-    Route::post('notifications', [SettingsController::class, 'postAlerts'])->name('settings.alerts.save');
+    Route::get('security', [SettingsController::class, 'getSecurity'])
+        ->name('settings.security.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.security_title'), route('settings.security.index')));
 
-    Route::get('slack', [SettingsController::class, 'getSlack'])->name('settings.slack.index');
-    Route::post('slack', [SettingsController::class, 'postSlack'])->name('settings.slack.save');
+    Route::post('security', [SettingsController::class, 'postSecurity'])
+        ->name('settings.security.save');
 
-    Route::get('asset_tags', [SettingsController::class, 'getAssetTags'])->name('settings.asset_tags.index');
-    Route::post('asset_tags', [SettingsController::class, 'postAssetTags'])->name('settings.asset_tags.save');
+    Route::get('localization', [SettingsController::class, 'getLocalization'])
+        ->name('settings.localization.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.localization_title'), route('settings.localization.index')));
 
-    Route::get('labels', [SettingsController::class, 'getLabels'])->name('settings.labels.index');
-    Route::post('labels', [SettingsController::class, 'postLabels'])->name('settings.labels.save');
+    Route::post('localization', [SettingsController::class, 'postLocalization'])
+        ->name('settings.localization.save');
 
-    Route::get('ldap', [SettingsController::class, 'getLdapSettings'])->name('settings.ldap.index');
-    Route::post('ldap', [SettingsController::class, 'postLdapSettings'])->name('settings.ldap.save');
+    Route::get('notifications', [SettingsController::class, 'getAlerts'])
+        ->name('settings.alerts.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.alert_title'), route('settings.alerts.index')));
 
-    Route::get('phpinfo', [SettingsController::class, 'getPhpInfo'])->name('settings.phpinfo.index');
+    Route::post('notifications', [SettingsController::class, 'postAlerts'])
+        ->name('settings.alerts.save');
 
-    Route::get('oauth', [SettingsController::class, 'api'])->name('settings.oauth.index');
+    Route::get('slack', [SettingsController::class, 'getSlack'])
+        ->name('settings.slack.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.webhook_title'), route('settings.slack.index')));
+
+    Route::post('slack', [SettingsController::class, 'postSlack'])
+        ->name('settings.slack.save');
+
+    Route::get('asset_tags', [SettingsController::class, 'getAssetTags'])
+        ->name('settings.asset_tags.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.asset_tag_title'), route('settings.asset_tags.index')));
+
+    Route::post('asset_tags', [SettingsController::class, 'postAssetTags'])
+        ->name('settings.asset_tags.save');
+
+    Route::get('labels', [SettingsController::class, 'getLabels'])
+        ->name('settings.labels.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.labels_title'), route('settings.labels.index')));
+
+    Route::post('labels', [SettingsController::class, 'postLabels'])
+        ->name('settings.labels.save');
+
+    Route::get('ldap', [SettingsController::class, 'getLdapSettings'])
+        ->name('settings.ldap.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.ldap_ad'), route('settings.ldap.index')));
+
+    Route::post('ldap', [SettingsController::class, 'postLdapSettings'])
+        ->name('settings.ldap.save');
+
+    Route::get('phpinfo', [SettingsController::class, 'getPhpInfo'])
+        ->name('settings.phpinfo.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.php_info'), route('settings.phpinfo.index')));
+
+    Route::get('oauth', [SettingsController::class, 'api'])
+        ->name('settings.oauth.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.oauth'), route('settings.oauth.index')));
+
+    Route::get('google', [SettingsController::class, 'getGoogleLoginSettings'])
+        ->name('settings.google.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.google_login'), route('settings.google.index')));
+
+    Route::post('google', [SettingsController::class, 'postGoogleLoginSettings'])
+        ->name('settings.google.save');
+
+    Route::get('purge', [SettingsController::class, 'getPurge'])
+        ->name('settings.purge.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.purge'), route('settings.purge.index')));
+
+    Route::post('purge', [SettingsController::class, 'postPurge'])
+        ->name('settings.purge.save');
+
+    Route::get('login-attempts', [SettingsController::class, 'getLoginAttempts'])
+        ->name('settings.logins.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.login'), route('settings.logins.index')));
+
+
+    // SAML
+    Route::get('/saml', [SettingsController::class, 'getSamlSettings'])
+        ->name('settings.saml.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.saml_title'), route('settings.saml.index')));
+
+    Route::post('/saml', [SettingsController::class, 'postSamlSettings'])
+        ->name('settings.saml.save');
 
-    Route::get('google', [SettingsController::class, 'getGoogleLoginSettings'])->name('settings.google.index');
-    Route::post('google', [SettingsController::class, 'postGoogleLoginSettings'])->name('settings.google.save');
 
-    Route::get('purge', [SettingsController::class, 'getPurge'])->name('settings.purge.index');
-    Route::post('purge', [SettingsController::class, 'postPurge'])->name('settings.purge.save');
 
-    Route::get('login-attempts', [SettingsController::class, 'getLoginAttempts'])->name('settings.logins.index');
 
     // Backups
     Route::group(['prefix' => 'backups', 'middleware' => 'auth'], function () {
@@ -245,15 +326,25 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser
             return redirect(route('settings.backups.index'));
         });
 
-        Route::get('/', [SettingsController::class, 'getBackups'])->name('settings.backups.index');
+        Route::get('/', [SettingsController::class, 'getBackups'])
+            ->name('settings.backups.index')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('settings.index')
+                ->push(trans('admin/settings/general.backups'), route('settings.backups.index')));
     });
 
-    Route::resource('groups', GroupsController::class, [
-        'middleware' => ['auth'],
-        'parameters' => ['group' => 'group_id'],
-    ]);
+    Route::resource('groups', GroupsController::class);
 
-    Route::get('/', [SettingsController::class, 'index'])->name('settings.index');
+
+    /**
+     * This breadcrumb is repeated for groups in the BreadcrumbServiceProvider, since groups uses resource routes
+     * and that servcie provider cannot see the breadcrumbs defined below
+     */
+    Route::get('/', [SettingsController::class, 'index'])
+        ->name('settings.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.admin'), route('settings.index')));
 });
 
 /*
@@ -265,9 +356,12 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser
 |
 */
 
-Route::get('/import',
-    Importer::class
-)->middleware('auth')->name('imports.index');
+Route::get('/import', Importer::class)
+    ->middleware('auth')
+    ->name('imports.index')
+    ->breadcrumbs(fn (Trail $trail) =>
+    $trail->parent('home')
+        ->push(trans('general.import'), route('imports.index')));
 
 /*
 |--------------------------------------------------------------------------
@@ -280,26 +374,54 @@ Route::get('/import',
 Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
 
     // Profile
-    Route::get('profile', [ProfileController::class, 'getIndex'])->name('profile');
-    Route::post('profile', [ProfileController::class, 'postIndex'])->name('profile.update');
+    Route::get('profile', [ProfileController::class, 'getIndex'])
+        ->name('profile')
+        ->breadcrumbs(fn (Trail $trail) =>
+                $trail->parent('home')
+            ->push(trans('general.editprofile'), route('profile')));
 
-    Route::get('menu', [ProfileController::class, 'getMenuState'])->name('account.menuprefs');
+    Route::post('profile', [ProfileController::class, 'postIndex'])
+        ->name('profile.update');
 
-    Route::get('password', [ProfileController::class, 'password'])->name('account.password.index');
-    Route::post('password', [ProfileController::class, 'passwordSave'])->name('account.password.update');
+    Route::get('menu', [ProfileController::class, 'getMenuState'])
+        ->name('account.menuprefs');
 
-    Route::get('api', [ProfileController::class, 'api'])->name('user.api');
+    Route::get('password', [ProfileController::class, 'password'])
+        ->name('account.password.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.changepassword'), route('account.password.index')));
+
+    Route::post('password', [ProfileController::class, 'passwordSave'])
+        ->name('account.password.update');
+
+    Route::get('api', [ProfileController::class, 'api'])
+        ->name('user.api')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.manage_api_keys'), route('user.api')));
 
     // View Assets
-    Route::get('view-assets', [ViewAssetsController::class, 'getIndex'])->name('view-assets');
+    Route::get('view-assets', [ViewAssetsController::class, 'getIndex'])
+        ->name('view-assets')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.viewassets'), route('view-assets')));
 
-    Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])->name('account.requested');
+    Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])
+        ->name('account.requested')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.requested_assets_menu'), route('account.requested')));
 
     // Profile
     Route::get(
-        'requestable-assets',
-        [ViewAssetsController::class, 'getRequestableIndex']
-    )->name('requestable-assets');
+        'requestable-assets', [ViewAssetsController::class, 'getRequestableIndex'])
+        ->name('requestable-assets')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.requestable_items'), route('requestable-assets')));
+
     Route::post(
         'request-asset/{assetId}',
         [ViewAssetsController::class, 'getRequestAsset']
@@ -311,13 +433,20 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
     )->name('account/request-item');
 
     // Account Dashboard
-    Route::get('/', [ViewAssetsController::class, 'getIndex'])->name('account');
+    Route::get('/', [ViewAssetsController::class, 'getIndex'])
+        ->name('account');
 
     Route::get('accept', [Account\AcceptanceController::class, 'index'])
-        ->name('account.accept');
+        ->name('account.accept')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.accept_assets_menu'), route('account.accept')));
 
     Route::get('accept/{id}', [Account\AcceptanceController::class, 'create'])
-        ->name('account.accept.item');
+        ->name('account.accept.item')
+        ->breadcrumbs(fn (Trail $trail, $id) =>
+        $trail->parent('account.accept')
+            ->push(trans('general.accept_item'), route('account.accept.item', $id)));
 
     Route::post('accept/{id}', [Account\AcceptanceController::class, 'store'])
         ->name('account.store-acceptance');
@@ -344,77 +473,128 @@ Route::group(['middleware' => ['auth']], function () {
     Route::post('notes', [NotesController::class, 'store'])->name('notes.store');
 });
 
-Route::group(['middleware' => ['auth']], function () {
-    Route::get('reports/audit', 
-        [ReportsController::class, 'audit']
-    )->name('reports.audit');
+Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function () {
+
+    Route::get('audit', [ReportsController::class, 'audit'])
+        ->name('reports.audit')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.audit_report'), route('reports.audit')));
 
     Route::get(
-        'reports/depreciation',
-        [ReportsController::class, 'getDeprecationReport']
-    )->name('reports/depreciation');
-    Route::get(
-        'reports/export/depreciation',
-        [ReportsController::class, 'exportDeprecationReport']
-    )->name('reports/export/depreciation');
-    Route::get(
-        'reports/asset_maintenances',
-        [ReportsController::class, 'getAssetMaintenancesReport']
-    )->name('reports/asset_maintenances');
-    Route::get(
-        'reports/export/asset_maintenances',
-        [ReportsController::class, 'exportAssetMaintenancesReport']
-    )->name('reports/export/asset_maintenances');
-    Route::get(
-        'reports/licenses',
-        [ReportsController::class, 'getLicenseReport']
-    )->name('reports/licenses');
-    Route::get(
-        'reports/export/licenses',
-        [ReportsController::class, 'exportLicenseReport']
-    )->name('reports/export/licenses');
+        'depreciation', [ReportsController::class, 'getDeprecationReport'])
+        ->name('reports/depreciation')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.depreciation_report'), route('reports/depreciation')));
 
-    Route::get('reports/accessories', [ReportsController::class, 'getAccessoryReport'])->name('reports/accessories');
-    Route::get(
-        'reports/export/accessories',
-        [ReportsController::class, 'exportAccessoryReport']
-    )->name('reports/export/accessories');
-    Route::get('reports/custom', [ReportsController::class, 'getCustomReport'])->name('reports/custom');
-    Route::post('reports/custom', [ReportsController::class, 'postCustom']);
 
-    Route::prefix('reports/templates')->name('report-templates')->group(function () {
-        Route::post('/', [ReportTemplatesController::class, 'store'])->name('.store');
-        Route::get('/{reportTemplate}', [ReportTemplatesController::class, 'show'])->name('.show');
-        Route::get('/{reportTemplate}/edit', [ReportTemplatesController::class, 'edit'])->name('.edit');
-        Route::post('/{reportTemplate}', [ReportTemplatesController::class, 'update'])->name('.update');
-        Route::delete('/{reportTemplate}', [ReportTemplatesController::class, 'destroy'])->name('.destroy');
+    // Is this still used??
+    Route::get(
+        'export/depreciation', [ReportsController::class, 'exportDeprecationReport'])
+        ->name('reports/export/depreciation')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.depreciation_report'), route('reports.audit')));
+
+    Route::get(
+        'asset_maintenances', [ReportsController::class, 'getAssetMaintenancesReport'])
+        ->name('reports/asset_maintenances')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.asset_maintenance_report'), route('reports/asset_maintenances')));
+
+    // Is this still used?
+    Route::get('export/asset_maintenances', [ReportsController::class, 'exportAssetMaintenancesReport'])
+        ->name('reports/export/asset_maintenances')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.asset_maintenance_report'), route('reports/export/asset_maintenances')));
+
+    Route::get('licenses', [ReportsController::class, 'getLicenseReport'])
+        ->name('reports/licenses')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.license_report'), route('reports/licenses')));
+
+    Route::get('export/licenses', [ReportsController::class, 'exportLicenseReport'])
+        ->name('reports/export/licenses');
+
+    Route::get('accessories', [ReportsController::class, 'getAccessoryReport'])
+        ->name('reports/accessories');
+
+    Route::get('export/accessories', [ReportsController::class, 'exportAccessoryReport'])
+        ->name('reports/export/accessories');
+
+    Route::get('custom', [ReportsController::class, 'getCustomReport'])
+        ->name('reports/custom')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.custom_report'), route('reports/custom')));
+
+    Route::post('custom', [ReportsController::class, 'postCustom']);
+
+
+    Route::prefix('templates')
+        ->group(function () {
+
+            Route::post('/', [ReportTemplatesController::class, 'store'])
+                ->name('report-templates.store');
+
+            // The breadcrumb on this is a little odd for now since we don't have a template index
+            Route::get('/{reportTemplate}', [ReportTemplatesController::class, 'show'])
+                ->name('report-templates.show')
+                ->breadcrumbs(fn (Trail $trail, ReportTemplate $reportTemplate) =>
+                $trail->parent('reports/custom')
+                    ->push($reportTemplate->name, null)
+                    ->push(trans('general.customize_report'), ''));
+
+            Route::get('/{reportTemplate}/edit', [ReportTemplatesController::class, 'edit'])
+                ->name('report-templates.edit')
+                ->breadcrumbs(fn (Trail $trail, ReportTemplate $reportTemplate) =>
+                $trail->parent('reports/custom')
+                    ->push($reportTemplate->name, route('report-templates.show', $reportTemplate))
+                    ->push(trans('general.customize_report'), ''));
+
+
+            Route::post('/{reportTemplate}', [ReportTemplatesController::class, 'update'])
+                ->name('report-templates.update');
+
+            Route::delete('/{reportTemplate}', [ReportTemplatesController::class, 'destroy'])
+                ->name('report-templates.destroy');
     });
 
-    Route::get(
-        'reports/activity',
-        [ReportsController::class, 'getActivityReport']
-    )->name('reports.activity');
 
-    Route::post('reports/activity', [ReportsController::class, 'postActivityReport'])->name('reports.activity.post');
 
     Route::get(
-        'reports/unaccepted_assets/{deleted?}',
-        [ReportsController::class, 'getAssetAcceptanceReport']
-    )->name('reports/unaccepted_assets');
+        'activity', [ReportsController::class, 'getActivityReport'])
+        ->name('reports.activity')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.activity_report'), route('reports.activity')));
+
+    Route::post('activity', [ReportsController::class, 'postActivityReport'])
+        ->name('reports.activity.post');
+
+    Route::get('unaccepted_assets/{deleted?}', [ReportsController::class, 'getAssetAcceptanceReport'])
+        ->name('reports/unaccepted_assets')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.unaccepted_asset_report'), route('reports/unaccepted_assets')));
+
+    Route::post('unaccepted_assets/sent_reminder', [ReportsController::class, 'sentAssetAcceptanceReminder'])
+        ->name('reports/unaccepted_assets_sent_reminder');
+
+    Route::delete('unaccepted_assets/{acceptanceId}/delete', [ReportsController::class, 'deleteAssetAcceptance'])
+        ->name('reports/unaccepted_assets_delete');
+
     Route::post(
-        'reports/unaccepted_assets/sent_reminder',
-        [ReportsController::class, 'sentAssetAcceptanceReminder']
-    )->name('reports/unaccepted_assets_sent_reminder');
-    Route::delete(
-        'reports/unaccepted_assets/{acceptanceId}/delete',
-        [ReportsController::class, 'deleteAssetAcceptance']
-    )->name('reports/unaccepted_assets_delete');
-    Route::post(
-        'reports/unaccepted_assets/{deleted?}',
-        [ReportsController::class, 'postAssetAcceptanceReport']
-    )->name('reports/export/unaccepted_assets');
+        'unaccepted_assets/{deleted?}', [ReportsController::class, 'postAssetAcceptanceReport'])
+        ->name('reports/export/unaccepted_assets');
+
 });
 
+
 Route::get(
     'auth/signin',
     [LoginController::class, 'legacyAuthRedirect']
@@ -526,14 +706,6 @@ Route::group(['middleware' => 'web'], function () {
     Route::get('google/callback', 'App\Http\Controllers\GoogleAuthController@handleGoogleCallback')->name('google.callback');
 
 
-    Route::get(
-        '/',
-        [
-            'as' => 'home',
-            'middleware' => ['auth'],
-            'uses' => 'DashboardController@getIndex' ]
-    );
-
     // need to keep GET /logout for SAML SLO
     Route::get(
         'logout',
@@ -559,4 +731,7 @@ Route::withoutMiddleware(['web'])->get(
 Route::middleware(['auth'])->get(
     '/',
     [DashboardController::class, 'index']
-)->name('home');
+)->name('home')
+    ->breadcrumbs(fn (Trail $trail) =>
+    $trail->push('Home', route('home'))
+    );
diff --git a/routes/web/accessories.php b/routes/web/accessories.php
index 1f28892a0..cf73e26e0 100644
--- a/routes/web/accessories.php
+++ b/routes/web/accessories.php
@@ -53,6 +53,5 @@ Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function ()
 });
 
 Route::resource('accessories', Accessories\AccessoriesController::class, [
-    'middleware' => ['auth'],
-    'parameters' => ['accessory' => 'accessory_id'],
+    'middleware' => ['auth']
 ]);
diff --git a/routes/web/fields.php b/routes/web/fields.php
index cdd8fda5d..7500053c7 100644
--- a/routes/web/fields.php
+++ b/routes/web/fields.php
@@ -33,14 +33,17 @@ Route::group([ 'prefix' => 'fields','middleware' => ['auth'] ], function () {
     )->name('fieldsets.associate');
 
     Route::resource('fieldsets', CustomFieldsetsController::class, [
-    'parameters' => ['fieldset' => 'field_id', 'field' => 'field_id']
+        'parameters' => [
+            'fieldset' => 'fieldset',
+            'field' => 'field_id'
+        ]
     ]);
 
 
 });
 
-Route::resource('fields', CustomFieldsController::class, [
-    'middleware' => ['auth'],
-    'parameters' => ['field' => 'field_id', 'fieldset' => 'fieldset_id'],
-]);
+Route::resource('fields', CustomFieldsController::class,
+    ['middleware' => ['auth'],
+        'except' => ['show']
+    ]);
 
diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index ee888aa1d..3f858b120 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -6,7 +6,10 @@ use App\Http\Controllers\Assets\BulkAssetsController;
 use App\Http\Controllers\Assets\AssetCheckoutController;
 use App\Http\Controllers\Assets\AssetCheckinController;
 use App\Http\Controllers\Assets\AssetFilesController;
+use App\Models\Setting;
+use Tabuna\Breadcrumbs\Trail;
 use Illuminate\Support\Facades\Route;
+use App\Models\Asset;
 
 /*
 |--------------------------------------------------------------------------
@@ -24,47 +27,59 @@ Route::group(
     
     function () {
         
-        Route::get('bulkaudit',
-            [AssetsController::class, 'quickScan']
-        )->name('assets.bulkaudit');
+        Route::get('bulkaudit', [AssetsController::class, 'quickScan'])
+            ->name('assets.bulkaudit')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push(trans('general.bulkaudit'), route('asset.import-history'))
+            );
 
-        Route::get('quickscancheckin',
-            [AssetsController::class, 'quickScanCheckin']
-        )->name('hardware/quickscancheckin');
+        Route::get('quickscancheckin', [AssetsController::class, 'quickScanCheckin'])
+            ->name('hardware/quickscancheckin')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push('Quickscan Checkin', route('hardware/quickscancheckin'))
+            );
 
-        // Asset Maintenances
-        Route::resource('maintenances', 
-            AssetMaintenancesController::class, [
-            'parameters' => ['maintenance' => 'maintenance_id', 'asset' => 'asset_id'],
-        ]);
+        Route::get('requested', [AssetsController::class, 'getRequestedIndex'])
+            ->name('assets.requested')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push(trans('admin/hardware/general.requested'), route('assets.requested'))
+            );
 
-        Route::get('requested', [
-            AssetsController::class, 'getRequestedIndex']
-        )->name('assets.requested');
-
-        Route::get('scan',
-            [AssetsController::class, 'scan']
-        )->name('asset.scan');
-
-        Route::get('audit/due',
-            [AssetsController::class, 'dueForAudit']
-        )->name('assets.audit.due');
+        Route::get('audit/due', [AssetsController::class, 'dueForAudit'])
+            ->name('assets.audit.due')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push(trans_choice('general.audit_due_days', Setting::getSettings()->audit_warning_days, ['days' => Setting::getSettings()->audit_warning_days]), route('assets.audit.due'))
+            );
 
         Route::get('checkins/due',
             [AssetsController::class, 'dueForCheckin']
-        )->name('assets.checkins.due');
+        )->name('assets.checkins.due')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push(trans_choice('general.checkin_due_days', Setting::getSettings()->due_checkin_days, ['days' => Setting::getSettings()->due_checkin_days]), route('assets.audit.due'))
+            );
         
-        Route::get('audit/{id}',
-            [AssetsController::class, 'audit']
-        )->name('asset.audit.create');
+        Route::get('audit/{asset}', [AssetsController::class, 'audit'])
+            ->name('asset.audit.create')
+            ->breadcrumbs(fn (Trail $trail, Asset $asset) =>
+            $trail->parent('hardware.show', $asset)
+                ->push(trans('general.audit'))
+            );
 
-        Route::post('audit/{id}',
+        Route::post('audit/{asset}',
             [AssetsController::class, 'auditStore']
         )->name('asset.audit.store');
 
-        Route::get('history',
-            [AssetsController::class, 'getImportHistory']
-        )->name('asset.import-history');
+        Route::get('history', [AssetsController::class, 'getImportHistory'])
+            ->name('asset.import-history')
+            ->breadcrumbs(fn (Trail $trail) =>
+                $trail->parent('hardware.index')
+                ->push(trans('general.import-history'), route('asset.import-history'))
+            );
 
         Route::post('history',
             [AssetsController::class, 'postImportHistory']
@@ -85,11 +100,12 @@ Route::group(
         Route::get('{assetId}/label',
             [AssetsController::class, 'getLabel']
         )->name('label/hardware');
-        
 
-        Route::get('{assetId}/checkout',
-            [AssetCheckoutController::class, 'create']
-        )->name('hardware.checkout.create');
+        Route::get('{asset}/checkout', [AssetCheckoutController::class, 'create'])->name('hardware.checkout.create')
+            ->breadcrumbs(fn (Trail $trail, Asset $asset) =>
+            $trail->parent('hardware.show', $asset)
+                ->push(trans('admin/hardware/general.bulk_checkout'), route('hardware.index'))
+            );
 
         Route::post('{assetId}/checkout',
             [AssetCheckoutController::class, 'store']
@@ -108,7 +124,7 @@ Route::group(
             return redirect()->route('hardware.show', ['hardware' => $assetId]);
         });
 
-        Route::get('{assetId}/qr_code', 
+        Route::get('{asset}/qr_code',
             [AssetsController::class, 'getQrCode']
         )->name('qr_code/hardware');
 
@@ -153,9 +169,12 @@ Route::group(
         )->name('hardware/bulksave');
 
         // Bulk checkout / checkin
-        Route::get('bulkcheckout',
-            [BulkAssetsController::class, 'showCheckout']
-        )->name('hardware.bulkcheckout.show');
+        Route::get('bulkcheckout', [BulkAssetsController::class, 'showCheckout'])
+            ->name('hardware.bulkcheckout.show')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push(trans('admin/hardware/general.bulk_checkout'), route('hardware.index'))
+            );
 
         Route::post('bulkcheckout',
             [BulkAssetsController::class, 'storeCheckout']
@@ -163,16 +182,17 @@ Route::group(
 
     });
 
-Route::resource('hardware', 
-        AssetsController::class, 
-        [
-            'middleware' => ['auth'],
-            'parameters' => ['asset' => 'asset_id',
-                'names' => [
-                    'show' => 'view',
-                ],
-        ],
-]);
+Route::resource('hardware',
+        AssetsController::class,
+        ['middleware' => ['auth']
+])->parameters(['hardware' => 'asset']);
+
+
+// Asset Maintenances
+Route::resource('maintenances',
+    AssetMaintenancesController::class, [
+        'parameters' => ['maintenance' => 'maintenance', 'asset' => 'asset_id'],
+    ]);
 
 Route::get('ht/{any?}',
     [AssetsController::class, 'getAssetByTag']
diff --git a/routes/web/kits.php b/routes/web/kits.php
index 6b687f0bf..abd2d7526 100644
--- a/routes/web/kits.php
+++ b/routes/web/kits.php
@@ -1,21 +1,17 @@
 <?php
 
 use App\Http\Controllers\Kits;
+use App\Models\PredefinedKit;
 use Illuminate\Support\Facades\Route;
+use Tabuna\Breadcrumbs\Trail;
 
-// Predefined Kit Management
-Route::resource('kits', Kits\PredefinedKitsController::class, [
-    'middleware' => ['auth'],
-    'parameters' => ['kit' => 'kit_id'],
-]);
-
-Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'kits/{kit}', 'middleware' => ['auth']], function () {
 
     // Route::get('licenses',
     //     [Kits\PredefinedKitsController::class, 'indexLicenses']
     // )->name('kits.licenses.index');
 
-    Route::post('licenses',
+    Route::put('licenses',
         [Kits\PredefinedKitsController::class, 'storeLicense']
     )->name('kits.licenses.store');
 
@@ -23,9 +19,11 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function (
         [Kits\PredefinedKitsController::class, 'updateLicense']
     )->name('kits.licenses.update');
 
-    Route::get('licenses/{license_id}/edit',
-        [Kits\PredefinedKitsController::class, 'editLicense']
-    )->name('kits.licenses.edit');
+    Route::get('licenses/{license_id}/edit', [Kits\PredefinedKitsController::class, 'editLicense'])
+        ->name('kits.licenses.edit')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.backups'), route('kits.licenses.edit')));
 
     Route::delete('licenses/{license_id}',
         [Kits\PredefinedKitsController::class, 'detachLicense']
@@ -35,7 +33,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function (
 
     Route::put('models/{model_id}',
         [Kits\PredefinedKitsController::class, 'updateModel']
-    )/* ->parameters([2 => 'kit_id', 1 => 'model_id'])*/->name('kits.models.update');
+    )->name('kits.models.update');
 
     Route::get('models/{model_id}/edit',
         [Kits\PredefinedKitsController::class, 'editModel']
@@ -63,18 +61,24 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function (
         [Kits\PredefinedKitsController::class, 'updateAccessory']
     )/*->parameters([2 => 'kit_id', 1 => 'accessory_id'])*/->name('kits.accessories.update');
 
-    Route::get('accessories/{accessory_id}/edit',
-        [Kits\PredefinedKitsController::class, 'editAccessory']
-    )->name('kits.accessories.edit');
+    Route::get('accessories/{accessory_id}/edit', [Kits\PredefinedKitsController::class, 'editAccessory'])
+        ->name('kits.accessories.edit');
 
-    Route::delete('accessories/{accessory_id}',
-        [Kits\PredefinedKitsController::class, 'detachAccessory']
-    )->name('kits.accessories.detach');
-    Route::get('checkout',
-        [Kits\CheckoutKitController::class, 'showCheckout']
-    )->name('kits.checkout.show');
+    Route::delete('accessories/{accessory_id}', [Kits\PredefinedKitsController::class, 'detachAccessory'])
+        ->name('kits.accessories.detach');
 
-    Route::post('checkout',
-        [Kits\CheckoutKitController::class, 'store']
-    )->name('kits.checkout.store');
+    Route::get('checkout', [Kits\CheckoutKitController::class, 'showCheckout'])
+        ->name('kits.checkout.show')
+        ->breadcrumbs(fn (Trail $trail, PredefinedKit $kit) =>
+        $trail->parent('kits.show', $kit)
+            ->push(trans('general.checkout'), route('kits.checkout.show', $kit)));
+
+    Route::post('checkout', [Kits\CheckoutKitController::class, 'store'])
+        ->name('kits.checkout.store');
 }); // kits
+
+// Predefined Kit Management
+Route::resource('kits', Kits\PredefinedKitsController::class, [
+    'middleware' => ['auth'],
+]);
+
diff --git a/routes/web/licenses.php b/routes/web/licenses.php
index 7212a4764..39762c95c 100644
--- a/routes/web/licenses.php
+++ b/routes/web/licenses.php
@@ -2,6 +2,9 @@
 
 use App\Http\Controllers\Licenses;
 use Illuminate\Support\Facades\Route;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use Tabuna\Breadcrumbs\Trail;
 
 // Licenses
 Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () {
@@ -10,16 +13,25 @@ Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () {
     Route::get('{licenseId}/freecheckout',
         [Licenses\LicensesController::class, 'getFreeLicense']
     )->name('licenses.freecheckout');
-    Route::get('{licenseId}/checkout/{seatId?}', 
-        [Licenses\LicenseCheckoutController::class, 'create']
-    )->name('licenses.checkout');
+
+    Route::get('{license}/checkout/{seatId?}', [Licenses\LicenseCheckoutController::class, 'create'])
+        ->name('licenses.checkout')
+        ->breadcrumbs(fn (Trail $trail, License $license) =>
+        $trail->parent('licenses.show', $license)
+            ->push(trans('general.checkout'), route('licenses.checkout', $license))
+        );
+
     Route::post(
         '{licenseId}/checkout/{seatId?}',
         [Licenses\LicenseCheckoutController::class, 'store']
     ); //name() would duplicate here, so we skip it.
-    Route::get('{licenseSeatId}/checkin/{backto?}',
-        [Licenses\LicenseCheckinController::class, 'create']
-    )->name('licenses.checkin');
+
+    Route::get('{licenseSeat}/checkin/{backto?}', [Licenses\LicenseCheckinController::class, 'create'])
+        ->name('licenses.checkin')
+        ->breadcrumbs(fn (Trail $trail, LicenseSeat $licenseSeat) =>
+        $trail->parent('licenses.show', $licenseSeat->license)
+            ->push(trans('general.checkin'), route('licenses.checkin', $licenseSeat))
+        );
 
     Route::post('{licenseId}/checkin/{backto?}',
         [Licenses\LicenseCheckinController::class, 'store']
@@ -59,5 +71,4 @@ Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () {
 
 Route::resource('licenses', Licenses\LicensesController::class, [
     'middleware' => ['auth'],
-    'parameters' => ['license' => 'license_id'],
 ]);
diff --git a/routes/web/users.php b/routes/web/users.php
index e6aaf644a..d3e3c02c9 100644
--- a/routes/web/users.php
+++ b/routes/web/users.php
@@ -151,6 +151,5 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
 
 Route::resource('users', Users\UsersController::class, [
     'middleware' => ['auth'],
-    'parameters' => ['user' => 'user_id'],
     'except' => ['update']
 ]);
diff --git a/tests/Feature/Accessories/Ui/ShowAccessoryTest.php b/tests/Feature/Accessories/Ui/ShowAccessoryTest.php
index f9f2e566c..288ec9a50 100644
--- a/tests/Feature/Accessories/Ui/ShowAccessoryTest.php
+++ b/tests/Feature/Accessories/Ui/ShowAccessoryTest.php
@@ -12,7 +12,7 @@ class ShowAccessoryTest extends TestCase
     public function testRequiresPermissionToViewAccessory()
     {
         $this->actingAs(User::factory()->create())
-            ->get(route('accessories.show', Accessory::factory()->create()->id))
+            ->get(route('accessories.show', Accessory::factory()->create()))
             ->assertForbidden();
     }
 
@@ -25,8 +25,8 @@ class ShowAccessoryTest extends TestCase
         $userForCompanyB = User::factory()->for($companyB)->viewAccessories()->create();
 
         $this->actingAs($userForCompanyB)
-            ->get(route('accessories.show', $accessoryForCompanyA->id))
-            ->assertForbidden();
+            ->get(route('accessories.show', $accessoryForCompanyA))
+            ->assertStatus(302);
     }
 
     public function testCanViewAccessory()
@@ -34,7 +34,7 @@ class ShowAccessoryTest extends TestCase
         $accessory = Accessory::factory()->create();
 
         $this->actingAs(User::factory()->viewAccessories()->create())
-            ->get(route('accessories.show', $accessory->id))
+            ->get(route('accessories.show', $accessory))
             ->assertOk()
             ->assertViewIs('accessories.view')
             ->assertViewHas(['accessory' => $accessory]);
@@ -43,7 +43,7 @@ class ShowAccessoryTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('accessories.show', Accessory::factory()->create()->id))
+            ->get(route('accessories.show', Accessory::factory()->create()))
             ->assertOk();
 
     }
diff --git a/tests/Feature/Accessories/Ui/UpdateAccessoryTest.php b/tests/Feature/Accessories/Ui/UpdateAccessoryTest.php
index 1c6fe8a49..8c482b4f1 100644
--- a/tests/Feature/Accessories/Ui/UpdateAccessoryTest.php
+++ b/tests/Feature/Accessories/Ui/UpdateAccessoryTest.php
@@ -16,7 +16,7 @@ class UpdateAccessoryTest extends TestCase
     public function testRequiresPermissionToSeeEditAccessoryPage()
     {
         $this->actingAs(User::factory()->create())
-            ->get(route('accessories.edit', Accessory::factory()->create()->id))
+            ->get(route('accessories.edit', Accessory::factory()->create()))
             ->assertForbidden();
     }
 
diff --git a/tests/Feature/AssetModels/Ui/ShowAssetModelsTest.php b/tests/Feature/AssetModels/Ui/ShowAssetModelsTest.php
index 8b4104adc..739112f59 100644
--- a/tests/Feature/AssetModels/Ui/ShowAssetModelsTest.php
+++ b/tests/Feature/AssetModels/Ui/ShowAssetModelsTest.php
@@ -11,7 +11,7 @@ class ShowAssetModelsTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('models.show', AssetModel::factory()->create()->id))
+            ->get(route('models.show', AssetModel::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/AssetModels/Ui/UpdateAssetModelsTest.php b/tests/Feature/AssetModels/Ui/UpdateAssetModelsTest.php
index d0dbb2ffc..6fdd1bbcf 100644
--- a/tests/Feature/AssetModels/Ui/UpdateAssetModelsTest.php
+++ b/tests/Feature/AssetModels/Ui/UpdateAssetModelsTest.php
@@ -24,7 +24,7 @@ class UpdateAssetModelsTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('models.edit', AssetModel::factory()->create()->id))
+            ->get(route('models.edit', AssetModel::factory()->create()))
             ->assertOk();
     }
 
@@ -55,15 +55,15 @@ class UpdateAssetModelsTest extends TestCase
         $this->assertTrue(AssetModel::where('name', 'Test Model')->exists());
 
         $response = $this->actingAs(User::factory()->superuser()->create())
-            ->from(route('models.edit', ['model' => $model->id]))
-            ->put(route('models.update', ['model' => $model]), [
+            ->from(route('models.edit', $model))
+            ->put(route('models.update', $model), [
                 'name' => 'Test Model Edited',
                 'category_id' => Category::factory()->forAccessories()->create()->id,
             ])
             ->assertSessionHasErrors(['category_type'])
             ->assertInvalid(['category_type'])
             ->assertStatus(302)
-            ->assertRedirect(route('models.edit', ['model' => $model->id]));
+            ->assertRedirect(route('models.edit', $model));
 
         $this->followRedirects($response)->assertSee(trans('general.error'));
         $this->assertFalse(AssetModel::where('name', 'Test Model Edited')->exists());
diff --git a/tests/Feature/Assets/Ui/EditAssetTest.php b/tests/Feature/Assets/Ui/EditAssetTest.php
index 27f00b531..328067e89 100644
--- a/tests/Feature/Assets/Ui/EditAssetTest.php
+++ b/tests/Feature/Assets/Ui/EditAssetTest.php
@@ -27,7 +27,7 @@ class EditAssetTest extends TestCase
     {
         $asset = Asset::factory()->create();
         $user = User::factory()->editAssets()->create();
-        $response = $this->actingAs($user)->get(route('hardware.edit', $asset->id));
+        $response = $this->actingAs($user)->get(route('hardware.edit', $asset));
         $response->assertStatus(200);
     }
 
@@ -63,7 +63,7 @@ class EditAssetTest extends TestCase
                 'model_id' => AssetModel::factory()->create()->id,
             ])
             ->assertStatus(302)
-            ->assertRedirect(route('hardware.show', ['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.show', $asset));
 
         $this->assertDatabaseHas('assets', ['asset_tag' => 'New Asset Tag']);
     }
@@ -81,8 +81,8 @@ class EditAssetTest extends TestCase
         $currentTimestamp = now();
 
         $this->actingAs(User::factory()->viewAssets()->editAssets()->create())
-            ->from(route('hardware.edit', $asset->id))
-            ->put(route('hardware.update', $asset->id), [
+            ->from(route('hardware.edit', $asset))
+            ->put(route('hardware.update', $asset), [
                     'status_id' => $achived_status->id,
                     'model_id' => $asset->model_id,
                     'asset_tags' => $asset->asset_tag,
diff --git a/tests/Feature/Categories/Ui/ShowCategoryTest.php b/tests/Feature/Categories/Ui/ShowCategoryTest.php
index dd22b1d75..93a9cc0af 100644
--- a/tests/Feature/Categories/Ui/ShowCategoryTest.php
+++ b/tests/Feature/Categories/Ui/ShowCategoryTest.php
@@ -11,7 +11,7 @@ class ShowCategoryTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('categories.show', Category::factory()->create()->id))
+            ->get(route('categories.show', Category::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/Categories/Ui/UpdateCategoriesTest.php b/tests/Feature/Categories/Ui/UpdateCategoriesTest.php
index 7e6109779..ea5cc6338 100644
--- a/tests/Feature/Categories/Ui/UpdateCategoriesTest.php
+++ b/tests/Feature/Categories/Ui/UpdateCategoriesTest.php
@@ -23,7 +23,7 @@ class UpdateCategoriesTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('categories.edit', Category::factory()->create()->id))
+            ->get(route('categories.edit', Category::factory()->create()))
             ->assertOk();
     }
 
@@ -47,7 +47,7 @@ class UpdateCategoriesTest extends TestCase
         $this->assertTrue(Category::where('name', 'Test Category')->exists());
 
         $response = $this->actingAs(User::factory()->superuser()->create())
-            ->put(route('categories.update', ['category' => $category]), [
+            ->put(route('categories.update', $category), [
                 'name' => 'Test Category Edited',
                 'notes' => 'Test Note Edited',
             ])
@@ -66,8 +66,8 @@ class UpdateCategoriesTest extends TestCase
         $this->assertTrue(Category::where('name', 'Test Category')->exists());
 
         $response = $this->actingAs(User::factory()->superuser()->create())
-            ->from(route('categories.edit', ['category' => $category->id]))
-            ->put(route('categories.update', ['category' => $category]), [
+            ->from(route('categories.edit', $category->id))
+            ->put(route('categories.update', $category), [
                 'name' => 'Test Category Edited',
                 'category_type' => 'accessory',
                 'notes' => 'Test Note Edited',
@@ -87,8 +87,8 @@ class UpdateCategoriesTest extends TestCase
         $category = Category::where('name', 'Laptops')->first();
 
         $response = $this->actingAs(User::factory()->superuser()->create())
-            ->from(route('categories.edit', ['category' => $category->id]))
-            ->put(route('categories.update', ['category' => $category]), [
+            ->from(route('categories.edit', $category))
+            ->put(route('categories.update', $category), [
                 'name' => 'Test Category Edited',
                 'category_type' => 'accessory',
                 'notes' => 'Test Note Edited',
@@ -96,7 +96,7 @@ class UpdateCategoriesTest extends TestCase
             ->assertSessionHasErrors(['category_type'])
             ->assertInvalid(['category_type'])
             ->assertStatus(302)
-            ->assertRedirect(route('categories.edit', ['category' => $category->id]));
+            ->assertRedirect(route('categories.edit', $category));
 
         $this->followRedirects($response)->assertSee(trans('general.error'));
         $this->assertFalse(Category::where('name', 'Test Category Edited')->where('notes', 'Test Note Edited')->exists());
diff --git a/tests/Feature/Checkins/Ui/AssetCheckinTest.php b/tests/Feature/Checkins/Ui/AssetCheckinTest.php
index 7428b7ab7..58194dbfc 100644
--- a/tests/Feature/Checkins/Ui/AssetCheckinTest.php
+++ b/tests/Feature/Checkins/Ui/AssetCheckinTest.php
@@ -188,7 +188,7 @@ class AssetCheckinTest extends TestCase
             ->get(route('hardware.checkin.create', ['assetId' => $asset->id]))
             ->assertStatus(302)
             ->assertSessionHas('error')
-            ->assertRedirect(route('hardware.show',['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.show', $asset->id));
     }
 
     public function testAssetCheckinPagePostIsRedirectedIfModelIsInvalid()
@@ -201,7 +201,7 @@ class AssetCheckinTest extends TestCase
             ->post(route('hardware.checkin.store', ['assetId' => $asset->id]))
             ->assertStatus(302)
             ->assertSessionHas('error')
-            ->assertRedirect(route('hardware.show', ['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.show', $asset));
     }
 
     public function testAssetCheckinPagePostIsRedirectedIfRedirectSelectionIsIndex()
@@ -228,6 +228,6 @@ class AssetCheckinTest extends TestCase
             ])
             ->assertStatus(302)
             ->assertSessionHasNoErrors()
-            ->assertRedirect(route('hardware.show', ['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.show', $asset));
     }
 }
diff --git a/tests/Feature/Checkins/Ui/ComponentCheckinTest.php b/tests/Feature/Checkins/Ui/ComponentCheckinTest.php
index 6c2ef084f..7da3879ea 100644
--- a/tests/Feature/Checkins/Ui/ComponentCheckinTest.php
+++ b/tests/Feature/Checkins/Ui/ComponentCheckinTest.php
@@ -16,9 +16,7 @@ class ComponentCheckinTest extends TestCase
         $componentAsset = DB::table('components_assets')->where('component_id', $component->id)->first();
 
         $this->actingAs(User::factory()->create())
-            ->post(route('components.checkin.store', [
-                'componentID' => $componentAsset->id,
-            ]))
+            ->post(route('components.checkin.store', $componentAsset->id))
             ->assertForbidden();
     }
 
@@ -67,6 +65,6 @@ class ComponentCheckinTest extends TestCase
             ])
             ->assertStatus(302)
             ->assertSessionHasNoErrors()
-            ->assertRedirect(route('components.show', ['component' => $component->id]));
+            ->assertRedirect(route('components.show', $component));
     }
 }
diff --git a/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php b/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
index ff121bc4d..19b0d1ce7 100644
--- a/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
@@ -25,7 +25,7 @@ class AccessoryCheckoutTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('accessories.checkout.show', Accessory::factory()->create()->id))
+            ->get(route('accessories.checkout.show', Accessory::factory()->create()))
             ->assertOk();
     }
 
@@ -241,7 +241,7 @@ class AccessoryCheckoutTest extends TestCase
             ])
             ->assertStatus(302)
             ->assertSessionHasNoErrors()
-            ->assertRedirect(route('accessories.show', ['accessory' => $accessory->id]));
+            ->assertRedirect(route('accessories.show', $accessory));
     }
 
     public function testAccessoryCheckoutPagePostIsRedirectedIfRedirectSelectionIsTarget()
@@ -258,6 +258,6 @@ class AccessoryCheckoutTest extends TestCase
                 'assigned_qty' => 1,
             ])
             ->assertStatus(302)
-            ->assertRedirect(route('users.show', ['user' => $user]));
+            ->assertRedirect(route('users.show', $user));
     }
 }
diff --git a/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php b/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
index 74658a6fa..f364064a1 100644
--- a/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
@@ -260,10 +260,10 @@ class AssetCheckoutTest extends TestCase
         $asset->forceSave();
 
         $this->actingAs(User::factory()->admin()->create())
-            ->get(route('hardware.checkout.create', ['assetId' => $asset->id]))
+            ->get(route('hardware.checkout.create', $asset))
             ->assertStatus(302)
             ->assertSessionHas('error')
-            ->assertRedirect(route('hardware.show',['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.show', $asset));
     }
 
     public function testAssetCheckoutPagePostIsRedirectedIfRedirectSelectionIsIndex()
@@ -294,7 +294,7 @@ class AssetCheckoutTest extends TestCase
             ])
             ->assertStatus(302)
             ->assertSessionHasNoErrors()
-            ->assertRedirect(route('hardware.show', ['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.show', $asset));
     }
 
     public function testAssetCheckoutPagePostIsRedirectedIfRedirectSelectionIsUserTarget()
@@ -328,7 +328,7 @@ class AssetCheckoutTest extends TestCase
                 'assigned_qty' => 1,
             ])
             ->assertStatus(302)
-            ->assertRedirect(route('hardware.show', ['hardware' => $target]));
+            ->assertRedirect(route('hardware.show', $target));
     }
 
     public function testAssetCheckoutPagePostIsRedirectedIfRedirectSelectionIsLocationTarget()
diff --git a/tests/Feature/Checkouts/Ui/ComponentsCheckoutTest.php b/tests/Feature/Checkouts/Ui/ComponentsCheckoutTest.php
index 507b26243..18568d198 100644
--- a/tests/Feature/Checkouts/Ui/ComponentsCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/ComponentsCheckoutTest.php
@@ -76,7 +76,7 @@ class ComponentsCheckoutTest extends TestCase
                 'assigned_qty' => 1,
             ])
             ->assertStatus(302)
-            ->assertRedirect(route('components.show', ['component' => $component->id]));
+            ->assertRedirect(route('components.show', $component));
     }
 
     public function testComponentCheckoutPagePostIsRedirectedIfRedirectSelectionIsTarget()
@@ -92,6 +92,6 @@ class ComponentsCheckoutTest extends TestCase
                 'assigned_qty' => 1,
             ])
             ->assertStatus(302)
-            ->assertRedirect(route('hardware.show', ['hardware' => $asset]));
+            ->assertRedirect(route('hardware.show', $asset));
     }
 }
diff --git a/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php b/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
index dd77e19c5..2c74e4d0c 100644
--- a/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
@@ -130,7 +130,7 @@ class ConsumableCheckoutTest extends TestCase
                 'assigned_qty' => 1,
             ])
             ->assertStatus(302)
-            ->assertRedirect(route('consumables.show', ['consumable' => $consumable->id]));
+            ->assertRedirect(route('consumables.show', $consumable));
     }
 
     public function testConsumableCheckoutPagePostIsRedirectedIfRedirectSelectionIsTarget()
@@ -146,7 +146,7 @@ class ConsumableCheckoutTest extends TestCase
                 'assigned_qty' => 1,
             ])
             ->assertStatus(302)
-            ->assertRedirect(route('users.show', ['user' => $user]));
+            ->assertRedirect(route('users.show', $user));
     }
 
 }
diff --git a/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php b/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
index 22bdb6b5d..1750b7564 100644
--- a/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
@@ -24,7 +24,7 @@ class LicenseCheckoutTest extends TestCase
         $licenseSeat = LicenseSeat::factory()->create();
 
         $this->actingAs($admin)
-            ->post("/licenses/{$licenseSeat->license->id}/checkout", [
+            ->post(route('licenses.checkout', $licenseSeat->license), [
                 'checkout_to_type' => 'asset',
                 'assigned_to' => null,
                 'asset_id' => $asset->id,
@@ -47,7 +47,7 @@ class LicenseCheckoutTest extends TestCase
         $licenseSeat = LicenseSeat::factory()->create();
 
         $this->actingAs($admin)
-            ->post("/licenses/{$licenseSeat->license->id}/checkout", [
+            ->post(route('licenses.checkout', $licenseSeat->license), [
                 'checkout_to_type' => 'user',
                 'assigned_to' => $admin->id,
                 'asset_id' => null,
@@ -69,8 +69,8 @@ class LicenseCheckoutTest extends TestCase
         $license = License::factory()->create();
 
         $this->actingAs(User::factory()->admin()->create())
-            ->from(route('licenses.checkout', ['licenseId' => $license->id]))
-            ->post(route('licenses.checkout', ['licenseId' => $license->id]), [
+            ->from(route('licenses.checkout', $license))
+            ->post(route('licenses.checkout', $license), [
                 'assigned_to' =>  User::factory()->create()->id,
                 'redirect_option' => 'index',
                 'assigned_qty' => 1,
@@ -84,13 +84,13 @@ class LicenseCheckoutTest extends TestCase
         $license = License::factory()->create();
 
         $this->actingAs(User::factory()->admin()->create())
-            ->from(route('licenses.checkout', ['licenseId' => $license->id]))
-            ->post(route('licenses.checkout' , ['licenseId' => $license->id]), [
+            ->from(route('licenses.checkout', $license))
+            ->post(route('licenses.checkout', $license), [
                 'assigned_to' =>  User::factory()->create()->id,
                 'redirect_option' => 'item',
             ])
             ->assertStatus(302)
-            ->assertRedirect(route('licenses.show', ['license' => $license->id]));
+            ->assertRedirect(route('licenses.show', $license));
     }
 
     public function testLicenseCheckoutPagePostIsRedirectedIfRedirectSelectionIsUserTarget()
@@ -99,13 +99,13 @@ class LicenseCheckoutTest extends TestCase
         $license = License::factory()->create();
 
         $this->actingAs(User::factory()->admin()->create())
-            ->from(route('licenses.checkout', ['licenseId' => $license->id]))
+            ->from(route('licenses.checkout', $license))
             ->post(route('licenses.checkout' , $license), [
                 'assigned_to' =>  $user->id,
                 'redirect_option' => 'target',
             ])
             ->assertStatus(302)
-            ->assertRedirect(route('users.show', ['user' => $user->id]));
+            ->assertRedirect(route('users.show', $user));
     }
     public function testLicenseCheckoutPagePostIsRedirectedIfRedirectSelectionIsAssetTarget()
     {
@@ -113,12 +113,12 @@ class LicenseCheckoutTest extends TestCase
         $license = License::factory()->create();
 
         $this->actingAs(User::factory()->admin()->create())
-            ->from(route('licenses.checkout', ['licenseId' => $license->id]))
+            ->from(route('licenses.checkout', $license))
             ->post(route('licenses.checkout' , $license), [
                 'asset_id' =>  $asset->id,
                 'redirect_option' => 'target',
             ])
             ->assertStatus(302)
-            ->assertRedirect(route('hardware.show', ['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.show', $asset));
     }
 }
diff --git a/tests/Feature/Companies/Ui/EditCompanyTest.php b/tests/Feature/Companies/Ui/EditCompanyTest.php
index 7dcbc7908..febc71704 100644
--- a/tests/Feature/Companies/Ui/EditCompanyTest.php
+++ b/tests/Feature/Companies/Ui/EditCompanyTest.php
@@ -11,7 +11,7 @@ class EditCompanyTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('companies.edit', Company::factory()->create()->id))
+            ->get(route('companies.edit', Company::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/Companies/Ui/ShowCompanyTest.php b/tests/Feature/Companies/Ui/ShowCompanyTest.php
index 1c41f6ab2..de7429d40 100644
--- a/tests/Feature/Companies/Ui/ShowCompanyTest.php
+++ b/tests/Feature/Companies/Ui/ShowCompanyTest.php
@@ -11,7 +11,7 @@ class ShowCompanyTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('companies.show', Company::factory()->create()->id))
+            ->get(route('companies.show', Company::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/Components/Ui/EditComponentTest.php b/tests/Feature/Components/Ui/EditComponentTest.php
index 257034390..4e4b99233 100644
--- a/tests/Feature/Components/Ui/EditComponentTest.php
+++ b/tests/Feature/Components/Ui/EditComponentTest.php
@@ -11,7 +11,7 @@ class EditComponentTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('components.edit', Component::factory()->create()->id))
+            ->get(route('components.edit', Component::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/Components/Ui/ShowComponentTest.php b/tests/Feature/Components/Ui/ShowComponentTest.php
index 50a17ee05..6ee2ca286 100644
--- a/tests/Feature/Components/Ui/ShowComponentTest.php
+++ b/tests/Feature/Components/Ui/ShowComponentTest.php
@@ -11,7 +11,7 @@ class ShowComponentTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('components.show', Component::factory()->create()->id))
+            ->get(route('components.show', Component::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/Consumables/Ui/EditConsumableTest.php b/tests/Feature/Consumables/Ui/EditConsumableTest.php
index 6b75db127..308b7647b 100644
--- a/tests/Feature/Consumables/Ui/EditConsumableTest.php
+++ b/tests/Feature/Consumables/Ui/EditConsumableTest.php
@@ -11,7 +11,7 @@ class EditConsumableTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('consumables.show', Consumable::factory()->create()->id))
+            ->get(route('consumables.show', Consumable::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/Consumables/Ui/UpdateConsumableTest.php b/tests/Feature/Consumables/Ui/UpdateConsumableTest.php
index 66fc9a11f..dbb13b9ce 100644
--- a/tests/Feature/Consumables/Ui/UpdateConsumableTest.php
+++ b/tests/Feature/Consumables/Ui/UpdateConsumableTest.php
@@ -29,7 +29,7 @@ class UpdateConsumableTest extends TestCase
         $userForCompanyB = User::factory()->editConsumables()->for($companyB)->create();
 
         $this->actingAs($userForCompanyB)
-            ->get(route('consumables.edit', $consumableForCompanyA->id))
+            ->get(route('consumables.edit', $consumableForCompanyA))
             ->assertRedirect(route('consumables.index'));
     }
 
@@ -51,10 +51,10 @@ class UpdateConsumableTest extends TestCase
         $userForCompanyB = User::factory()->editConsumables()->for($companyB)->create();
 
         $this->actingAs($userForCompanyB)
-            ->put(route('consumables.update', $consumableForCompanyA->id), [
+            ->put(route('consumables.update', $consumableForCompanyA), [
                 //
             ])
-            ->assertForbidden();
+            ->assertStatus(302);
     }
 
     public function testCannotSetQuantityToAmountLowerThanWhatIsCheckedOut()
@@ -99,7 +99,7 @@ class UpdateConsumableTest extends TestCase
         ];
 
         $this->actingAs(User::factory()->createConsumables()->editConsumables()->create())
-            ->put(route('consumables.update', $consumable->id), $data + [
+            ->put(route('consumables.update', $consumable), $data + [
                     'redirect_option' => 'index',
                     'category_type' => 'consumable',
                 ])
diff --git a/tests/Feature/Departments/Ui/ShowDepartmentTest.php b/tests/Feature/Departments/Ui/ShowDepartmentTest.php
index d8a007bde..f1373ccc2 100644
--- a/tests/Feature/Departments/Ui/ShowDepartmentTest.php
+++ b/tests/Feature/Departments/Ui/ShowDepartmentTest.php
@@ -11,7 +11,7 @@ class ShowDepartmentTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('departments.show', Department::factory()->create()->id))
+            ->get(route('departments.show', Department::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/Departments/Ui/UpdateDepartmentsTest.php b/tests/Feature/Departments/Ui/UpdateDepartmentsTest.php
index bb5fc27e1..83e52bf7c 100644
--- a/tests/Feature/Departments/Ui/UpdateDepartmentsTest.php
+++ b/tests/Feature/Departments/Ui/UpdateDepartmentsTest.php
@@ -22,7 +22,7 @@ class UpdateDepartmentsTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('departments.edit', Department::factory()->create()->id))
+            ->get(route('departments.edit', Department::factory()->create()))
             ->assertOk();
     }
 
@@ -32,7 +32,7 @@ class UpdateDepartmentsTest extends TestCase
         $this->assertTrue(Department::where('name', 'Test Department')->exists());
 
         $response = $this->actingAs(User::factory()->superuser()->create())
-            ->put(route('departments.update', ['department' => $department]), [
+            ->put(route('departments.update', $department), [
                 'name' => 'Test Department Edited',
                 'notes' => 'Test Note Edited',
             ])
diff --git a/tests/Feature/Locations/Ui/ShowLocationTest.php b/tests/Feature/Locations/Ui/ShowLocationTest.php
index 6afb7dfe5..394ed73f4 100644
--- a/tests/Feature/Locations/Ui/ShowLocationTest.php
+++ b/tests/Feature/Locations/Ui/ShowLocationTest.php
@@ -11,7 +11,7 @@ class ShowLocationTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('locations.show', Location::factory()->create()->id))
+            ->get(route('locations.show', Location::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/Locations/Ui/UpdateLocationsTest.php b/tests/Feature/Locations/Ui/UpdateLocationsTest.php
index c38ee25f8..3135e9bcf 100644
--- a/tests/Feature/Locations/Ui/UpdateLocationsTest.php
+++ b/tests/Feature/Locations/Ui/UpdateLocationsTest.php
@@ -21,7 +21,7 @@ class UpdateLocationsTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('locations.update', Location::factory()->create()->id))
+            ->get(route('locations.update', Location::factory()->create()))
             ->assertOk();
     }
 
@@ -48,8 +48,8 @@ class UpdateLocationsTest extends TestCase
         $location = Location::factory()->create();
 
         $response = $this->actingAs(User::factory()->superuser()->create())
-            ->from(route('locations.edit', ['location' => $location->id]))
-            ->put(route('locations.update', ['location' => $location]), [
+            ->from(route('locations.edit', $location))
+            ->put(route('locations.update', $location), [
                 'name' => 'Test Location',
                 'parent_id' => $location->id,
             ])
@@ -63,7 +63,7 @@ class UpdateLocationsTest extends TestCase
     {
         $location = Location::factory()->create();
         $response = $this->actingAs(User::factory()->superuser()->create())
-            ->from(route('locations.edit', ['location' => $location->id]))
+            ->from(route('locations.edit', $location))
             ->put(route('locations.update', ['location' => $location]), [
                 'name' => 'Test Location',
                 'parent_id' => '100000000'
diff --git a/tests/Feature/Manufacturers/Ui/ShowManufacturerTest.php b/tests/Feature/Manufacturers/Ui/ShowManufacturerTest.php
index 890feb123..9a40819a1 100644
--- a/tests/Feature/Manufacturers/Ui/ShowManufacturerTest.php
+++ b/tests/Feature/Manufacturers/Ui/ShowManufacturerTest.php
@@ -11,7 +11,7 @@ class ShowManufacturerTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('manufacturers.show', Manufacturer::factory()->create()->id))
+            ->get(route('manufacturers.show', Manufacturer::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/Manufacturers/Ui/UpdateManufacturerTest.php b/tests/Feature/Manufacturers/Ui/UpdateManufacturerTest.php
index 398b7fe23..9d5861300 100644
--- a/tests/Feature/Manufacturers/Ui/UpdateManufacturerTest.php
+++ b/tests/Feature/Manufacturers/Ui/UpdateManufacturerTest.php
@@ -11,7 +11,7 @@ class UpdateManufacturerTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('manufacturers.edit', Manufacturer::factory()->create()->id))
+            ->get(route('manufacturers.edit', Manufacturer::factory()->create()))
             ->assertOk();
     }
 
@@ -21,7 +21,7 @@ class UpdateManufacturerTest extends TestCase
         $this->assertTrue(Manufacturer::where('name', 'Test Manufacturer')->exists());
 
         $response = $this->actingAs(User::factory()->superuser()->create())
-            ->put(route('manufacturers.update', ['manufacturer' => $manufacturer]), [
+            ->put(route('manufacturers.update', $manufacturer), [
                 'name' => 'Test Manufacturer Edited',
                 'notes' => 'Test Note Edited',
             ])
diff --git a/tests/Feature/ReportTemplates/DeleteReportTemplateTest.php b/tests/Feature/ReportTemplates/DeleteReportTemplateTest.php
index 2b108443a..cebc8156a 100644
--- a/tests/Feature/ReportTemplates/DeleteReportTemplateTest.php
+++ b/tests/Feature/ReportTemplates/DeleteReportTemplateTest.php
@@ -17,7 +17,7 @@ class DeleteReportTemplateTest extends TestCase implements TestsPermissionsRequi
 
         $this->actingAs(User::factory()->create())
             ->post(route('report-templates.destroy', $reportTemplate->id))
-            ->assertNotFound();
+            ->assertStatus(302);
 
         $this->assertModelExists($reportTemplate);
     }
@@ -28,7 +28,7 @@ class DeleteReportTemplateTest extends TestCase implements TestsPermissionsRequi
 
         $this->actingAs(User::factory()->canViewReports()->create())
             ->delete(route('report-templates.destroy', $reportTemplate->id))
-            ->assertNotFound();
+            ->assertStatus(302);
 
         $this->assertModelExists($reportTemplate);
     }
diff --git a/tests/Feature/ReportTemplates/EditReportTemplateTest.php b/tests/Feature/ReportTemplates/EditReportTemplateTest.php
index 88363ec8b..d359baddd 100644
--- a/tests/Feature/ReportTemplates/EditReportTemplateTest.php
+++ b/tests/Feature/ReportTemplates/EditReportTemplateTest.php
@@ -15,7 +15,7 @@ class EditReportTemplateTest extends TestCase implements TestsPermissionsRequire
     {
         $this->actingAs(User::factory()->create())
             ->get(route('report-templates.edit', ReportTemplate::factory()->create()))
-            ->assertNotFound();
+            ->assertStatus(302);
     }
 
     public function testCannotLoadEditPageForAnotherUsersReportTemplate()
@@ -25,7 +25,7 @@ class EditReportTemplateTest extends TestCase implements TestsPermissionsRequire
 
         $this->actingAs($user)
             ->get(route('report-templates.edit', $reportTemplate))
-            ->assertNotFound();
+            ->assertStatus(302);
     }
 
     public function testCanLoadEditReportTemplatePage()
diff --git a/tests/Feature/ReportTemplates/ShowReportTemplateTest.php b/tests/Feature/ReportTemplates/ShowReportTemplateTest.php
index 3e57db898..748df288b 100644
--- a/tests/Feature/ReportTemplates/ShowReportTemplateTest.php
+++ b/tests/Feature/ReportTemplates/ShowReportTemplateTest.php
@@ -15,7 +15,7 @@ class ShowReportTemplateTest extends TestCase implements TestsPermissionsRequire
     {
         $this->actingAs(User::factory()->create())
             ->get(route('report-templates.show', ReportTemplate::factory()->create()))
-            ->assertNotFound();
+            ->assertStatus(302);
     }
 
     public function testCanLoadASavedReportTemplate()
@@ -38,6 +38,6 @@ class ShowReportTemplateTest extends TestCase implements TestsPermissionsRequire
 
         $this->actingAs(User::factory()->canViewReports()->create())
             ->get(route('report-templates.show', $reportTemplate))
-            ->assertNotFound();
+            ->assertStatus(302);
     }
 }
diff --git a/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php b/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php
index 9afecb084..09c168b27 100644
--- a/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php
+++ b/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php
@@ -15,14 +15,14 @@ class UpdateReportTemplateTest extends TestCase implements TestsPermissionsRequi
     {
         $this->actingAs(User::factory()->create())
             ->post(route('report-templates.update', ReportTemplate::factory()->create()))
-            ->assertNotFound();
+            ->assertStatus(302);
     }
 
     public function testCannotUpdateAnotherUsersReportTemplate()
     {
         $this->actingAs(User::factory()->canViewReports()->create())
             ->post(route('report-templates.update', ReportTemplate::factory()->create()))
-            ->assertNotFound();
+            ->assertStatus(302);
     }
 
     public function testUpdatingReportTemplateRequiresValidFields()
diff --git a/tests/Feature/StatusLabels/Ui/ShowStatusLabelTest.php b/tests/Feature/StatusLabels/Ui/ShowStatusLabelTest.php
index 0b7389603..96e8d7552 100644
--- a/tests/Feature/StatusLabels/Ui/ShowStatusLabelTest.php
+++ b/tests/Feature/StatusLabels/Ui/ShowStatusLabelTest.php
@@ -11,7 +11,7 @@ class ShowStatusLabelTest extends TestCase
     public function testPageRenders()
     {
         $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('statuslabels.show', Statuslabel::factory()->create()->id))
+            ->get(route('statuslabels.show', Statuslabel::factory()->create()))
             ->assertOk();
     }
 }
diff --git a/tests/Feature/Users/Api/DeleteUsersTest.php b/tests/Feature/Users/Api/DeleteUsersTest.php
index 9677e5f7d..a2e43f04b 100644
--- a/tests/Feature/Users/Api/DeleteUsersTest.php
+++ b/tests/Feature/Users/Api/DeleteUsersTest.php
@@ -37,7 +37,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
     {
         $user = User::factory()->deletedUser()->create();
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $user->id))
+            ->deleteJson(route('api.users.destroy', $user))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -51,7 +51,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $this->assertFalse($manager->isDeletable());
 
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $manager->id))
+            ->deleteJson(route('api.users.destroy', $manager))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -66,7 +66,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $this->assertFalse($manager->isDeletable());
 
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $manager->id))
+            ->deleteJson(route('api.users.destroy', $manager))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -81,7 +81,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $this->assertFalse($manager->isDeletable());
 
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $manager->id))
+            ->deleteJson(route('api.users.destroy', $manager))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -111,7 +111,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $userFromB = User::factory()->deleteUsers()->for($companyB)->create();
 
         $this->actingAsForApi($userFromA)
-            ->deleteJson(route('api.users.destroy', ['user' => $userFromB->id]))
+            ->deleteJson(route('api.users.destroy',  $userFromB))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -121,7 +121,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $this->assertNull($userFromB->deleted_at);
 
         $this->actingAsForApi($userFromB)
-            ->deleteJson(route('api.users.destroy', ['user' => $userFromA->id]))
+            ->deleteJson(route('api.users.destroy', $userFromA))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -131,7 +131,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $this->assertNull($userFromA->deleted_at);
 
         $this->actingAsForApi($superuser)
-            ->deleteJson(route('api.users.destroy', ['user' => $userFromA->id]))
+            ->deleteJson(route('api.users.destroy', $userFromA))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('success')
diff --git a/tests/Feature/Users/Ui/ViewUserTest.php b/tests/Feature/Users/Ui/ViewUserTest.php
index 791c80489..cb21a1e9e 100644
--- a/tests/Feature/Users/Ui/ViewUserTest.php
+++ b/tests/Feature/Users/Ui/ViewUserTest.php
@@ -20,11 +20,11 @@ class ViewUserTest extends TestCase
         $user = User::factory()->for($companyB)->create();
 
         $this->actingAs(User::factory()->editUsers()->for($companyA)->create())
-            ->get(route('users.show', ['user' => $user->id]))
-            ->assertStatus(403);
+            ->get(route('users.show', $user))
+            ->assertStatus(302);
 
         $this->actingAs($superuser)
-            ->get(route('users.show', ['user' => $user->id]))
+            ->get(route('users.show', $user))
             ->assertOk()
             ->assertStatus(200);
     }