From d5309c7d94266b26e69d5d3860d7b8dc20c738f6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 21 Jan 2025 18:06:00 +0000
Subject: [PATCH 1/6] Added fragment to uploads for redirect

Signed-off-by: snipe <snipe@snipe.net>
---
 .../AccessoriesFilesController.php            |  5 ++---
 .../AssetModelsFilesController.php            |  9 ++++-----
 .../Assets/AssetFilesController.php           | 20 +++++++------------
 .../Components/ComponentsFilesController.php  |  4 ++--
 .../ConsumablesFilesController.php            |  4 ++--
 .../Controllers/Users/UserFilesController.php |  4 ++--
 app/Http/Requests/UploadFileRequest.php       |  3 ---
 resources/views/models/view.blade.php         |  4 ++--
 8 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/app/Http/Controllers/Accessories/AccessoriesFilesController.php b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
index ebc1e4b8e0d8..c251166ce2ed 100644
--- a/app/Http/Controllers/Accessories/AccessoriesFilesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
@@ -51,7 +51,7 @@ public function store(UploadFileRequest $request, $accessoryId = null) : Redirec
                 }
 
 
-                return redirect()->route('accessories.show', $accessory->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
@@ -90,8 +90,7 @@ public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
 
             $log->delete();
 
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
         // Redirect to the licence management page
diff --git a/app/Http/Controllers/AssetModelsFilesController.php b/app/Http/Controllers/AssetModelsFilesController.php
index c905282cc56a..11ede43c640b 100644
--- a/app/Http/Controllers/AssetModelsFilesController.php
+++ b/app/Http/Controllers/AssetModelsFilesController.php
@@ -44,10 +44,10 @@ public function store(UploadFileRequest $request, $modelId = null) : RedirectRes
                 $model->logUpload($file_name, $request->get('notes'));
             }
 
-            return redirect()->back()->with('success', trans('general.file_upload_success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success'));
         }
 
-        return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
+        return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles'));
     }
 
     /**
@@ -119,11 +119,10 @@ public function destroy($modelId = null, $fileId = null) : RedirectResponse
                 }
                 $log->delete();
 
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
+                return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
             }
 
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
         // Redirect to the hardware management page
diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php
index d15055c4b2fb..96011728f99a 100644
--- a/app/Http/Controllers/Assets/AssetFilesController.php
+++ b/app/Http/Controllers/Assets/AssetFilesController.php
@@ -45,7 +45,7 @@ public function store(UploadFileRequest $request, $assetId = null) : RedirectRes
                 $asset->logUpload($file_name, $request->get('notes'));
             }
 
-            return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.upload.success'));
         }
 
         return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
@@ -97,25 +97,19 @@ public function show($assetId = null, $fileId = null) : View | RedirectResponse
      */
     public function destroy($assetId = null, $fileId = null) : RedirectResponse
     {
-        $asset = Asset::find($assetId);
-        $this->authorize('update', $asset);
-        $rel_path = 'private_uploads/assets';
-
-        // the asset is valid
-        if (isset($asset->id)) {
+        if ($asset = Asset::find($assetId))  {
             $this->authorize('update', $asset);
-            $log = Actionlog::find($fileId);
-            if ($log) {
+            $rel_path = 'private_uploads/assets';
+
+            if ($log = Actionlog::find($fileId)) {
                 if (Storage::exists($rel_path.'/'.$log->filename)) {
                     Storage::delete($rel_path.'/'.$log->filename);
                 }
                 $log->delete();
-
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
+                return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
             }
 
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->route('hardware.show', ['hardware' => $asset])->with('error',  trans('general.log_record_not_found'));
         }
 
         return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
diff --git a/app/Http/Controllers/Components/ComponentsFilesController.php b/app/Http/Controllers/Components/ComponentsFilesController.php
index 83468a0b10b4..b5e30aa694fd 100644
--- a/app/Http/Controllers/Components/ComponentsFilesController.php
+++ b/app/Http/Controllers/Components/ComponentsFilesController.php
@@ -50,7 +50,7 @@ public function store(UploadFileRequest $request, $componentId = null)
                 }
 
 
-                return redirect()->route('components.show', $component->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
@@ -91,7 +91,7 @@ public function destroy($componentId = null, $fileId = null)
 
             $log->delete();
 
-            return redirect()->back()
+            return redirect()->back()->withFragment('files')
                 ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
diff --git a/app/Http/Controllers/Consumables/ConsumablesFilesController.php b/app/Http/Controllers/Consumables/ConsumablesFilesController.php
index 054fdc0b81a9..545b008dc0b1 100644
--- a/app/Http/Controllers/Consumables/ConsumablesFilesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesFilesController.php
@@ -48,7 +48,7 @@ public function store(UploadFileRequest $request, $consumableId = null)
                 }
 
 
-                return redirect()->route('consumables.show', $consumable->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
@@ -89,7 +89,7 @@ public function destroy($consumableId = null, $fileId = null)
 
             $log->delete();
 
-            return redirect()->back()
+            return redirect()->back()->withFragment('files')
                 ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
diff --git a/app/Http/Controllers/Users/UserFilesController.php b/app/Http/Controllers/Users/UserFilesController.php
index e99bfe298f78..cae4074dd5cb 100644
--- a/app/Http/Controllers/Users/UserFilesController.php
+++ b/app/Http/Controllers/Users/UserFilesController.php
@@ -56,7 +56,7 @@ public function store(UploadFileRequest $request, $userId = null)
                 $logActions[] = $logAction;
             }
             // dd($logActions);
-            return redirect()->back()->with('success', trans('admin/users/message.upload.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.upload.success'));
         }
         return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
 
@@ -87,7 +87,7 @@ public function destroy($userId = null, $fileId = null)
                 
                 if (Storage::exists($rel_path.'/'.$filename)) {
                     Storage::delete($rel_path.'/'.$filename);
-                    return redirect()->back()->with('success', trans('admin/users/message.deletefile.success'));
+                    return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.deletefile.success'));
                 }
 
             }
diff --git a/app/Http/Requests/UploadFileRequest.php b/app/Http/Requests/UploadFileRequest.php
index 4762e52b7533..e58f1a1be37d 100644
--- a/app/Http/Requests/UploadFileRequest.php
+++ b/app/Http/Requests/UploadFileRequest.php
@@ -46,8 +46,6 @@ public function handleFile(string $dirname, string $name_prefix, $file): string
         $extension = $file->getClientOriginalExtension();
         $file_name = $name_prefix.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$file->guessExtension();
 
-
-        Log::debug("Your filetype IS: ".$file->getMimeType());
         // Check for SVG and sanitize it
         if ($file->getMimeType() === 'image/svg+xml') {
             Log::debug('This is an SVG');
@@ -66,7 +64,6 @@ public function handleFile(string $dirname, string $name_prefix, $file): string
 
         } else {
             $put_results = Storage::put($dirname.$file_name, file_get_contents($file));
-            Log::debug("Here are the '$put_results' (should be 0 or 1 or true or false or something?)");
         }
         return $file_name;
     }
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index f26b9babd4b1..15ce82d67ff7 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -49,7 +49,7 @@
                 </li>
 
                 <li>
-                    <a href="#uploads" data-toggle="tab">
+                    <a href="#files" data-toggle="tab">
 
                         <span class="hidden-lg hidden-md">
                           <i class="fas fa-barcode fa-2x"></i>
@@ -102,7 +102,7 @@ class="table table-striped snipe-table"
                 </div> <!-- /.tab-pane assets -->
 
 
-                <div class="tab-pane fade" id="uploads">
+                <div class="tab-pane fade" id="files">
 
                     <div class="row">
                         <div class="col-md-12">

From b003890dd21a00e0a963dbdc434c546d82a5a98a Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 21 Jan 2025 16:14:20 -0800
Subject: [PATCH 2/6] Migrate password helpers

---
 resources/views/settings/ldap.blade.php | 2 +-
 resources/views/setup/user.blade.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 5b483f48a2ea..f625b60d92e0 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -324,7 +324,7 @@
                                 {{ Form::label('ldap_pword', trans('admin/settings/general.ldap_pword')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::password('ldap_pword', ['class' => 'form-control', 'autocomplete' => 'off', 'onfocus' => "this.removeAttribute('readonly');", ' readonly']) }}
+                                <input class="form-control" type="password" name="ldap_pword" id="ldap_pword" value="" autocomplete="off" onfocus="this.removeAttribute('readonly');" readonly="">
                                 @error('ldap_pword')
                                     <span class="alert-msg">
                                          <x-icon type="x" />
diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php
index b35060b01f44..18da69513e4d 100644
--- a/resources/views/setup/user.blade.php
+++ b/resources/views/setup/user.blade.php
@@ -141,14 +141,14 @@
       <!-- password -->
       <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'password')) ? ' required' : '' }} {{ $errors->has('password') ? 'error' : '' }}">
         {{ Form::label('password', trans('admin/users/table.password')) }}
-        {{ Form::password('password', array('class' => 'form-control','required' => true)) }}
+        <input class="form-control" type="password" name="password" id="password" value="" required>
         {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
 
       <!-- password confirm -->
       <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'password')) ? ' required' : '' }} {{ $errors->has('password_confirm') ? 'error' : '' }}">
         {{ Form::label('password_confirmation', trans('admin/users/table.password_confirm')) }}
-        {{ Form::password('password_confirmation', array('class' => 'form-control','required' => true)) }}
+        <input class="form-control" type="password" name="password_confirmation" id="password_confirmation" value="" required>
         {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
     </div>

From 5ddf0dd789e5ad7f466bb2fe32e7130b42ec2d00 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 21 Jan 2025 16:36:22 -0800
Subject: [PATCH 3/6] Migrate form submit helper

---
 resources/views/account/requestable-assets.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index dfabd455560c..585e45aa0ab5 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -148,9 +148,9 @@ class="table table-striped snipe-table"
                                                         {{ csrf_field() }}
                                                     <input type="text" style="width: 70px; margin-right: 10px;" class="form-control pull-left" name="request-quantity" value="" placeholder="{{ trans('general.qty') }}">
                                                     @if ($requestableModel->isRequestedBy(Auth::user()))
-                                                        {{ Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}}
+                                                        <input class="btn btn-danger btn-sm" type="submit" value="{{ trans('button.cancel') }}">
                                                     @else
-                                                        {{ Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}}
+                                                        <input class="btn btn-primary btn-sm" type="submit" value="{{ trans('button.request') }}">
                                                     @endif
                                                     </form>
                                                 </td>

From be535671bcc5c23cead6fa6c397a29aef38bce55 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 22 Jan 2025 17:09:41 +0000
Subject: [PATCH 4/6] Updated language files

Signed-off-by: snipe <snipe@snipe.net>
---
 .../lang/aa-ER/admin/settings/general.php     |  28 +-
 .../lang/aa-ER/admin/settings/message.php     |   1 +
 resources/lang/aa-ER/general.php              |   9 +
 .../lang/af-ZA/admin/settings/general.php     |  28 +-
 .../lang/af-ZA/admin/settings/message.php     |   1 +
 resources/lang/af-ZA/general.php              |   9 +
 .../lang/am-ET/admin/settings/general.php     |  28 +-
 .../lang/am-ET/admin/settings/message.php     |   1 +
 resources/lang/am-ET/general.php              |   9 +
 .../lang/ar-SA/admin/settings/general.php     |  28 +-
 .../lang/ar-SA/admin/settings/message.php     |   1 +
 resources/lang/ar-SA/general.php              |   9 +
 .../lang/bg-BG/admin/settings/general.php     |  28 +-
 .../lang/bg-BG/admin/settings/message.php     |   1 +
 resources/lang/bg-BG/general.php              |   9 +
 .../lang/ca-ES/admin/settings/general.php     |  28 +-
 .../lang/ca-ES/admin/settings/message.php     |   1 +
 resources/lang/ca-ES/general.php              |   9 +
 .../lang/chr-US/admin/settings/general.php    |  28 +-
 .../lang/chr-US/admin/settings/message.php    |   1 +
 resources/lang/chr-US/general.php             |   9 +
 .../lang/cs-CZ/admin/settings/general.php     |  28 +-
 .../lang/cs-CZ/admin/settings/message.php     |   1 +
 resources/lang/cs-CZ/general.php              |   9 +
 .../lang/cy-GB/admin/settings/general.php     |  28 +-
 .../lang/cy-GB/admin/settings/message.php     |   1 +
 resources/lang/cy-GB/general.php              |   9 +
 .../lang/da-DK/admin/settings/general.php     |  28 +-
 .../lang/da-DK/admin/settings/message.php     |   1 +
 resources/lang/da-DK/general.php              |   9 +
 .../lang/de-DE/admin/settings/general.php     |  28 +-
 .../lang/de-DE/admin/settings/message.php     |   1 +
 resources/lang/de-DE/general.php              |   9 +
 .../lang/de-if/admin/settings/general.php     |  28 +-
 .../lang/de-if/admin/settings/message.php     |   1 +
 resources/lang/de-if/general.php              |   9 +
 .../lang/el-GR/admin/settings/general.php     |  28 +-
 .../lang/el-GR/admin/settings/message.php     |   1 +
 resources/lang/el-GR/general.php              |   9 +
 .../lang/en-GB/admin/settings/general.php     |  28 +-
 .../lang/en-GB/admin/settings/message.php     |   1 +
 resources/lang/en-GB/general.php              |   9 +
 .../lang/en-ID/admin/settings/general.php     |  28 +-
 .../lang/en-ID/admin/settings/message.php     |   1 +
 resources/lang/en-ID/general.php              |   9 +
 .../lang/es-CO/admin/settings/general.php     |  28 +-
 .../lang/es-CO/admin/settings/message.php     |   1 +
 resources/lang/es-CO/general.php              |   9 +
 .../lang/es-ES/admin/settings/general.php     |  28 +-
 .../lang/es-ES/admin/settings/message.php     |   1 +
 resources/lang/es-ES/general.php              |   9 +
 .../lang/es-MX/admin/settings/general.php     |  28 +-
 .../lang/es-MX/admin/settings/message.php     |   1 +
 resources/lang/es-MX/general.php              |   9 +
 .../lang/es-VE/admin/settings/general.php     |  28 +-
 .../lang/es-VE/admin/settings/message.php     |   1 +
 resources/lang/es-VE/general.php              |   9 +
 .../lang/et-EE/admin/settings/general.php     |  28 +-
 .../lang/et-EE/admin/settings/message.php     |   1 +
 resources/lang/et-EE/general.php              |   9 +
 .../lang/fa-IR/admin/settings/general.php     |  39 +-
 .../lang/fa-IR/admin/settings/message.php     |   1 +
 resources/lang/fa-IR/general.php              |   9 +
 .../lang/fi-FI/admin/settings/general.php     |  28 +-
 .../lang/fi-FI/admin/settings/message.php     |   1 +
 resources/lang/fi-FI/general.php              |   9 +
 .../lang/fil-PH/admin/settings/general.php    |  28 +-
 .../lang/fil-PH/admin/settings/message.php    |   1 +
 resources/lang/fil-PH/general.php             |   9 +
 .../lang/fr-FR/admin/settings/general.php     |  28 +-
 .../lang/fr-FR/admin/settings/message.php     |   1 +
 resources/lang/fr-FR/general.php              |   9 +
 .../lang/ga-IE/admin/settings/general.php     |  28 +-
 .../lang/ga-IE/admin/settings/message.php     |   1 +
 resources/lang/ga-IE/general.php              |   9 +
 .../lang/he-IL/admin/settings/general.php     |  28 +-
 .../lang/he-IL/admin/settings/message.php     |   1 +
 resources/lang/he-IL/general.php              |   9 +
 .../lang/hr-HR/admin/settings/general.php     |  28 +-
 .../lang/hr-HR/admin/settings/message.php     |   1 +
 resources/lang/hr-HR/general.php              |   9 +
 .../lang/hu-HU/admin/settings/general.php     |  28 +-
 .../lang/hu-HU/admin/settings/message.php     |   1 +
 resources/lang/hu-HU/general.php              |   9 +
 .../lang/id-ID/admin/settings/general.php     |  29 +-
 .../lang/id-ID/admin/settings/message.php     |   1 +
 resources/lang/id-ID/general.php              |   9 +
 .../lang/is-IS/admin/settings/general.php     |  28 +-
 .../lang/is-IS/admin/settings/message.php     |   1 +
 resources/lang/is-IS/general.php              |   9 +
 .../lang/it-IT/admin/settings/general.php     |  28 +-
 .../lang/it-IT/admin/settings/message.php     |   1 +
 resources/lang/it-IT/general.php              |   9 +
 .../lang/iu-NU/admin/settings/general.php     |  28 +-
 .../lang/iu-NU/admin/settings/message.php     |   1 +
 resources/lang/iu-NU/general.php              |   9 +
 .../lang/ja-JP/admin/settings/general.php     |  28 +-
 .../lang/ja-JP/admin/settings/message.php     |   1 +
 resources/lang/ja-JP/general.php              |   9 +
 .../lang/km-KH/admin/consumables/general.php  |  10 +-
 .../lang/km-KH/admin/consumables/message.php  |   4 +-
 .../km-KH/admin/custom_fields/general.php     |  24 +-
 .../lang/km-KH/admin/hardware/general.php     |  14 +-
 .../lang/km-KH/admin/hardware/message.php     |  24 +-
 resources/lang/km-KH/admin/hardware/table.php |  16 +-
 resources/lang/km-KH/admin/labels/table.php   |   2 +-
 resources/lang/km-KH/admin/licenses/table.php |   2 +-
 .../lang/km-KH/admin/reports/general.php      |  10 +-
 .../lang/km-KH/admin/reports/message.php      |  12 +-
 .../lang/km-KH/admin/settings/general.php     | 292 ++++++-------
 .../lang/km-KH/admin/settings/message.php     |   1 +
 resources/lang/km-KH/button.php               |  10 +-
 resources/lang/km-KH/general.php              | 225 +++++-----
 .../lang/ko-KR/admin/settings/general.php     |  28 +-
 .../lang/ko-KR/admin/settings/message.php     |   1 +
 resources/lang/ko-KR/general.php              |   9 +
 .../lang/lt-LT/admin/consumables/general.php  |   2 +-
 resources/lang/lt-LT/admin/hardware/form.php  |   2 +-
 resources/lang/lt-LT/admin/licenses/form.php  |   2 +-
 .../lang/lt-LT/admin/licenses/general.php     |   2 +-
 .../lang/lt-LT/admin/licenses/message.php     |   2 +-
 .../lang/lt-LT/admin/reports/general.php      |  10 +-
 .../lang/lt-LT/admin/reports/message.php      |  12 +-
 .../lang/lt-LT/admin/settings/general.php     |  32 +-
 .../lang/lt-LT/admin/settings/message.php     |   1 +
 resources/lang/lt-LT/admin/users/table.php    |   2 +-
 resources/lang/lt-LT/general.php              |  19 +-
 .../lang/lv-LV/admin/settings/general.php     |  28 +-
 .../lang/lv-LV/admin/settings/message.php     |   1 +
 resources/lang/lv-LV/general.php              |   9 +
 .../lang/mi-NZ/admin/settings/general.php     |  28 +-
 .../lang/mi-NZ/admin/settings/message.php     |   1 +
 resources/lang/mi-NZ/general.php              |   9 +
 .../lang/mk-MK/admin/settings/general.php     |  28 +-
 .../lang/mk-MK/admin/settings/message.php     |   1 +
 resources/lang/mk-MK/general.php              |   9 +
 .../lang/ml-IN/admin/settings/general.php     |  28 +-
 .../lang/ml-IN/admin/settings/message.php     |   1 +
 resources/lang/ml-IN/general.php              |   9 +
 .../lang/mn-MN/admin/settings/general.php     |  28 +-
 .../lang/mn-MN/admin/settings/message.php     |   1 +
 resources/lang/mn-MN/general.php              |   9 +
 .../lang/ms-MY/admin/settings/general.php     |  28 +-
 .../lang/ms-MY/admin/settings/message.php     |   1 +
 resources/lang/ms-MY/general.php              |   9 +
 .../lang/nb-NO/admin/settings/general.php     |  28 +-
 .../lang/nb-NO/admin/settings/message.php     |   1 +
 resources/lang/nb-NO/general.php              |   9 +
 .../lang/nl-NL/admin/settings/general.php     |  28 +-
 .../lang/nl-NL/admin/settings/message.php     |   1 +
 resources/lang/nl-NL/general.php              |   9 +
 .../lang/nn-NO/admin/settings/general.php     |  28 +-
 .../lang/nn-NO/admin/settings/message.php     |   1 +
 resources/lang/nn-NO/general.php              |   9 +
 .../lang/no-NO/admin/settings/general.php     |  28 +-
 .../lang/no-NO/admin/settings/message.php     |   1 +
 resources/lang/no-NO/general.php              |   9 +
 .../lang/pl-PL/admin/settings/general.php     |  28 +-
 .../lang/pl-PL/admin/settings/message.php     |   1 +
 resources/lang/pl-PL/general.php              |   9 +
 .../lang/pt-BR/admin/settings/general.php     |  28 +-
 .../lang/pt-BR/admin/settings/message.php     |   1 +
 resources/lang/pt-BR/general.php              |   9 +
 .../lang/pt-PT/admin/settings/general.php     |  28 +-
 .../lang/pt-PT/admin/settings/message.php     |   1 +
 resources/lang/pt-PT/general.php              |   9 +
 .../lang/ro-RO/admin/settings/general.php     |  28 +-
 .../lang/ro-RO/admin/settings/message.php     |   1 +
 resources/lang/ro-RO/general.php              |   9 +
 .../lang/ru-RU/admin/settings/general.php     |  28 +-
 .../lang/ru-RU/admin/settings/message.php     |   1 +
 resources/lang/ru-RU/general.php              |   9 +
 .../lang/si-LK/admin/settings/general.php     |  28 +-
 .../lang/si-LK/admin/settings/message.php     |   1 +
 resources/lang/si-LK/general.php              |   9 +
 .../lang/sk-SK/admin/hardware/general.php     |  45 +-
 .../lang/sk-SK/admin/hardware/message.php     |  46 +-
 resources/lang/sk-SK/admin/kits/general.php   |  94 ++---
 .../lang/sk-SK/admin/licenses/general.php     |  68 +--
 .../lang/sk-SK/admin/settings/general.php     | 396 +++++++++---------
 .../lang/sk-SK/admin/settings/message.php     |   1 +
 resources/lang/sk-SK/admin/users/general.php  |  46 +-
 resources/lang/sk-SK/admin/users/message.php  |  28 +-
 resources/lang/sk-SK/button.php               |   2 +-
 resources/lang/sk-SK/general.php              |  13 +-
 resources/lang/sk-SK/help.php                 |  14 +-
 resources/lang/sk-SK/localizations.php        | 204 ++++-----
 resources/lang/sk-SK/validation.php           | 316 +++++++-------
 .../lang/sl-SI/admin/settings/general.php     |  28 +-
 .../lang/sl-SI/admin/settings/message.php     |   1 +
 resources/lang/sl-SI/general.php              |   9 +
 .../lang/so-SO/admin/settings/general.php     |  28 +-
 .../lang/so-SO/admin/settings/message.php     |   1 +
 resources/lang/so-SO/general.php              |   9 +
 .../lang/sq-AL/admin/settings/general.php     |  28 +-
 .../lang/sq-AL/admin/settings/message.php     |   1 +
 resources/lang/sq-AL/general.php              |   9 +
 .../lang/sr-CS/admin/settings/general.php     |  28 +-
 .../lang/sr-CS/admin/settings/message.php     |   1 +
 resources/lang/sr-CS/general.php              |   9 +
 .../lang/sv-SE/admin/settings/general.php     |  28 +-
 .../lang/sv-SE/admin/settings/message.php     |   1 +
 resources/lang/sv-SE/general.php              |   9 +
 .../lang/ta-IN/admin/settings/general.php     |  28 +-
 .../lang/ta-IN/admin/settings/message.php     |   1 +
 resources/lang/ta-IN/general.php              |   9 +
 .../lang/th-TH/admin/settings/general.php     |  28 +-
 .../lang/th-TH/admin/settings/message.php     |   1 +
 resources/lang/th-TH/general.php              |   9 +
 .../lang/tl-PH/admin/settings/general.php     |  28 +-
 .../lang/tl-PH/admin/settings/message.php     |   1 +
 resources/lang/tl-PH/general.php              |   9 +
 .../lang/tr-TR/admin/settings/general.php     |  28 +-
 .../lang/tr-TR/admin/settings/message.php     |   1 +
 resources/lang/tr-TR/general.php              |   9 +
 .../lang/uk-UA/admin/consumables/message.php  |   2 +-
 .../uk-UA/admin/custom_fields/message.php     |   2 +-
 resources/lang/uk-UA/admin/kits/general.php   |   2 +-
 .../lang/uk-UA/admin/licenses/general.php     |   6 +-
 .../lang/uk-UA/admin/licenses/message.php     |   6 +-
 .../lang/uk-UA/admin/locations/message.php    |   2 +-
 resources/lang/uk-UA/admin/models/message.php |   2 +-
 .../lang/uk-UA/admin/reports/general.php      |  10 +-
 .../lang/uk-UA/admin/reports/message.php      |  12 +-
 .../lang/uk-UA/admin/settings/general.php     |  86 ++--
 .../lang/uk-UA/admin/settings/message.php     |   1 +
 resources/lang/uk-UA/auth/message.php         |   4 +-
 resources/lang/uk-UA/general.php              |  91 ++--
 resources/lang/uk-UA/localizations.php        |  10 +-
 .../lang/ur-PK/admin/settings/general.php     |  28 +-
 .../lang/ur-PK/admin/settings/message.php     |   1 +
 resources/lang/ur-PK/general.php              |   9 +
 .../lang/vi-VN/admin/settings/general.php     |  28 +-
 .../lang/vi-VN/admin/settings/message.php     |   1 +
 resources/lang/vi-VN/general.php              |   9 +
 .../lang/zh-CN/admin/settings/general.php     |  28 +-
 .../lang/zh-CN/admin/settings/message.php     |   1 +
 resources/lang/zh-CN/general.php              |   9 +
 .../lang/zh-HK/admin/settings/general.php     |  28 +-
 .../lang/zh-HK/admin/settings/message.php     |   1 +
 resources/lang/zh-HK/general.php              |   9 +
 .../lang/zh-TW/admin/settings/general.php     |  28 +-
 .../lang/zh-TW/admin/settings/message.php     |   1 +
 resources/lang/zh-TW/general.php              |   9 +
 .../lang/zu-ZA/admin/settings/general.php     |  28 +-
 .../lang/zu-ZA/admin/settings/message.php     |   1 +
 resources/lang/zu-ZA/general.php              |   9 +
 247 files changed, 2982 insertions(+), 1741 deletions(-)

diff --git a/resources/lang/aa-ER/admin/settings/general.php b/resources/lang/aa-ER/admin/settings/general.php
index 9c9c779b5fee..486d8aa44a1c 100644
--- a/resources/lang/aa-ER/admin/settings/general.php
+++ b/resources/lang/aa-ER/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'crwdns1987:0crwdne1987:0',
     'footer_text_help'          => 'crwdns1988:0crwdne1988:0',
     'general_settings'			=> 'crwdns1297:0crwdne1297:0',
-    'general_settings_keywords' => 'crwdns12084:0crwdne12084:0',
     'general_settings_help'     => 'crwdns6341:0crwdne6341:0',
     'generate_backup'			=> 'crwdns1427:0crwdne1427:0',
     'google_workspaces'         => 'crwdns12080:0crwdne12080:0',
@@ -154,7 +153,6 @@
     'php'                       => 'crwdns1120:0crwdne1120:0',
     'php_info'                  => 'crwdns12298:0crwdne12298:0',
     'php_overview'              => 'crwdns6367:0crwdne6367:0',
-    'php_overview_keywords'     => 'crwdns6369:0crwdne6369:0',
     'php_overview_help'         => 'crwdns6371:0crwdne6371:0',
     'php_gd_info'               => 'crwdns833:0crwdne833:0',
     'php_gd_warning'            => 'crwdns834:0crwdne834:0',
@@ -231,7 +229,6 @@
     'update'                    => 'crwdns840:0crwdne840:0',
     'value'                     => 'crwdns841:0crwdne841:0',
     'brand'                     => 'crwdns1433:0crwdne1433:0',
-    'brand_keywords'            => 'crwdns6397:0crwdne6397:0',
     'brand_help'                => 'crwdns6399:0crwdne6399:0',
     'web_brand'                 => 'crwdns5916:0crwdne5916:0',
     'about_settings_title'      => 'crwdns1434:0crwdne1434:0',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'crwdns6431:0crwdne6431:0',
     'security' => 'crwdns6433:0crwdne6433:0',
     'security_title' => 'crwdns6435:0crwdne6435:0',
-    'security_keywords' => 'crwdns6437:0crwdne6437:0',
     'security_help' => 'crwdns6439:0crwdne6439:0',
-    'groups_keywords' => 'crwdns6441:0crwdne6441:0',
     'groups_help' => 'crwdns6443:0crwdne6443:0',
     'localization' => 'crwdns6445:0crwdne6445:0',
     'localization_title' => 'crwdns6447:0crwdne6447:0',
-    'localization_keywords' => 'crwdns6449:0crwdne6449:0',
     'localization_help' => 'crwdns6451:0crwdne6451:0',
     'notifications' => 'crwdns6453:0crwdne6453:0',
     'notifications_help' => 'crwdns11363:0crwdne11363:0',
     'asset_tags_help' => 'crwdns6457:0crwdne6457:0',
     'labels' => 'crwdns6459:0crwdne6459:0',
     'labels_title' => 'crwdns6461:0crwdne6461:0',
-    'labels_help' => 'crwdns6463:0crwdne6463:0',
-    'purge_keywords' => 'crwdns6467:0crwdne6467:0',
+    'labels_help' => 'crwdns12840:0crwdne12840:0',
     'purge_help' => 'crwdns6469:0crwdne6469:0',
     'ldap_extension_warning' => 'crwdns6471:0crwdne6471:0',
     'ldap_ad' => 'crwdns6473:0crwdne6473:0',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'crwdns11745:0crwdne11745:0',
     'label2_2d_type_help'     => 'crwdns11747:0crwdne11747:0',
     'label2_2d_target'        => 'crwdns11749:0crwdne11749:0',
-    'label2_2d_target_help'   => 'crwdns11751:0crwdne11751:0',
+    'label2_2d_target_help'   => 'crwdns12832:0crwdne12832:0',
     'label2_fields'           => 'crwdns11753:0crwdne11753:0',
     'label2_fields_help'      => 'crwdns11755:0crwdne11755:0',
     'help_asterisk_bold'    => 'crwdns11757:0crwdne11757:0',
     'help_blank_to_use'     => 'crwdns11759:0crwdne11759:0',
-    'help_default_will_use' => 'crwdns12828:0crwdne12828:0',
+    'help_default_will_use' => 'crwdns12834:0crwdne12834:0',
+    'asset_id'              => 'crwdns12836:0crwdne12836:0',
+    'data'               => 'crwdns12838:0crwdne12838:0',
     'default'               => 'crwdns11763:0crwdne11763:0',
     'none'                  => 'crwdns11765:0crwdne11765:0',
     'google_callback_help' => 'crwdns11615:0crwdne11615:0',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'crwdns12682:0crwdne12682:0',
     'no_groups' => 'crwdns12760:0crwdne12760:0',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'crwdns12842:0crwdne12842:0',
+        'general_settings'  => 'crwdns12844:0crwdne12844:0',
+        'groups'            => 'crwdns12846:0crwdne12846:0',
+        'labels'            => 'crwdns12848:0crwdne12848:0',
+        'localization'      => 'crwdns12850:0crwdne12850:0',
+        'php_overview'      => 'crwdns12852:0crwdne12852:0',
+        'purge'             => 'crwdns12854:0crwdne12854:0',
+        'security'          => 'crwdns12856:0crwdne12856:0',
+    ],
+
 ];
diff --git a/resources/lang/aa-ER/admin/settings/message.php b/resources/lang/aa-ER/admin/settings/message.php
index c70ad109e02e..6ea3f0ca34de 100644
--- a/resources/lang/aa-ER/admin/settings/message.php
+++ b/resources/lang/aa-ER/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'crwdns11381:0crwdne11381:0',
         'error_redirect' => 'crwdns11843:0crwdne11843:0',
         'error_misc' => 'crwdns11383:0crwdne11383:0',
+        'webhook_fail' => 'crwdns12830:0crwdne12830:0',
     ]
 ];
diff --git a/resources/lang/aa-ER/general.php b/resources/lang/aa-ER/general.php
index 851c381e9844..625d52f406c4 100644
--- a/resources/lang/aa-ER/general.php
+++ b/resources/lang/aa-ER/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'crwdns1074:0crwdne1074:0',
     'no'  					=> 'crwdns1075:0crwdne1075:0',
     'notes'  				=> 'crwdns1076:0crwdne1076:0',
+    'note_added'            => 'crwdns12858:0crwdne12858:0',
+    'add_note'              => 'crwdns12860:0crwdne12860:0',
+    'note_edited'            => 'crwdns12862:0crwdne12862:0',
+    'edit_note'              => 'crwdns12864:0crwdne12864:0',
+    'note_deleted'            => 'crwdns12866:0crwdne12866:0',
+    'delete_note'              => 'crwdns12868:0crwdne12868:0',
     'order_number'          => 'crwdns1829:0crwdne1829:0',
     'only_deleted'          => 'crwdns10520:0crwdne10520:0',
     'page_menu'				=> 'crwdns1276:0crwdne1276:0',
@@ -566,5 +572,8 @@
     'import_asset_tag_exists' => 'crwdns12692:0crwdne12692:0',
     'countries_manually_entered_help' => 'crwdns12702:0crwdne12702:0',
     'accessories_assigned' => 'crwdns12800:0crwdne12800:0',
+    'user_managed_passwords' => 'crwdns12870:0crwdne12870:0',
+    'user_managed_passwords_disallow' => 'crwdns12872:0crwdne12872:0',
+    'user_managed_passwords_allow' => 'crwdns12874:0crwdne12874:0',
 
 ];
diff --git a/resources/lang/af-ZA/admin/settings/general.php b/resources/lang/af-ZA/admin/settings/general.php
index 1b7621a71059..8ac7f5678893 100644
--- a/resources/lang/af-ZA/admin/settings/general.php
+++ b/resources/lang/af-ZA/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'Algemene instellings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Genereer rugsteun',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP weergawe',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Jy moet php-gd installeer om QR-kodes te vertoon, sien installeringsinstruksies.',
     'php_gd_warning'            => 'PHP Image Processing en GD plugin is NIE geïnstalleer nie.',
@@ -231,7 +229,6 @@
     'update'                    => 'Opdateer instellings',
     'value'                     => 'waarde',
     'brand'                     => 'Handelsmerk',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Oor instellings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/af-ZA/admin/settings/message.php b/resources/lang/af-ZA/admin/settings/message.php
index abbc3156164a..07ff4e44a0eb 100644
--- a/resources/lang/af-ZA/admin/settings/message.php
+++ b/resources/lang/af-ZA/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/af-ZA/general.php b/resources/lang/af-ZA/general.php
index 9afde7bbca81..a56402945b79 100644
--- a/resources/lang/af-ZA/general.php
+++ b/resources/lang/af-ZA/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Geen resultate.',
     'no'  					=> 'Geen',
     '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',
     'order_number'          => 'Bestellingnommer',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Wys _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/am-ET/admin/settings/general.php b/resources/lang/am-ET/admin/settings/general.php
index 6dcfee66be14..97567df8dfd4 100644
--- a/resources/lang/am-ET/admin/settings/general.php
+++ b/resources/lang/am-ET/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/am-ET/admin/settings/message.php b/resources/lang/am-ET/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/am-ET/admin/settings/message.php
+++ b/resources/lang/am-ET/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/am-ET/general.php b/resources/lang/am-ET/general.php
index f0f10797edd5..e91979b76695 100644
--- a/resources/lang/am-ET/general.php
+++ b/resources/lang/am-ET/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     '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',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/ar-SA/admin/settings/general.php b/resources/lang/ar-SA/admin/settings/general.php
index 57d7b5a1522b..e349eaa8e3af 100644
--- a/resources/lang/ar-SA/admin/settings/general.php
+++ b/resources/lang/ar-SA/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'إضافة نص لتذييل الصفحة ',
     'footer_text_help'          => 'سيظهر هذا النص في تذييل الجانب الأيمن. يُسمح باستخدام الروابط باستخدام < href="https://help.github.com/articles/github-flavored-markdown/">eGithub بنكهة markdown</a>. فواصل الأسطر، رؤوس، الصور، الخ قد يؤدي إلى نتائج غير متوقعة.',
     'general_settings'			=> 'الاعدادات العامة',
-    'general_settings_keywords' => 'دعم الشركة، التوقيع، القبول، تنسيق البريد الإلكتروني، تنسيق اسم المستخدم، الصور، لكل صفحة، صورة مصغرة، إيولا، الجاذبية، التصورات، لوحة التحكم، الخصوصية',
     'general_settings_help'     => 'اتفاقية ترخيص المستخدم الافتراضية والمزيد',
     'generate_backup'			=> 'إنشاء النسخ الاحتياطي',
     'google_workspaces'         => 'مساحات عمل جوجل',
@@ -154,7 +153,6 @@
     'php'                       => 'نسخة فب',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, النظام, معلومات',
     'php_overview_help'         => 'معلومات نظام PHP',
     'php_gd_info'               => 'يجب تثبيت فب-غ لعرض رموز قر، راجع تعليمات التثبيت.',
     'php_gd_warning'            => 'لم يتم تثبيت فب معالجة الصور و غ المساعد.',
@@ -231,7 +229,6 @@
     'update'                    => 'إعدادات التحديث',
     'value'                     => 'القيمة',
     'brand'                     => 'العلامات التجارية',
-    'brand_keywords'            => 'قدم, الشعار, الطباعة, الموضوع, الجلد , الرأس , الألوان , الألوان',
     'brand_help'                => 'الشعار ، اسم الموقع',
     'web_brand'                 => 'نوع العلامات التجارية للويب',
     'about_settings_title'      => 'حول الإعدادات',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'تصفية عن طريق إعداد الكلمة المفتاحية',
     'security' => 'أمان',
     'security_title' => 'تحديث إعدادات الأمان',
-    'security_keywords' => 'كلمة المرور، كلمة المرور، كلمات المرور، المتطلبات، عاملان، كلمات المرور الشائعة، تسجيل الدخول، المصادقة',
     'security_help' => 'عاملين، قيود كلمة المرور',
-    'groups_keywords' => 'الأذونات، مجموعات الأذونات، تفويض',
     'groups_help' => 'مجموعات إذن الحساب',
     'localization' => 'التعريب',
     'localization_title' => 'تحديث إعدادات التعريب',
-    'localization_keywords' => 'التعميم، العملة، المحلية المحلية، المحلية والمنطقة الزمنية، المنطقة الزمنية، الدولية، الاستيعاب، اللغة، الترجمة',
     'localization_help' => 'اللغة، عرض التاريخ',
     'notifications' => 'الإشعارات',
     'notifications_help' => 'إعدادات تنبيهات ومراجعة حسابات البريد الإلكتروني',
     'asset_tags_help' => 'زيادة والبادئات',
     'labels' => 'التسميات',
     'labels_title' => 'تحديث إعدادات التسمية',
-    'labels_help' => 'أحجام التسمية &amp; الإعدادات',
-    'purge_keywords' => 'حذف نهائيًا',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'تطهير السجلات المحذوفة',
     'ldap_extension_warning' => 'لا يبدو أن ملحق LDAP مثبت أو مفعّل على هذا الخادم. لا يزال بإمكانك حفظ الإعدادات الخاصة بك، ولكن ستحتاج إلى تمكين ملحق LDAP لـ PHP قبل أن تعمل مزامنة LDAP أو تسجيل الدخول.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D نوع الباركود',
     'label2_2d_type_help'     => 'تنسيق الباركود ثنائية الأبعاد',
     'label2_2d_target'        => 'هدف الباركود 2D',
-    'label2_2d_target_help'   => 'عنوان URL الباركود 2D يشير إلى عندما يتم مسحه',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'تعاريف الحقل',
     'label2_fields_help'      => 'يمكن إضافة الحقول وإزالتها وإعادة ترتيبها في العمود الأيسر. لكل حقل ، يمكن إضافة خيارات متعددة للتسمية و DataSource ، وإزالتها وإعادة ترتيبها في العمود الأيمن.',
     'help_asterisk_bold'    => 'النص الذي تم إدخاله كـ <code>**text**</code> سيتم عرضه بالخط العريض',
     'help_blank_to_use'     => 'اتركه فارغاً لاستخدام القيمة من <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'الافتراضي',
     'none'                  => 'لا',
     'google_callback_help' => 'يجب إدخال هذا كعنوان URL لرد الاتصال في إعدادات تطبيق Google OAuth في مؤسستك&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'قدم, الشعار, الطباعة, الموضوع, الجلد , الرأس , الألوان , الألوان',
+        'general_settings'  => 'دعم الشركة، التوقيع، القبول، تنسيق البريد الإلكتروني، تنسيق اسم المستخدم، الصور، لكل صفحة، صورة مصغرة، إيولا، الجاذبية، التصورات، لوحة التحكم، الخصوصية',
+        'groups'            => 'الأذونات، مجموعات الأذونات، تفويض',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'التعميم، العملة، المحلية المحلية، المحلية والمنطقة الزمنية، المنطقة الزمنية، الدولية، الاستيعاب، اللغة، الترجمة',
+        'php_overview'      => 'phpinfo, النظام, معلومات',
+        'purge'             => 'حذف نهائيًا',
+        'security'          => 'كلمة المرور، كلمة المرور، كلمات المرور، المتطلبات، عاملان، كلمات المرور الشائعة، تسجيل الدخول، المصادقة',
+    ],
+
 ];
diff --git a/resources/lang/ar-SA/admin/settings/message.php b/resources/lang/ar-SA/admin/settings/message.php
index 465ae7c65359..6c9c5074832e 100644
--- a/resources/lang/ar-SA/admin/settings/message.php
+++ b/resources/lang/ar-SA/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'حدث خطأ ما. استجاب :app :error_message',
         'error_redirect' => 'خطأ: 301/302 :endpoint يرجع إعادة توجيه. لأسباب أمنية، نحن لا نتابع إعادة التوجيه. الرجاء استخدام نقطة النهاية الفعلية.',
         'error_misc' => 'حدث خطأ ما. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];
diff --git a/resources/lang/ar-SA/general.php b/resources/lang/ar-SA/general.php
index cde45f5384e5..8e05a77dcc01 100644
--- a/resources/lang/ar-SA/general.php
+++ b/resources/lang/ar-SA/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'لا يوجد نتائج.',
     'no'  					=> 'لا',
     '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',
     'order_number'          => 'رقم الأمر',
     'only_deleted'          => 'الأصول المحذوفة فقط',
     'page_menu'				=> 'عرض عناصر _MENU_',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/bg-BG/admin/settings/general.php b/resources/lang/bg-BG/admin/settings/general.php
index 70ce0af38e5d..4a9106ce12a4 100644
--- a/resources/lang/bg-BG/admin/settings/general.php
+++ b/resources/lang/bg-BG/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Допълнителен текст във футъра',
     'footer_text_help'          => 'Този текст ще се визуализира в дясната част на футъра. Връзки могат да бъдат добавяни с използването на <a href="https://help.github.com/articles/github-flavored-markdown/">Github тип markdown</a>. Нови редове, хедър тагове, изображения и т.н. могат да доведат до непредвидими резултати.',
     'general_settings'			=> 'Общи настройки',
-    'general_settings_keywords' => 'поддръжка, подписи, получаване, формат на е-майл, формат на потребителско име, снимки, страници, иконки, EULA, Gravatar, tos, панели, поверителност',
     'general_settings_help'     => 'Общи условия и други',
     'generate_backup'			=> 'Създаване на архив',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP версия',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, система, информация',
     'php_overview_help'         => 'PHP Системна информация',
     'php_gd_info'               => 'Необходимо е да инсталирате php-gd, за да визуализирате QR кодове. Моля прегледайте инструкцията за инсталация.',
     'php_gd_warning'            => 'php-gd НЕ е инсталиран.',
@@ -231,7 +229,6 @@
     'update'                    => 'Обновяване на настройките',
     'value'                     => 'Стойност',
     'brand'                     => 'Брандиране',
-    'brand_keywords'            => 'долен колонтитул, лого, печат, тема, скин, горен колонтитул, цветове, css',
     'brand_help'                => 'Лого, Име на сайт',
     'web_brand'                 => 'Тип уеб брандиране',
     'about_settings_title'      => 'Относно настройките',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Филтър по ключова дума',
     'security' => 'Сигурност',
     'security_title' => 'Обнови настройките за сигурност',
-    'security_keywords' => 'парола, парили, изисквания, двустепенна идентификация, двустепенна-идентификация, общи пароли, отдалечен вход, изход, идентификация',
     'security_help' => 'Двустепенна идентификация, ограничения на пароли',
-    'groups_keywords' => 'права за достъп, групи за достъп, упълномощаване',
     'groups_help' => 'Групи с разрешения за акаунт',
     'localization' => 'Локализация',
     'localization_title' => 'Обнови настройките за локализация',
-    'localization_keywords' => 'локализация, валута, местен, място, часова зона, международен, интернационализация, език, езици, превод',
     'localization_help' => 'Език, дата формат',
     'notifications' => 'Известия',
     'notifications_help' => 'Настройки на е-майл известия',
     'asset_tags_help' => 'Автоматично номериране и префикси',
     'labels' => 'Етикети',
     'labels_title' => 'Обнови настройките на етикета',
-    'labels_help' => 'Размер на етикета &amp; настройки',
-    'purge_keywords' => 'изтриване за постоянно',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Пречисти изтрити записи',
     'ldap_extension_warning' => 'Изглежда, че нямате инсталирани LDAP разширения или не са пуснати на сървъра. Вие можете все пак да запишите настройките, но ще трябва да включите LDAP разширенията за PHP преди да синхронизирате с LDAP, в противен случай няма да можете да се логнете.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D тип на баркод',
     'label2_2d_type_help'     => 'Формат на 2D баркод',
     'label2_2d_target'        => '2D баркод адрес',
-    'label2_2d_target_help'   => 'Къде да сочи URL адреса на 2D баркода, когато се сканира',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Настройки на полета',
     'label2_fields_help'      => 'Полетата могат да бъдат добавяни, премахване и подреждани от лявата колона. За всяко едно поле, множество настройки могат да бъдат добавяни премахвани и подреждани в дясната колона.',
     'help_asterisk_bold'    => 'Текста въведен като <code>**text**</code> ,ще бъде показан удебелено',
     'help_blank_to_use'     => 'Оставете празно за да се ползва стойност от <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Подразбиране',
     'none'                  => 'Няма',
     'google_callback_help' => 'Това трябва да се въведе като callback URL във вашият Google OAuth настройки за вашата организация &apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'долен колонтитул, лого, печат, тема, скин, горен колонтитул, цветове, css',
+        'general_settings'  => 'поддръжка, подписи, получаване, формат на е-майл, формат на потребителско име, снимки, страници, иконки, EULA, Gravatar, tos, панели, поверителност',
+        'groups'            => 'права за достъп, групи за достъп, упълномощаване',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'локализация, валута, местен, място, часова зона, международен, интернационализация, език, езици, превод',
+        'php_overview'      => 'phpinfo, система, информация',
+        'purge'             => 'изтриване за постоянно',
+        'security'          => 'парола, парили, изисквания, двустепенна идентификация, двустепенна-идентификация, общи пароли, отдалечен вход, изход, идентификация',
+    ],
+
 ];
diff --git a/resources/lang/bg-BG/admin/settings/message.php b/resources/lang/bg-BG/admin/settings/message.php
index add033b7f19d..593fb56f6354 100644
--- a/resources/lang/bg-BG/admin/settings/message.php
+++ b/resources/lang/bg-BG/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Възникна грешка. :app върна грешка: :error_message',
         'error_redirect' => 'Грешка 301/302 :endpoint върна пренасочване. От съображения за сигурност, ние не отваряме пренасочванията. Моля ползвайте действителната крайна точка.',
         'error_misc' => 'Възникна грешка. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];
diff --git a/resources/lang/bg-BG/general.php b/resources/lang/bg-BG/general.php
index b6b8a0ca406d..fbd52a06c471 100644
--- a/resources/lang/bg-BG/general.php
+++ b/resources/lang/bg-BG/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Няма резултат.',
     'no'  					=> 'Не',
     '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',
     'order_number'          => 'Номер на поръчка',
     'only_deleted'          => 'Само изтрити активи',
     'page_menu'				=> 'Показване на _MENU_ записа',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/ca-ES/admin/settings/general.php b/resources/lang/ca-ES/admin/settings/general.php
index 6dcfee66be14..97567df8dfd4 100644
--- a/resources/lang/ca-ES/admin/settings/general.php
+++ b/resources/lang/ca-ES/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/ca-ES/admin/settings/message.php b/resources/lang/ca-ES/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/ca-ES/admin/settings/message.php
+++ b/resources/lang/ca-ES/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/ca-ES/general.php b/resources/lang/ca-ES/general.php
index 1c384137aa0b..3c4b9aaf9be1 100644
--- a/resources/lang/ca-ES/general.php
+++ b/resources/lang/ca-ES/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     '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',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/chr-US/admin/settings/general.php b/resources/lang/chr-US/admin/settings/general.php
index 6dcfee66be14..97567df8dfd4 100644
--- a/resources/lang/chr-US/admin/settings/general.php
+++ b/resources/lang/chr-US/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/chr-US/admin/settings/message.php b/resources/lang/chr-US/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/chr-US/admin/settings/message.php
+++ b/resources/lang/chr-US/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/chr-US/general.php b/resources/lang/chr-US/general.php
index 20c1cf8aeaae..77670b5a7e47 100644
--- a/resources/lang/chr-US/general.php
+++ b/resources/lang/chr-US/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     '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',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/cs-CZ/admin/settings/general.php b/resources/lang/cs-CZ/admin/settings/general.php
index 628128f15a93..c48f9014f48f 100644
--- a/resources/lang/cs-CZ/admin/settings/general.php
+++ b/resources/lang/cs-CZ/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Další text do zápatí ',
     'footer_text_help'          => 'Tento text se zobrazí v pravém zápatí. Odkazy jsou povoleny pomocí <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Zalamování řádků, záhlaví, obrázky atd. mohou mít za následek nepředvídatelné výsledky.',
     'general_settings'			=> 'Obecné nastavení',
-    'general_settings_keywords' => 'podpora společnosti, podpis, přijetí, e-mailový formát, formát uživatelského jména, obrázky, na stránku, náhled, eula, gravatar, toky, nástěnka, soukromí',
     'general_settings_help'     => 'Výchozí EULA a další',
     'generate_backup'			=> 'Vytvořit zálohu',
     'google_workspaces'         => 'Pracovní prostory Google',
@@ -154,7 +153,6 @@
     'php'                       => 'Verze PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, systém, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Je nutné nainstalovat php-gd pro zobrazení QR kódů. Více v instalační příručce.',
     'php_gd_warning'            => 'PHP pluginy pro zpracování obrazu a GD nejsou nainstalovány.',
@@ -231,7 +229,6 @@
     'update'                    => 'Upravit nastavení',
     'value'                     => 'Hodnota',
     'brand'                     => 'Opatřit značkou',
-    'brand_keywords'            => 'zápatí, logo, tisk, motiv, skin, záhlaví, barvy, css',
     'brand_help'                => 'Logo, název webu',
     'web_brand'                 => 'Typ webového brandingu',
     'about_settings_title'      => 'O nastavení',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrovat podle klíčového slova',
     'security' => 'Zabezpečení',
     'security_title' => 'Aktualizovat nastavení zabezpečení',
-    'security_keywords' => 'heslo, hesla, požadavky, dvou fázové, dvou-fázové, běžná hesla, vzdálené přihlášení, odhlášení, autentifikace',
     'security_help' => 'Dvou-faktorové, Omezení hesel',
-    'groups_keywords' => 'oprávnění, skupiny oprávnění, autorizace',
     'groups_help' => 'Skupiny oprávnění k účtu',
     'localization' => 'Lokalizace',
     'localization_title' => 'Aktualizovat nastavení lokalizace',
-    'localization_keywords' => 'lokalizace, měna, místní, místní, časové pásmo, mezinárodní, internatinalizace, jazyk, jazyky, překlad',
     'localization_help' => 'Jazyk, zobrazení data',
     'notifications' => 'Oznámení',
     'notifications_help' => 'E-mailová oznámení a inventura',
     'asset_tags_help' => 'Nárůst a prefixy',
     'labels' => 'Štítky',
     'labels_title' => 'Upravit nastavení štítků',
-    'labels_help' => 'Velikost štítků &amp; nastavení',
-    'purge_keywords' => 'trvale odstranit',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Typ 2D čárového kódu',
     'label2_2d_type_help'     => 'Formát pro 2D čárové kódy',
     'label2_2d_target'        => 'Cíl 2D čárového kódu',
-    'label2_2d_target_help'   => 'Adresa URL 2D čárového kódu při naskenování',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Definice polí',
     'label2_fields_help'      => 'Pole lze přidat, odstranit a seřadit v levém sloupci. Pro každé pole lze přidat více možností pro popisek a DataSource a odstranit a přeřadit je v pravém sloupci.',
     'help_asterisk_bold'    => 'Text zadaný jako <code>**text**</code> bude zobrazen tučně',
     'help_blank_to_use'     => 'Ponechte prázdné pro použití hodnoty z <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Výchozí',
     'none'                  => 'Nic',
     'google_callback_help' => 'Toto by mělo být zadáno jako URL zpětného volání v nastavení aplikace Google OAuth ve vaší organizaci&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">vývojová konzole Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'zápatí, logo, tisk, motiv, skin, záhlaví, barvy, css',
+        'general_settings'  => 'podpora společnosti, podpis, přijetí, e-mailový formát, formát uživatelského jména, obrázky, na stránku, náhled, eula, gravatar, toky, nástěnka, soukromí',
+        'groups'            => 'oprávnění, skupiny oprávnění, autorizace',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalizace, měna, místní, místní, časové pásmo, mezinárodní, internatinalizace, jazyk, jazyky, překlad',
+        'php_overview'      => 'phpinfo, systém, info',
+        'purge'             => 'trvale odstranit',
+        'security'          => 'heslo, hesla, požadavky, dvou fázové, dvou-fázové, běžná hesla, vzdálené přihlášení, odhlášení, autentifikace',
+    ],
+
 ];
diff --git a/resources/lang/cs-CZ/admin/settings/message.php b/resources/lang/cs-CZ/admin/settings/message.php
index cf864a01c275..07d2d4a265ff 100644
--- a/resources/lang/cs-CZ/admin/settings/message.php
+++ b/resources/lang/cs-CZ/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Něco se pokazilo. :app odpověděla v: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/cs-CZ/general.php b/resources/lang/cs-CZ/general.php
index 513596a5533d..5197c5611adc 100644
--- a/resources/lang/cs-CZ/general.php
+++ b/resources/lang/cs-CZ/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Žádné výsledky.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Poznámky',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Číslo objednávky',
     'only_deleted'          => 'Pouze odstraněné položky',
     'page_menu'				=> 'Zobrazuji _MENU_ položky',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/cy-GB/admin/settings/general.php b/resources/lang/cy-GB/admin/settings/general.php
index 6320ca37239f..0910e824974c 100644
--- a/resources/lang/cy-GB/admin/settings/general.php
+++ b/resources/lang/cy-GB/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Testun Troedyn Ychwanegol ',
     'footer_text_help'          => 'Dangosir y text yma ir ochor dde yn y troedyn. Mae lincs yn dderbyniol gan defnyddio <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'Gosodiadau Cyffredinol',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Creu copi-wrth-gefn',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'Fersiwn PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Rhaid gossod php-gd i weld codau QR, gweler y canllaawiau gosod.',
     'php_gd_warning'            => 'NID yw PHP IMage Processing a\'r plugin GD wedi osod.',
@@ -231,7 +229,6 @@
     'update'                    => 'Diweddaru Gosodiadau',
     'value'                     => 'Gwerth',
     'brand'                     => 'Brandio',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Enw\'r Wefan',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Amdan Gosodiadau',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Diogelwch',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labelau',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Math Barcode 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/cy-GB/admin/settings/message.php b/resources/lang/cy-GB/admin/settings/message.php
index e61b274b1ea6..97d7ddeeabed 100644
--- a/resources/lang/cy-GB/admin/settings/message.php
+++ b/resources/lang/cy-GB/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/cy-GB/general.php b/resources/lang/cy-GB/general.php
index af4dd185347e..34ad580c669c 100644
--- a/resources/lang/cy-GB/general.php
+++ b/resources/lang/cy-GB/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Dim canlyniadau.',
     'no'  					=> 'Na',
     'notes'  				=> 'Nodiadau',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Rhif Archeb',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/da-DK/admin/settings/general.php b/resources/lang/da-DK/admin/settings/general.php
index ada1136fc9c8..63152f4f56f3 100644
--- a/resources/lang/da-DK/admin/settings/general.php
+++ b/resources/lang/da-DK/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Ekstra footer tekst ',
     'footer_text_help'          => 'Denne tekst vil vises i footeren i højre side. Der kan anvendes links ved hjælp af <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Linjeskift, headere, billeder etc. kan føre til uforudsigelige resultater.',
     'general_settings'			=> 'Generelle indstillinger',
-    'general_settings_keywords' => 'firma support, signatur, accept, e-mail format, brugernavn format, billeder, per side, miniaturebillede, eula, gravatar, tos, instrumentbræt, privatliv',
     'general_settings_help'     => 'Standard slutbrugerlicens og mere',
     'generate_backup'			=> 'Generer sikkerhedskopiering',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'Php System info',
     'php_gd_info'               => 'Du skal installere php-gd for at vise QR-koder, se installationsvejledningen.',
     'php_gd_warning'            => 'PHP Image Processing og GD plugin er IKKE installeret.',
@@ -231,7 +229,6 @@
     'update'                    => 'Opdater indstillinger',
     'value'                     => 'Værdi',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, tema, hud, header, farver, farve, css',
     'brand_help'                => 'Logo, Webstedsnavn',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Om indstillinger',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrer efter indstilling af søgeord',
     'security' => 'Sikkerhed',
     'security_title' => 'Opdater Sikkerhedsindstillinger',
-    'security_keywords' => 'adgangskode, adgangskoder, krav, to faktor, to-faktor, almindelige adgangskoder, fjernlogin, logout, godkendelse',
     'security_help' => 'To-faktor, Adgangskodebegrænsninger',
-    'groups_keywords' => 'tilladelser, tilladelsesgrupper, tilladelse',
     'groups_help' => 'Konto tilladelsesgrupper',
     'localization' => 'Lokalisering',
     'localization_title' => 'Opdater Lokaliseringsindstillinger',
-    'localization_keywords' => 'lokalisering, valuta, lokal, lokal, tidszone, international, internatinalisering, sprog, oversættelse',
     'localization_help' => 'Sprog og datovisning',
     'notifications' => 'Notifikationer',
     'notifications_help' => 'E-Mail Advarsler Og Revisionsindstillinger',
     'asset_tags_help' => 'Stigende og præfikser',
     'labels' => 'Etiketter',
     'labels_title' => 'Opdater Etiketindstillinger',
-    'labels_help' => 'Etiketstørrelser &amp; indstillinger',
-    'purge_keywords' => 'slet permanent',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D stregkode type',
     'label2_2d_type_help'     => 'Format for 2D stregkoder',
     'label2_2d_target'        => '2D Stregkode Mål',
-    'label2_2d_target_help'   => 'URL\'en 2D stregkode peger på, når der scannes',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Feltdefinitioner',
     'label2_fields_help'      => 'Felter kan tilføjes, fjernes og omordnes i venstre kolonne. For hvert felt kan flere muligheder for Label og DataSource tilføjes, fjernes og omordnet i den rigtige kolonne.',
     'help_asterisk_bold'    => 'Tekst indtastet som <code>**text**</code> vil blive vist som fed',
     'help_blank_to_use'     => 'Efterlad blank for at bruge værdien fra <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Standard',
     'none'                  => 'Ingen',
     'google_callback_help' => 'Dette skal indtastes som callback URL i dine Google OAuth app indstillinger i din organisation&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google udvikler konsol <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, tema, hud, header, farver, farve, css',
+        'general_settings'  => 'firma support, signatur, accept, e-mail format, brugernavn format, billeder, per side, miniaturebillede, eula, gravatar, tos, instrumentbræt, privatliv',
+        'groups'            => 'tilladelser, tilladelsesgrupper, tilladelse',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisering, valuta, lokal, lokal, tidszone, international, internatinalisering, sprog, oversættelse',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'slet permanent',
+        'security'          => 'adgangskode, adgangskoder, krav, to faktor, to-faktor, almindelige adgangskoder, fjernlogin, logout, godkendelse',
+    ],
+
 ];
diff --git a/resources/lang/da-DK/admin/settings/message.php b/resources/lang/da-DK/admin/settings/message.php
index 8e7ded2528aa..d66be05594a5 100644
--- a/resources/lang/da-DK/admin/settings/message.php
+++ b/resources/lang/da-DK/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Noget gik galt. :app svarede med: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/da-DK/general.php b/resources/lang/da-DK/general.php
index e6c257687df7..d63b69297091 100644
--- a/resources/lang/da-DK/general.php
+++ b/resources/lang/da-DK/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Ingen Resultater.',
     'no'  					=> 'Nej',
     'notes'  				=> 'Noter',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Ordrenummer',
     'only_deleted'          => 'Kun slettede aktiver',
     'page_menu'				=> 'Viser _MENU_ emner',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/de-DE/admin/settings/general.php b/resources/lang/de-DE/admin/settings/general.php
index 74b21041f4f9..4e3d764b51f0 100644
--- a/resources/lang/de-DE/admin/settings/general.php
+++ b/resources/lang/de-DE/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Zusätzlicher Fußzeilentext ',
     'footer_text_help'          => 'Dieser Text wird in der rechten Fußzeile angezeigt. Links sind erlaubt mit <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored Markdown</a>. Zeilenumbrüche, Kopfzeilen, Bilder usw. können zu unvorhersehbaren Verhalten führen.',
     'general_settings'			=> 'Allgemeine Einstellungen',
-    'general_settings_keywords' => 'Firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzernamenformat, Bilder, pro Seite, Vorschaubilder, EULA, Gravatar, TOS, Dashboard, Privatsphäre',
     'general_settings_help'     => 'Standard EULA und mehr',
     'generate_backup'			=> 'Backup erstellen',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP Info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'php Info, System, Info',
     'php_overview_help'         => 'PHP-Systeminfo',
     'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationshinweise.',
     'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
@@ -231,7 +229,6 @@
     'update'                    => 'Einstellungen übernehmen',
     'value'                     => 'Wert',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'Fußzeile, Logo, Druck, Theme, Skin, Header, Farben, Farbe, CSS',
     'brand_help'                => 'Logo, Seitenname',
     'web_brand'                 => 'Web Branding Typ',
     'about_settings_title'      => 'Über Einstellungen',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Nach Stichwort filtern',
     'security' => 'Sicherheit',
     'security_title' => 'Sicherheitseinstellungen aktualisieren',
-    'security_keywords' => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
     'security_help' => 'Zwei-Faktor, Passwort-Einschränkungen',
-    'groups_keywords' => 'Berechtigungen, Berechtigungsgruppen, Autorisierung',
     'groups_help' => 'Account-Berechtigungsgruppen',
     'localization' => 'Lokalisierung',
     'localization_title' => 'Lokalisierungseinstellungen aktualisieren',
-    'localization_keywords' => 'Lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
     'localization_help' => 'Sprache, Datumsanzeige',
     'notifications' => 'Benachrichtigungen',
     'notifications_help' => 'E-Mail-Benachrichtigungen & Audit-Einstellungen',
     'asset_tags_help' => 'Inkrementieren und Präfixe',
     'labels' => 'Etiketten',
     'labels_title' => 'Etiketten-Einstellungen aktualisieren',
-    'labels_help' => 'Labelgrößen &amp; Einstellungen',
-    'purge_keywords' => 'Endgültig löschen',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Typ',
     'label2_2d_type_help'     => 'Format für 2D Barcodes',
     'label2_2d_target'        => '2D Barcode Ausgabe',
-    'label2_2d_target_help'   => 'Die URL, auf die der 2D Barcode beim Scannen verweist',
+    'label2_2d_target_help'   => 'Die Daten, die im 2D Barcode enthalten sein werden',
     'label2_fields'           => 'Felddefinitionen',
     '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' => '<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. ',
+    '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',
     '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>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Wie viele Tage vor dem voraussichtlichen Check-in eines Vermögenswerts soll dieser auf der Seite „Zur Eincheckzeit fällig“ aufgeführt werden?',
     'no_groups' => 'Es wurden noch keine Gruppen erstellt. Navigieren Sie zu <code>Admin-Einstellungen > Berechtigungsgruppen</code>, um eine hinzuzufügen.',
 
+
+    /* 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',
+        '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',
+        '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 baa42f7dd3cc..039acc606bc7 100644
--- a/resources/lang/de-DE/admin/settings/message.php
+++ b/resources/lang/de-DE/admin/settings/message.php
@@ -45,5 +45,6 @@
         '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' => '',
     ]
 ];
diff --git a/resources/lang/de-DE/general.php b/resources/lang/de-DE/general.php
index e0e60a9f7339..e804a8fdf5c3 100644
--- a/resources/lang/de-DE/general.php
+++ b/resources/lang/de-DE/general.php
@@ -216,6 +216,12 @@
     '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',
     'order_number'          => 'Bestellnummer',
     'only_deleted'          => 'Nur gelöschte Gegenstände',
     'page_menu'				=> 'Zeige _MENU_ Einträge',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/de-if/admin/settings/general.php b/resources/lang/de-if/admin/settings/general.php
index 720c8c398f91..1fd21b4a5bbb 100644
--- a/resources/lang/de-if/admin/settings/general.php
+++ b/resources/lang/de-if/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Zusätzlicher Fußzeilentext ',
     'footer_text_help'          => 'Dieser Text wird in der rechten Fußzeile angezeigt. Links sind erlaubt mit <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored Markdown</a>. Zeilenumbrüche, Kopfzeilen, Bilder usw. können zu unvorhersehbaren Ergebnissen führen.',
     'general_settings'			=> 'Allgemeine Einstellungen',
-    'general_settings_keywords' => 'firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzername Format, Bilder, pro Seite, Vorschaubilder, eula, gravatar, tos, Dashboard, Privatsphäre',
     'general_settings_help'     => 'Standard EULA und mehr',
     'generate_backup'			=> 'Backup erstellen',
     'google_workspaces'         => 'Google Arbeitsbereiche',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP Info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, System, Info',
     'php_overview_help'         => 'PHP-Systeminfo',
     'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationsanweisungen.',
     'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
@@ -231,7 +229,6 @@
     'update'                    => 'Einstellungen aktualisieren',
     'value'                     => 'Wert',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'Fußzeile, Logo, Druck, Thema, Skin, Header, Farben, Farbe, CSS',
     'brand_help'                => 'Logo, Seitenname',
     'web_brand'                 => 'Web Branding Typ',
     'about_settings_title'      => 'Über Einstellungen',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Nach Stichwort filtern',
     'security' => 'Sicherheit',
     'security_title' => 'Sicherheitseinstellungen aktualisieren',
-    'security_keywords' => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
     'security_help' => 'Zwei-Faktor, Passwort-Einschränkungen',
-    'groups_keywords' => 'berechtigungen, Berechtigungsgruppen, Autorisierung',
     'groups_help' => 'Account-Berechtigungsgruppen',
     'localization' => 'Lokalisierung',
     'localization_title' => 'Lokalisierungseinstellungen aktualisieren',
-    'localization_keywords' => 'lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
     'localization_help' => 'Sprache, Datumsanzeige',
     'notifications' => 'Benachrichtigungen',
     'notifications_help' => 'E-Mail-Benachrichtigungen & Audit-Einstellungen',
     'asset_tags_help' => 'Inkrementieren und Präfixe',
     'labels' => 'Etiketten',
     'labels_title' => 'Etiketten-Einstellungen aktualisieren',
-    'labels_help' => 'Etikettengrößen &amp; Einstellungen',
-    'purge_keywords' => 'Endgültig löschen',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Typ',
     'label2_2d_type_help'     => 'Format für 2D Barcodes',
     'label2_2d_target'        => '2D Barcode Ausgabe',
-    'label2_2d_target_help'   => 'Die URL, auf die der 2D Barcode beim Scannen verweist',
+    'label2_2d_target_help'   => 'Die Daten, die im 2D Barcode enthalten sein werden',
     'label2_fields'           => 'Felddefinitionen',
     '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' => '<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. ',
+    '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',
     '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>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Wie viele Tage vor dem voraussichtlichen Check-in eines Vermögenswerts soll dieser auf der Seite „Zur Eincheckzeit fällig“ aufgeführt werden?',
     'no_groups' => 'Es wurden noch keine Gruppen erstellt. Navigiere zu <code>Admin-Einstellungen > Berechtigungsgruppen</code>, um eine hinzuzufügen.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        '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',
+        'localization'      => 'lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
+        'php_overview'      => 'phpinfo, 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-if/admin/settings/message.php b/resources/lang/de-if/admin/settings/message.php
index 21c46d45c622..fc72cf5bcd3d 100644
--- a/resources/lang/de-if/admin/settings/message.php
+++ b/resources/lang/de-if/admin/settings/message.php
@@ -45,5 +45,6 @@
         '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' => '',
     ]
 ];
diff --git a/resources/lang/de-if/general.php b/resources/lang/de-if/general.php
index 69f781103bda..fbe448913c13 100644
--- a/resources/lang/de-if/general.php
+++ b/resources/lang/de-if/general.php
@@ -216,6 +216,12 @@
     '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',
     'order_number'          => 'Auftragsnummer',
     'only_deleted'          => 'Nur gelöschte Assets',
     'page_menu'				=> 'Zeige _MENU_ Einträge',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/el-GR/admin/settings/general.php b/resources/lang/el-GR/admin/settings/general.php
index cf3d07b53add..fc34ad79e489 100644
--- a/resources/lang/el-GR/admin/settings/general.php
+++ b/resources/lang/el-GR/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Πρόσθετο κείμενο Footer',
     'footer_text_help'          => 'Αυτό το κείμενο θα εμφανιστεί στο υποσέλιδο στη δεξιά πλευρά. Οι σύνδεσμοι επιτρέπονται χρησιμοποιώντας την <a href="https://help.github.com/articles/github-flavored-markdown/"> Github flavored markdown </a>. Διακοπή γραμμής, κεφαλίδες, εικόνες κ.λπ. μπορεί να οδηγήσουν σε απρόβλεπτα αποτελέσματα.',
     'general_settings'			=> 'Γενικές ρυθμίσεις',
-    'general_settings_keywords' => 'υποστήριξη της εταιρείας, υπογραφή, αποδοχή, μορφή ηλεκτρονικού ταχυδρομείου, μορφή ονόματος χρήστη, εικόνες, ανά σελίδα, μικρογραφία, eula, gravatar, tos, ταμπλό, ιδιωτικότητα',
     'general_settings_help'     => 'Προεπιλογή EULA και άλλα',
     'generate_backup'			=> 'Δημιουργία Αντίγραφου Ασφαλείας',
     'google_workspaces'         => 'Χώροι Εργασίας Google',
@@ -154,7 +153,6 @@
     'php'                       => 'Έκδοση PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, σύστημα, πληροφορίες',
     'php_overview_help'         => 'Πληροφορίες συστήματος PHP',
     'php_gd_info'               => 'Πρέπει να εγκαταστήσετε το php-gd για να εμφανίσετε τους QR κώδικες, δείτε τις οδηγίες εγκατάστασης.',
     'php_gd_warning'            => 'Η επεξεργασία εικόνας PHP και το πρόσθετο GD ΔΕΝ έχουν εγκατασταθεί.',
@@ -231,7 +229,6 @@
     'update'                    => 'Ενημέρωση ρυθμίσεων',
     'value'                     => 'Τιμή',
     'brand'                     => 'Μάρκα',
-    'brand_keywords'            => 'υποσέλιδο, λογότυπο, εκτύπωση, θέμα, δέρμα, κεφαλίδα, χρώματα, χρώμα, css',
     'brand_help'                => 'Λογότυπο, Όνομα Ιστοσελίδας',
     'web_brand'                 => 'Τύπος Μάρκετινγκ Web',
     'about_settings_title'      => 'Σχετικά με τις ρυθμίσεις',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Φιλτράρισμα κατά ρύθμιση λέξης-κλειδιού',
     'security' => 'Ασφάλεια',
     'security_title' => 'Ενημέρωση Ρυθμίσεων Ασφαλείας',
-    'security_keywords' => 'κωδικός πρόσβασης, κωδικοί πρόσβασης, απαιτήσεις, δύο παράγοντες, δύο παράγοντες, κοινοί κωδικοί πρόσβασης, απομακρυσμένη σύνδεση, αποσύνδεση, έλεγχος ταυτότητας',
     'security_help' => 'Δύο Παράγοντες, Περιορισμοί Κωδικού Πρόσβασης',
-    'groups_keywords' => 'άδειες, ομάδες δικαιωμάτων, εξουσιοδότηση',
     'groups_help' => 'Ομάδες δικαιωμάτων λογαριασμού',
     'localization' => 'Τοπικοποίηση',
     'localization_title' => 'Ενημέρωση Ρυθμίσεων Τοπικοποίησης',
-    'localization_keywords' => 'τοπικοποίηση, νόμισμα, τοπική, τοπική, ζώνη ώρας, ζώνη ώρας, διεθνές, διαγεννητικότητα, γλώσσα, γλώσσες, μετάφραση',
     'localization_help' => 'Γλώσσα, εμφάνιση ημερομηνίας',
     'notifications' => 'Ειδοποιήσεις',
     'notifications_help' => 'Ρυθμίσεις Ειδοποιήσεων & Ελέγχου Email',
     'asset_tags_help' => 'Αυξήσεις και προθέματα',
     'labels' => 'Ετικέτες',
     'labels_title' => 'Ενημέρωση Ρυθμίσεων Ετικετών',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'μόνιμη διαγραφή',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Καθαρισμός αρχείων που έχουν διαγραφεί',
     'ldap_extension_warning' => 'Δεν φαίνεται ότι η επέκταση LDAP είναι εγκατεστημένη ή ενεργοποιημένη σε αυτόν τον διακομιστή. Μπορείτε ακόμα να αποθηκεύσετε τις ρυθμίσεις σας, αλλά θα πρέπει να ενεργοποιήσετε την επέκταση LDAP για PHP πριν το συγχρονισμό LDAP ή σύνδεση θα λειτουργήσει.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Μορφή για barcodes 2D',
     'label2_2d_target'        => 'Στόχος 2D Barcode',
-    'label2_2d_target_help'   => 'Το URL των σημείων 2D γραμμωτού κώδικα όταν σαρωθεί',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Ορισμοί Πεδίων',
     'label2_fields_help'      => 'Τα πεδία μπορούν να προστεθούν, να αφαιρεθούν και να παραγγελθούν στην αριστερή στήλη. Για κάθε πεδίο, μπορούν να προστεθούν, να αφαιρεθούν πολλαπλές επιλογές για την Ετικέτα και την Πηγή Δεδομένων και να παραγγελθούν στη δεξιά στήλη.',
     'help_asterisk_bold'    => 'Το κείμενο που έχει εισαχθεί ως <code>**text**</code> θα εμφανιστεί ως έντονο',
     'help_blank_to_use'     => 'Αφήστε κενό για να χρησιμοποιήσετε την τιμή από <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Προεπιλογή',
     'none'                  => 'Κανένα',
     'google_callback_help' => 'Αυτό θα πρέπει να εισαχθεί ως το URL επιστροφής κλήσης στις ρυθμίσεις της εφαρμογής Google OAuth στον οργανισμό σας&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">κονσόλα προγραμματιστών Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'υποσέλιδο, λογότυπο, εκτύπωση, θέμα, δέρμα, κεφαλίδα, χρώματα, χρώμα, css',
+        'general_settings'  => 'υποστήριξη της εταιρείας, υπογραφή, αποδοχή, μορφή ηλεκτρονικού ταχυδρομείου, μορφή ονόματος χρήστη, εικόνες, ανά σελίδα, μικρογραφία, eula, gravatar, tos, ταμπλό, ιδιωτικότητα',
+        'groups'            => 'άδειες, ομάδες δικαιωμάτων, εξουσιοδότηση',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'τοπικοποίηση, νόμισμα, τοπική, τοπική, ζώνη ώρας, ζώνη ώρας, διεθνές, διαγεννητικότητα, γλώσσα, γλώσσες, μετάφραση',
+        'php_overview'      => 'phpinfo, σύστημα, πληροφορίες',
+        'purge'             => 'μόνιμη διαγραφή',
+        'security'          => 'κωδικός πρόσβασης, κωδικοί πρόσβασης, απαιτήσεις, δύο παράγοντες, δύο παράγοντες, κοινοί κωδικοί πρόσβασης, απομακρυσμένη σύνδεση, αποσύνδεση, έλεγχος ταυτότητας',
+    ],
+
 ];
diff --git a/resources/lang/el-GR/admin/settings/message.php b/resources/lang/el-GR/admin/settings/message.php
index a54ade33abce..0ce37688c107 100644
--- a/resources/lang/el-GR/admin/settings/message.php
+++ b/resources/lang/el-GR/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Κάτι πήγε στραβά. :app απάντησε με: :error_message',
         'error_redirect' => 'ΣΦΑΛΜΑ: 301/302:endpoint επιστρέφει μια ανακατεύθυνση. Για λόγους ασφαλείας, δεν ακολουθούμε ανακατευθύνσεις. Παρακαλούμε χρησιμοποιήστε το πραγματικό τελικό σημείο.',
         'error_misc' => 'Κάτι πήγε στραβά. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];
diff --git a/resources/lang/el-GR/general.php b/resources/lang/el-GR/general.php
index 0743b524b2c0..e725a07950fd 100644
--- a/resources/lang/el-GR/general.php
+++ b/resources/lang/el-GR/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Δεν βρέθηκαν αποτελέσματα.',
     'no'  					=> '\'Οχι',
     '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',
     'order_number'          => 'Αριθμός παραγγελίας',
     'only_deleted'          => 'Μόνο Διαγραμμένα Περιουσιακά Στοιχεία',
     'page_menu'				=> 'Εμφάνιση _MENU_ αντικειμένων',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index 65aac2f2a35b..3aa79d95e44f 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavoured markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colours, colour, css',
     'brand_help'                => 'Logo, Site Name & Skin',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-Factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account Permission Groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, Date & Currency Display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colours, colour, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/en-GB/admin/settings/message.php b/resources/lang/en-GB/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/en-GB/admin/settings/message.php
+++ b/resources/lang/en-GB/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index f39d560dbea3..9d28c3d7c1ea 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     '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',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php
index 6d9ee5a77b62..266788f08003 100644
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/resources/lang/en-ID/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Teks Footer Tambahan ',
     'footer_text_help'          => 'Teks ini akan muncul di footer sisi kanan. Tautan diizinkan menggunakan <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Jeda, tajuk, gambar, dll bisa mengakibatkan hasil yang tidak dapat diprediksi.',
     'general_settings'			=> 'Pengaturan Umum',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Membuat Cadangan',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'Versi PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Anda harus menginstall php-gd untuk menampilkan kode QR, lihat petunjuk pemasangan.',
     'php_gd_warning'            => 'Pengolahan gambar PHP dan plugin GD TIDAK terpasang.',
@@ -231,7 +229,6 @@
     'update'                    => 'Perbarui Setelan',
     'value'                     => 'Jumlah',
     'brand'                     => 'Bermerek',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Tentang Pengaturan',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Tipe Kode Batang 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/en-ID/admin/settings/message.php b/resources/lang/en-ID/admin/settings/message.php
index 259409df85b6..faf6cbf2ac48 100644
--- a/resources/lang/en-ID/admin/settings/message.php
+++ b/resources/lang/en-ID/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index 6075f41b84cc..86b6c966366c 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Tidak ada Hasil.',
     'no'  					=> 'Tidak',
     'notes'  				=> 'Catatan',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Nomor Pemesanan',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Menampilkan item _MENU_',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php
index b83eb559694f..72509d4ac9e9 100644
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/resources/lang/es-CO/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Texto adicional en el pie de página ',
     'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces son permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>. Los saltos de línea, encabezados, imágenes, etc. pueden dar lugar a resultados impredecibles.',
     'general_settings'			=> 'Configuración general',
-    'general_settings_keywords' => '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',
     'general_settings_help'     => 'Acuerdo de uso predeterminado y más',
     'generate_backup'			=> 'Generar copia de seguridad',
     'google_workspaces'         => 'Google Workspace',
@@ -154,7 +153,6 @@
     'php'                       => 'Versión de PHP',
     'php_info'                  => 'Información de PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, información',
     'php_overview_help'         => 'Información del sistema PHP',
     'php_gd_info'               => 'Debe instalar php-gd para mostrar códigos QR, consulte las instrucciones de instalación.',
     'php_gd_warning'            => 'PHP Image Processing y GD plugin NO están instalados.',
@@ -231,7 +229,6 @@
     'update'                    => 'Actualizar configuraciones',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
     'brand_help'                => 'Logo, nombre del sitio',
     'web_brand'                 => 'Tipo de marca en la web',
     'about_settings_title'      => 'Acerca de las configuraciones',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrar por palabra clave',
     'security' => 'Seguridad',
     'security_title' => 'Actualizar la configuración de seguridad',
-    'security_keywords' => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
     'security_help' => 'Verificación de dos factores y restricciones de contraseña',
-    'groups_keywords' => 'permisos, grupos de permisos, autorización',
     'groups_help' => 'Grupos de permisos',
     'localization' => 'Localización',
     'localization_title' => 'Actualizar la configuración de localización',
-    'localization_keywords' => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
     'localization_help' => 'Idioma, visualización de la fecha',
     'notifications' => 'Notificaciones',
     'notifications_help' => 'Configuración de alertas por correo electrónico y de auditoría',
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
-    'purge_keywords' => 'eliminar permanentemente',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     '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'   => 'La URL a la que apunta el código de barras 2D cuando se escanea',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     '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' => '<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. ',
+    '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',
     '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 .',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => '¿Cuántos días antes de la fecha prevista de ingreso de un activo debe figurar en la página «Próximos a ingresar»?',
     'no_groups' => 'Todavía no se han creado grupos. Para agregar uno, visite<code>Configuración de administración > Grupos de permisos</code>.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        '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',
+        'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
+        'php_overview'      => 'phpinfo, sistema, información',
+        'purge'             => 'eliminar permanentemente',
+        'security'          => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
+    ],
+
 ];
diff --git a/resources/lang/es-CO/admin/settings/message.php b/resources/lang/es-CO/admin/settings/message.php
index e7f45c3e7161..35096ead8937 100644
--- a/resources/lang/es-CO/admin/settings/message.php
+++ b/resources/lang/es-CO/admin/settings/message.php
@@ -45,5 +45,6 @@
         '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.',
     ]
 ];
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index fcd37fa4823a..d38fdde103a8 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -216,6 +216,12 @@
     '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',
     'order_number'          => 'Número de orden',
     'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php
index f3b48b55f822..0625343e77a7 100644
--- a/resources/lang/es-ES/admin/settings/general.php
+++ b/resources/lang/es-ES/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Texto adicional en el pie de página ',
     'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces son permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>. Los saltos de línea, encabezados, imágenes, etc. pueden dar lugar a resultados impredecibles.',
     'general_settings'			=> 'Configuración general',
-    'general_settings_keywords' => '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',
     'general_settings_help'     => 'Acuerdo de uso predeterminado y más',
     'generate_backup'			=> 'Generar Respaldo',
     'google_workspaces'         => 'Google Workspace',
@@ -154,7 +153,6 @@
     'php'                       => 'Versión de PHP',
     'php_info'                  => 'Información de PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, información',
     'php_overview_help'         => 'Información del sistema PHP',
     'php_gd_info'               => 'Debe instalar php-gd para mostrar códigos QR, consulte las instrucciones de instalación.',
     'php_gd_warning'            => 'PHP Image Processing y GD plugin NO están instalados.',
@@ -231,7 +229,6 @@
     'update'                    => 'Actualizar configuraciones',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
     'brand_help'                => 'Logo, nombre del sitio',
     'web_brand'                 => 'Tipo de marca en la web',
     'about_settings_title'      => 'Acerca de las configuraciones',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrar por palabra clave',
     'security' => 'Seguridad',
     'security_title' => 'Actualizar la configuración de seguridad',
-    'security_keywords' => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
     'security_help' => 'Verificación de dos factores y restricciones de contraseña',
-    'groups_keywords' => 'permisos, grupos de permisos, autorización',
     'groups_help' => 'Grupos de permisos',
     'localization' => 'Localización',
     'localization_title' => 'Actualizar la configuración de localización',
-    'localization_keywords' => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
     'localization_help' => 'Idioma, visualización de la fecha',
     'notifications' => 'Notificaciones',
     'notifications_help' => 'Configuración de alertas por correo electrónico y de auditoría',
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
-    'purge_keywords' => 'eliminar permanentemente',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     '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'   => 'La URL a la que apunta el código de barras 2D cuando se escanea',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     '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' => '<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. ',
+    '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',
     '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 .',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => '¿Cuántos días antes de la fecha prevista de ingreso de un activo debe figurar en la página «Próximos a ingresar»?',
     'no_groups' => 'Todavía no se han creado grupos. Para agregar uno, visite<code>Configuración de administración > Grupos de permisos</code>.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        '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',
+        'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
+        'php_overview'      => 'phpinfo, sistema, información',
+        'purge'             => 'eliminar permanentemente',
+        'security'          => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
+    ],
+
 ];
diff --git a/resources/lang/es-ES/admin/settings/message.php b/resources/lang/es-ES/admin/settings/message.php
index 168f4178c094..ae2ddb300435 100644
--- a/resources/lang/es-ES/admin/settings/message.php
+++ b/resources/lang/es-ES/admin/settings/message.php
@@ -45,5 +45,6 @@
         '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.',
     ]
 ];
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index 7506db34d4c8..37f147179688 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -216,6 +216,12 @@
     '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',
     'order_number'          => 'Número de orden',
     'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/es-MX/admin/settings/general.php b/resources/lang/es-MX/admin/settings/general.php
index 7b0ee7781d54..63a4983c199a 100644
--- a/resources/lang/es-MX/admin/settings/general.php
+++ b/resources/lang/es-MX/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Texto adicional en el pie de página ',
     'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces son permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>. Los saltos de línea, encabezados, imágenes, etc. pueden dar lugar a resultados impredecibles.',
     'general_settings'			=> 'Configuración general',
-    'general_settings_keywords' => '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',
     'general_settings_help'     => 'Acuerdo de uso predeterminado y más',
     'generate_backup'			=> 'Generar copia de seguridad',
     'google_workspaces'         => 'Google Workspace',
@@ -154,7 +153,6 @@
     'php'                       => 'Versión de PHP',
     'php_info'                  => 'Información de PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, información',
     'php_overview_help'         => 'Información del sistema PHP',
     'php_gd_info'               => 'Debe instalar php-gd para mostrar códigos QR, consulte las instrucciones de instalación.',
     'php_gd_warning'            => 'PHP Image Processing y GD plugin NO están instalados.',
@@ -231,7 +229,6 @@
     'update'                    => 'Actualizar configuraciones',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
     'brand_help'                => 'Logo, nombre del sitio',
     'web_brand'                 => 'Tipo de marca en la web',
     'about_settings_title'      => 'Acerca de las configuraciones',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrar por palabra clave',
     'security' => 'Seguridad',
     'security_title' => 'Actualizar la configuración de seguridad',
-    'security_keywords' => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
     'security_help' => 'Verificación de dos factores y restricciones de contraseña',
-    'groups_keywords' => 'permisos, grupos de permisos, autorización',
     'groups_help' => 'Grupos de permisos',
     'localization' => 'Localización',
     'localization_title' => 'Actualizar la configuración de localización',
-    'localization_keywords' => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
     'localization_help' => 'Idioma, visualización de la fecha',
     'notifications' => 'Notificaciones',
     'notifications_help' => 'Configuración de alertas por correo electrónico y de auditoría',
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
-    'purge_keywords' => 'eliminar permanentemente',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     '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'   => 'La URL a la que apunta el código de barras 2D cuando se escanea',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     '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' => '<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. ',
+    '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',
     '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 .',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => '¿Cuántos días antes de la fecha prevista de ingreso de un activo debe figurar en la página «Próximos a ingresar»?',
     'no_groups' => 'Todavía no se han creado grupos. Para agregar uno, visite<code>Configuración de administración > Grupos de permisos</code>.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        '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',
+        'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
+        'php_overview'      => 'phpinfo, sistema, información',
+        'purge'             => 'eliminar permanentemente',
+        'security'          => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
+    ],
+
 ];
diff --git a/resources/lang/es-MX/admin/settings/message.php b/resources/lang/es-MX/admin/settings/message.php
index 6704bae32df6..7260e90694d2 100644
--- a/resources/lang/es-MX/admin/settings/message.php
+++ b/resources/lang/es-MX/admin/settings/message.php
@@ -45,5 +45,6 @@
         '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.',
     ]
 ];
diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php
index d5d9b3b521ce..1e31b4d80dc0 100644
--- a/resources/lang/es-MX/general.php
+++ b/resources/lang/es-MX/general.php
@@ -216,6 +216,12 @@
     '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',
     'order_number'          => 'Número de orden',
     'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/es-VE/admin/settings/general.php b/resources/lang/es-VE/admin/settings/general.php
index 2eeb737664b5..2db31a94f065 100644
--- a/resources/lang/es-VE/admin/settings/general.php
+++ b/resources/lang/es-VE/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Texto adicional en el pie de página ',
     'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces son permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>. Los saltos de línea, encabezados, imágenes, etc. pueden dar lugar a resultados impredecibles.',
     'general_settings'			=> 'Configuración general',
-    'general_settings_keywords' => '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',
     'general_settings_help'     => 'Acuerdo de uso predeterminado y más',
     'generate_backup'			=> 'Generar copia de seguridad',
     'google_workspaces'         => 'Google Workspace',
@@ -154,7 +153,6 @@
     'php'                       => 'Versión de PHP',
     'php_info'                  => 'Información de PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, información',
     'php_overview_help'         => 'Información del sistema PHP',
     'php_gd_info'               => 'Debe instalar php-gd para mostrar códigos QR, consulte las instrucciones de instalación.',
     'php_gd_warning'            => 'PHP Image Processing y GD plugin NO están instalados.',
@@ -231,7 +229,6 @@
     'update'                    => 'Actualizar Configuraciones',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
     'brand_help'                => 'Logo, nombre del sitio',
     'web_brand'                 => 'Tipo de marca en la web',
     'about_settings_title'      => 'Acerca de las configuraciones',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrar por palabra clave',
     'security' => 'Seguridad',
     'security_title' => 'Actualizar la configuración de seguridad',
-    'security_keywords' => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
     'security_help' => 'Verificación de dos factores y restricciones de contraseña',
-    'groups_keywords' => 'permisos, grupos de permisos, autorización',
     'groups_help' => 'Grupos de permisos',
     'localization' => 'Localización',
     'localization_title' => 'Actualizar la configuración de localización',
-    'localization_keywords' => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
     'localization_help' => 'Idioma, visualización de la fecha',
     'notifications' => 'Notificaciones',
     'notifications_help' => 'Configuración de alertas por correo electrónico y de auditoría',
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
-    'purge_keywords' => 'eliminar permanentemente',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     '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'   => 'La URL a la que apunta el código de barras 2D cuando se escanea',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     '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' => '<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. ',
+    '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',
     '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 .',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => '¿Cuántos días antes de la fecha prevista de ingreso de un activo debe figurar en la página «Próximos a ingresar»?',
     'no_groups' => 'Todavía no se han creado grupos. Para agregar uno, visite<code>Configuración de administración > Grupos de permisos</code>.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        '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',
+        'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
+        'php_overview'      => 'phpinfo, sistema, información',
+        'purge'             => 'eliminar permanentemente',
+        'security'          => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
+    ],
+
 ];
diff --git a/resources/lang/es-VE/admin/settings/message.php b/resources/lang/es-VE/admin/settings/message.php
index ba347a4ac48b..2d37a659753f 100644
--- a/resources/lang/es-VE/admin/settings/message.php
+++ b/resources/lang/es-VE/admin/settings/message.php
@@ -45,5 +45,6 @@
         '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.',
     ]
 ];
diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php
index 7c5c1f10a0ab..c106372deb5a 100644
--- a/resources/lang/es-VE/general.php
+++ b/resources/lang/es-VE/general.php
@@ -216,6 +216,12 @@
     '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',
     'order_number'          => 'Número de orden',
     'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/et-EE/admin/settings/general.php b/resources/lang/et-EE/admin/settings/general.php
index 146ce543281f..b02669207da6 100644
--- a/resources/lang/et-EE/admin/settings/general.php
+++ b/resources/lang/et-EE/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'üldised seaded',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Loo varundamine',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP versioon',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Peate installima php-gd, et kuvada QR-koode, vt installijuhiseid.',
     'php_gd_warning'            => 'PHP pilditöötlust ja GD pluginat ei ole installitud.',
@@ -231,7 +229,6 @@
     'update'                    => 'Värskenda seaded',
     'value'                     => 'Väärtus',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Seadistuste kohta',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D-triipkoodi tüüp',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/et-EE/admin/settings/message.php b/resources/lang/et-EE/admin/settings/message.php
index 0d1a67508508..e61354c71169 100644
--- a/resources/lang/et-EE/admin/settings/message.php
+++ b/resources/lang/et-EE/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/et-EE/general.php b/resources/lang/et-EE/general.php
index a1931db5ad7b..7ca4569f0753 100644
--- a/resources/lang/et-EE/general.php
+++ b/resources/lang/et-EE/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Tulemused puuduvad.',
     'no'  					=> 'Ei',
     'notes'  				=> 'Märkmed',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Tellimuse number',
     'only_deleted'          => 'Ainult kustutatud varad',
     'page_menu'				=> 'Näitab _MENU_ üksusi',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/fa-IR/admin/settings/general.php b/resources/lang/fa-IR/admin/settings/general.php
index 70cd08307145..1635ac3a7265 100644
--- a/resources/lang/fa-IR/admin/settings/general.php
+++ b/resources/lang/fa-IR/admin/settings/general.php
@@ -96,7 +96,6 @@
     'footer_text_help'          => 'این متن در فوتر سمت راست ظاهر می شود. پیوندها با استفاده از <a href="https://help.github.com/articles/github-flavored-markdown/">نشان‌گذاری طعم‌دار Github</a> مجاز هستند. شکستگی خطوط، هدرها، تصاویر و غیره ممکن است منجر به نتایج غیر قابل پیش بینی شود.
 ',
     'general_settings'			=> 'تنظیمات عمومی',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'EULA پیش فرض و موارد دیگر
 ',
     'generate_backup'			=> 'تولید پشتیبان گیری',
@@ -213,7 +212,6 @@
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP
 ',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info
 ',
     'php_gd_info'               => 'شما باید  php-gd را نصب کنید تا QR کد ها را ببنید، به دستورالعمل های نصب نگاه کنید.',
@@ -327,8 +325,6 @@
     'update'                    => 'به‌ روزرسانی تنظیمات',
     'value'                     => 'عنوان آیتم',
     'brand'                     => 'نام تجاری',
-    'brand_keywords'            => 'پاورقی، لوگو، چاپ، تم، پوسته، هدر، رنگ ها، رنگ، css
-',
     'brand_help'                => 'لوگو، نام سایت
 ',
     'web_brand'                 => 'نوع برندینگ وب
@@ -438,20 +434,14 @@
 ',
     'security' => 'امنیت',
     'security_title' => 'تنظیمات امنیتی را به روز کنید
-',
-    'security_keywords' => 'رمز عبور، رمزهای عبور، الزامات، دو عاملی، دو عاملی، رمزهای عبور رایج، ورود از راه دور، خروج از سیستم، احراز هویت
 ',
     'security_help' => 'دو عامل، محدودیت رمز عبور
-',
-    'groups_keywords' => 'مجوزها، گروه‌های مجوز، مجوزها
 ',
     'groups_help' => 'گروه های مجوز حساب
 ',
     'localization' => 'بومی سازی
 ',
     'localization_title' => 'تنظیمات محلی سازی را به روز کنید
-',
-    'localization_keywords' => 'محلی سازی، واحد پول، محلی، منطقه، منطقه زمانی، منطقه زمانی، بین المللی، بین المللی، زبان، زبان ها، ترجمه
 ',
     'localization_help' => 'زبان، نمایش تاریخ
 ',
@@ -462,10 +452,7 @@
     'labels' => 'برچسب ها',
     'labels_title' => 'تنظیمات برچسب را به روز کنید
 ',
-    'labels_help' => 'اندازه برچسب &amp; تنظیمات
-',
-    'purge_keywords' => 'برای همیشه حذف کنید
-',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'پاک کردن رکوردهای حذف شده
 ',
     'ldap_extension_warning' => 'به نظر نمی رسد که برنامه افزودنی LDAP روی این سرور نصب یا فعال باشد. همچنان می‌توانید تنظیمات خود را ذخیره کنید، اما قبل از اینکه همگام‌سازی یا ورود به سیستم LDAP کار کند، باید افزونه LDAP را برای PHP فعال کنید.
@@ -507,12 +494,14 @@
     'label2_2d_type'          => 'نوع بارکد 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -534,4 +523,22 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'پاورقی، لوگو، چاپ، تم، پوسته، هدر، رنگ ها، رنگ، css
+',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'مجوزها، گروه‌های مجوز، مجوزها
+',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'محلی سازی، واحد پول، محلی، منطقه، منطقه زمانی، منطقه زمانی، بین المللی، بین المللی، زبان، زبان ها، ترجمه
+',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'برای همیشه حذف کنید
+',
+        'security'          => 'رمز عبور، رمزهای عبور، الزامات، دو عاملی، دو عاملی، رمزهای عبور رایج، ورود از راه دور، خروج از سیستم، احراز هویت
+',
+    ],
+
 ];
diff --git a/resources/lang/fa-IR/admin/settings/message.php b/resources/lang/fa-IR/admin/settings/message.php
index 066e4f0397cb..2d487fd1010f 100644
--- a/resources/lang/fa-IR/admin/settings/message.php
+++ b/resources/lang/fa-IR/admin/settings/message.php
@@ -56,5 +56,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/fa-IR/general.php b/resources/lang/fa-IR/general.php
index ac4dc62789c6..77e957b05e6c 100644
--- a/resources/lang/fa-IR/general.php
+++ b/resources/lang/fa-IR/general.php
@@ -233,6 +233,12 @@
     'no_results'			=> 'بدون نتیجه.',
     'no'  					=> 'خیر',
     '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',
     'order_number'          => 'شماره سفارش',
     'only_deleted'          => 'فقط دارایی های حذف شده',
     'page_menu'				=> 'نمایش_موارد_منو',
@@ -652,5 +658,8 @@
     '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',
 
 ];
diff --git a/resources/lang/fi-FI/admin/settings/general.php b/resources/lang/fi-FI/admin/settings/general.php
index a31694f2a8a2..7af49749bb66 100644
--- a/resources/lang/fi-FI/admin/settings/general.php
+++ b/resources/lang/fi-FI/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Lisäys alatunnisteen tekstiin ',
     'footer_text_help'          => 'Tämä teksti esiintyy oikeanpuoleisessa alatunnisteessa. Linkkejä voi lisätä käyttämällä <a href="https://help.github.com/articles/github-flavored-markdown/">Github merkintätapaa</a>. Rivinvaihdot, otsikot, kuvat, jne. voivat johtaa epätoivottuihin tuloksiin.',
     'general_settings'			=> 'Yleiset asetukset',
-    'general_settings_keywords' => 'yrityksen tuki, allekirjoitus, hyväksyminen, sähköpostimuoto, käyttäjänimi muodossa, kuvia, sivua, pikkukuvat, eula, gravatar, tos, kojelauta, yksityisyys',
     'general_settings_help'     => 'Oletuskäyttöehdot ja muuta',
     'generate_backup'			=> 'Luo varmuuskopio',
     'google_workspaces'         => 'Googlen Työtilat',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP versio',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, järjestelmä, tiedot',
     'php_overview_help'         => 'PHP järjestelmän tiedot',
     'php_gd_info'               => 'Sinun tulee asentaa php-gd paketti näyttääksesi QR-koodit, katso lisätietoja asennusohjeista.',
     'php_gd_warning'            => 'PHP Image Prosessing ja GD-lisäosia EI ole asennettuna.',
@@ -231,7 +229,6 @@
     'update'                    => 'Päivitä asetukset',
     'value'                     => 'Arvo',
     'brand'                     => 'Brändäys',
-    'brand_keywords'            => 'footer, logo, tulostus, teema, iho, otsikko, värit, css',
     'brand_help'                => 'Logo, Sivuston Nimi',
     'web_brand'                 => 'Web-brändäyksen tyyppi',
     'about_settings_title'      => 'Tietoa asetuksista',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Suodata asettamalla avainsana',
     'security' => 'Turvallisuus',
     'security_title' => 'Päivitä Turvallisuusasetukset',
-    'security_keywords' => 'salasana, salasanat, vaatimukset, kaksi tekijää, kaksiosainen tekijä, yhteiset salasanat, etäkirjautuminen, kirjaudu, todennus',
     'security_help' => 'Kaksikerroin, Salasanan Rajoitukset',
-    'groups_keywords' => 'käyttöoikeudet, käyttöoikeusryhmät, valtuutus',
     'groups_help' => 'Tilin käyttöoikeusryhmät',
     'localization' => 'Lokalisointi',
     'localization_title' => 'Päivitä Lokalisoinnin Asetukset',
-    'localization_keywords' => 'lokalisointi, valuutta, paikallinen, paikallinen, paikallinen, aikavyöhyke, kansainväliset, internatinalization, kieli, kielet, käännös',
     'localization_help' => 'Kieli, päivämäärän näyttö',
     'notifications' => 'Ilmoitukset',
     'notifications_help' => 'Sähköpostihälytykset Ja Tarkastusasetukset',
     'asset_tags_help' => 'Korotukset ja etuliitteet',
     'labels' => 'Tunnisteet',
     'labels_title' => 'Päivitä Tunnisteasetukset',
-    'labels_help' => 'Tunnistekoot &amp; asetukset',
-    'purge_keywords' => 'poista pysyvästi',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D viivakoodityyppi',
     'label2_2d_type_help'     => 'Muoto 2D-viivakoodeja varten',
     'label2_2d_target'        => '2d-Viivakoodin Kohde',
-    'label2_2d_target_help'   => 'URL-osoite, joka on 2D viivakoodipisteitä, kun skannattu',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Kentän Määritelmät',
     'label2_fields_help'      => 'Kentät voidaan lisätä, poistaa ja järjestää uudelleen vasemmassa sarakkeessa. Kussakin kentässä voidaan lisätä, poistaa ja järjestää uudelleen oikeaan sarakkeeseen useita vaihtoehtoja.',
     'help_asterisk_bold'    => 'Teksti, joka syötetään muodossa <code>**text**</code> näytetään lihavoituina',
     'help_blank_to_use'     => 'Jätä tyhjäksi käyttääksesi arvoa <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Oletus',
     'none'                  => 'Ei Mitään',
     'google_callback_help' => 'Tämä tulisi syöttää takaisinsoittoosoitteeksi Google OAuth -sovellusasetuksissa organisaatiosi&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Googlen kehittäjäkonsoli <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, tulostus, teema, iho, otsikko, värit, css',
+        'general_settings'  => 'yrityksen tuki, allekirjoitus, hyväksyminen, sähköpostimuoto, käyttäjänimi muodossa, kuvia, sivua, pikkukuvat, eula, gravatar, tos, kojelauta, yksityisyys',
+        'groups'            => 'käyttöoikeudet, käyttöoikeusryhmät, valtuutus',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisointi, valuutta, paikallinen, paikallinen, paikallinen, aikavyöhyke, kansainväliset, internatinalization, kieli, kielet, käännös',
+        'php_overview'      => 'phpinfo, järjestelmä, tiedot',
+        'purge'             => 'poista pysyvästi',
+        'security'          => 'salasana, salasanat, vaatimukset, kaksi tekijää, kaksiosainen tekijä, yhteiset salasanat, etäkirjautuminen, kirjaudu, todennus',
+    ],
+
 ];
diff --git a/resources/lang/fi-FI/admin/settings/message.php b/resources/lang/fi-FI/admin/settings/message.php
index dfb6e9fee043..7bce1bb1c4f6 100644
--- a/resources/lang/fi-FI/admin/settings/message.php
+++ b/resources/lang/fi-FI/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Jokin meni pieleen. :app vastasi: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/fi-FI/general.php b/resources/lang/fi-FI/general.php
index f7fec488ff87..25f29f80521e 100644
--- a/resources/lang/fi-FI/general.php
+++ b/resources/lang/fi-FI/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Ei tuloksia.',
     'no'  					=> 'Ei',
     'notes'  				=> 'Muistiinpanot',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Tilausnumero',
     'only_deleted'          => 'Vain poistetut laitteet',
     'page_menu'				=> 'Näytetään _MENU_ kohteita',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/fil-PH/admin/settings/general.php b/resources/lang/fil-PH/admin/settings/general.php
index 05aba9570a4a..d6d0c3753718 100644
--- a/resources/lang/fil-PH/admin/settings/general.php
+++ b/resources/lang/fil-PH/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Ang Karagdagang Teksto ng Footer ',
     'footer_text_help'          => 'Ang tekstong ito ay lilitaw sa kanang bahagsi ng footer. Ang mga links ay pinapayagan gamit ang <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored na markdown</a>. Ang biak na mga Linya, mga header, mga imahi, atbp ay maaaring magsaad ng hindi inaasahang mga resulta.',
     'general_settings'			=> 'Ang Pangakalahatang mga Setting',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Magsagawa ng Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'Ang Bersyon ng PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Dapat kang mag-install ng php-gd para makapag-pakita ng mga code ng QR, tingnan ang mga batayan sa pag-install.',
     'php_gd_warning'            => 'Hindi na-install ang Pagpoproseso ng Imahe ng PHP at plugin ng GD.',
@@ -231,7 +229,6 @@
     'update'                    => 'Ang mga Setting ay I-update',
     'value'                     => 'Balyu',
     'brand'                     => 'Ang Pagkakaroon ng Brand',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Ang Tungkol sa mga Setting',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Ang Uri ng 2D Barcode',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/fil-PH/admin/settings/message.php b/resources/lang/fil-PH/admin/settings/message.php
index a53806b2a9de..8f1644c2625c 100644
--- a/resources/lang/fil-PH/admin/settings/message.php
+++ b/resources/lang/fil-PH/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/fil-PH/general.php b/resources/lang/fil-PH/general.php
index 7703ddaa7ddf..88955793a55c 100644
--- a/resources/lang/fil-PH/general.php
+++ b/resources/lang/fil-PH/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Walang mga Resulta.',
     'no'  					=> 'Hindi',
     'notes'  				=> 'Ang mga Paalala',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Ang Numero ng Pagkakasunod-sunod',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Ipinapakita_MENU_mga aytem',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/fr-FR/admin/settings/general.php b/resources/lang/fr-FR/admin/settings/general.php
index 18d0aad42dcf..3d7e1a570508 100644
--- a/resources/lang/fr-FR/admin/settings/general.php
+++ b/resources/lang/fr-FR/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Texte supplémentaire en pied de page ',
     'footer_text_help'          => 'Ce texte apparaîtra dans le pied de page de droitre. Les liens sont autorisés en utilisant <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Les sauts de ligne, les en-têtes, les images, etc. peuvent entraîner des résultats imprévisibles.',
     'general_settings'			=> 'Configuration générale',
-    'general_settings_keywords' => 'support de l\'entreprise, signature, acceptation, format de courriel, format de nom d\'utilisateur, images, par page, miniature, eula, gravatar, tos, tableau de bord, confidentialité',
     'general_settings_help'     => 'CLUF par défaut et plus encore',
     'generate_backup'			=> 'Générer une sauvegarde',
     'google_workspaces'         => 'Espaces de travail Google',
@@ -154,7 +153,6 @@
     'php'                       => 'Version de PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, système, infos',
     'php_overview_help'         => 'Infos système PHP',
     'php_gd_info'               => 'Vous devez installer php-gd afin d\'afficher les QR codes (voir les instructions d\'installation).',
     'php_gd_warning'            => 'Le PHP Image Processing et GD plugin n\'est PAS installé.',
@@ -231,7 +229,6 @@
     'update'                    => 'Mettre à jour les paramètres',
     'value'                     => 'Valeur',
     'brand'                     => 'Marque',
-    'brand_keywords'            => 'pied de page, logo, impression, thème, habillage, en-tête, couleurs, couleur, css',
     'brand_help'                => 'Logo, nom du site',
     'web_brand'                 => 'Type de Web Branding',
     'about_settings_title'      => 'A propos des réglages',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrer par mot clé',
     'security' => 'Sécurité',
     'security_title' => 'Gérer les paramètres de sécurité',
-    'security_keywords' => 'mot de passe, mots de passe, exigences, deux facteurs, deux-facteurs, mots de passe communs, connexion distante, déconnexion, authentification',
     'security_help' => 'Authentification à deux facteurs (2FA), Restrictions de mot de passe',
-    'groups_keywords' => 'permissions, permissions de groupe, autorisation',
     'groups_help' => 'Permissions de groupe du compte',
     'localization' => 'Traduction',
     'localization_title' => 'Gérer les paramètres de localisation',
-    'localization_keywords' => 'localisation, devise, locale, locale, fuseau horaire, fuseau horaire, international, internationalisation, langue, traduction, traduction',
     'localization_help' => 'Langue, affichage de la date',
     'notifications' => 'Notifications',
     'notifications_help' => 'Paramètres d\'alerte et d\'audit par e-mail',
     'asset_tags_help' => 'Incrémentation et préfixes',
     'labels' => 'Étiquettes',
     'labels_title' => 'Mettre à jour les paramètres d\'étiquetage',
-    'labels_help' => 'Taille &amp; paramètres des étiquettes',
-    'purge_keywords' => 'supprimer définitivement',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Type du code-barres 2D',
     'label2_2d_type_help'     => 'Format pour les codes-barres 2D',
     'label2_2d_target'        => 'Cible du code-barres 2D',
-    'label2_2d_target_help'   => 'L\'URL vers laquelle le code-barres 2D pointe lorsqu\'il est scanné',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Définitions de champ',
     'label2_fields_help'      => 'Les champs peuvent être ajoutés, supprimés et réordonnés dans la colonne de gauche. Pour chaque champ, plusieurs options pour Étiquette et Source de données peuvent être ajoutées, supprimées et réordonnées dans la colonne de droite.',
     'help_asterisk_bold'    => 'Le texte entré sous la forme <code>**texte**</code> sera affiché en gras',
     'help_blank_to_use'     => 'Laisser vide pour utiliser la valeur de <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Par défaut',
     'none'                  => 'Aucun·e',
     'google_callback_help' => 'Ceci doit être entré comme URL de rappel dans les paramètres de votre application Google OAuth dans la <strong><a href="https://console.cloud.google.com/" target="_blank">console de développement Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> de votre organisation.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'pied de page, logo, impression, thème, habillage, en-tête, couleurs, couleur, css',
+        'general_settings'  => 'support de l\'entreprise, signature, acceptation, format de courriel, format de nom d\'utilisateur, images, par page, miniature, eula, gravatar, tos, tableau de bord, confidentialité',
+        'groups'            => 'permissions, permissions de groupe, autorisation',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localisation, devise, locale, locale, fuseau horaire, fuseau horaire, international, internationalisation, langue, traduction, traduction',
+        'php_overview'      => 'phpinfo, système, infos',
+        'purge'             => 'supprimer définitivement',
+        'security'          => 'mot de passe, mots de passe, exigences, deux facteurs, deux-facteurs, mots de passe communs, connexion distante, déconnexion, authentification',
+    ],
+
 ];
diff --git a/resources/lang/fr-FR/admin/settings/message.php b/resources/lang/fr-FR/admin/settings/message.php
index 3e333d686555..aa37d66860f9 100644
--- a/resources/lang/fr-FR/admin/settings/message.php
+++ b/resources/lang/fr-FR/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Quelque chose s\'est mal passé. :app a répondu avec: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/fr-FR/general.php b/resources/lang/fr-FR/general.php
index acb9be651837..d840d4d22185 100644
--- a/resources/lang/fr-FR/general.php
+++ b/resources/lang/fr-FR/general.php
@@ -216,6 +216,12 @@
     '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',
     'order_number'          => 'Numéro de commande',
     'only_deleted'          => 'Seulement les matériels supprimés',
     'page_menu'				=> 'Afficher_MENU_items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/ga-IE/admin/settings/general.php b/resources/lang/ga-IE/admin/settings/general.php
index 4d2e90e93e15..df7f07b2b1f9 100644
--- a/resources/lang/ga-IE/admin/settings/general.php
+++ b/resources/lang/ga-IE/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'Socruithe Ginearálta',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Gin Cúltaca',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'Leagan PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Ní mór duit php-gd a shuiteáil chun cóid QR a thaispeáint, féach treoracha a shuiteáil.',
     'php_gd_warning'            => 'NÍ bhfuil an próiseáil Íomhá PHP agus an breiseán GD suiteáilte.',
@@ -231,7 +229,6 @@
     'update'                    => 'Socruithe Nuashonraithe',
     'value'                     => 'Luach',
     'brand'                     => 'Brandáil',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Socruithe Maidir',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Cineál Barcode 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/ga-IE/admin/settings/message.php b/resources/lang/ga-IE/admin/settings/message.php
index e2d733c85b8e..2a091713e6f2 100644
--- a/resources/lang/ga-IE/admin/settings/message.php
+++ b/resources/lang/ga-IE/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php
index 84dde02fabaf..5580b6ec9956 100644
--- a/resources/lang/ga-IE/general.php
+++ b/resources/lang/ga-IE/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Gan Torthaí.',
     'no'  					=> 'Uimh',
     'notes'  				=> 'Nótaí',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Uimhir ordú',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Míreanna _MENU_ a thaispeáint',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/he-IL/admin/settings/general.php b/resources/lang/he-IL/admin/settings/general.php
index 1f200da7fd1e..3bcbd557ac60 100644
--- a/resources/lang/he-IL/admin/settings/general.php
+++ b/resources/lang/he-IL/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'הגדרות כלליות',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'צור גיבוי',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'גרסת PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'עליך להתקין את PHP-gd כדי להציג קודי QR, ראה הוראות התקנה.',
     'php_gd_warning'            => 'עיבוד תמונה PHP ותוסף GD אינו מותקן.',
@@ -231,7 +229,6 @@
     'update'                    => 'עדכן הגדרות',
     'value'                     => 'ערך',
     'brand'                     => 'מיתוג',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'על הגדרות',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'אבטחה',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'סוג ברקוד דו-ממדי',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/he-IL/admin/settings/message.php b/resources/lang/he-IL/admin/settings/message.php
index da22cec3cb38..e6e7ce1d3bdc 100644
--- a/resources/lang/he-IL/admin/settings/message.php
+++ b/resources/lang/he-IL/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/he-IL/general.php b/resources/lang/he-IL/general.php
index 3cd5c2681f2e..70bfd0cd1727 100644
--- a/resources/lang/he-IL/general.php
+++ b/resources/lang/he-IL/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'אין תוצאות.',
     'no'  					=> 'לא',
     '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',
     'order_number'          => 'מספר הזמנה',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'מציג _MENU_ פריטים',
@@ -567,5 +573,8 @@
     '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' => 'ניהול סיסמאות',
+    'user_managed_passwords_disallow' => 'למנוע ממשתמשים לנהל את הסיסמאות של עצמם',
+    'user_managed_passwords_allow' => 'לאפשר למשתמשים לנהל את הסיסמאות של עצמם',
 
 ];
diff --git a/resources/lang/hr-HR/admin/settings/general.php b/resources/lang/hr-HR/admin/settings/general.php
index 9e1fd2e4f647..943a6fd7f3b9 100644
--- a/resources/lang/hr-HR/admin/settings/general.php
+++ b/resources/lang/hr-HR/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Dodatni tekst u podnožju ',
     'footer_text_help'          => 'Ovaj će se tekst pojaviti u podnožju desno. Poveznice su dopuštene uporabom <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Prijelazi u novi red, naslovi, slike itd., mogu imati nepredvidive rezultate.',
     'general_settings'			=> 'Opće postavke',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Izradi sigurnosnu kopiju',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP verzija',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Morate instalirati php-gd da biste prikazali QR kodove, pogledajte instalacijske upute.',
     'php_gd_warning'            => 'PHP Image Processing i GD dodatak NIJE instalirani.',
@@ -231,7 +229,6 @@
     'update'                    => 'Ažuriraj postavke',
     'value'                     => 'Vrijednost',
     'brand'                     => 'branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'O postavkama',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Vrsta 2D barkod',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/hr-HR/admin/settings/message.php b/resources/lang/hr-HR/admin/settings/message.php
index dc5b6dbb9027..0007607964f6 100644
--- a/resources/lang/hr-HR/admin/settings/message.php
+++ b/resources/lang/hr-HR/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/hr-HR/general.php b/resources/lang/hr-HR/general.php
index 1c53e23dbe6b..63571bfb34c5 100644
--- a/resources/lang/hr-HR/general.php
+++ b/resources/lang/hr-HR/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Nema rezultata.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Bilješke',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Broj narudžbe',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Prikazuje se _MENU_ stavki',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/hu-HU/admin/settings/general.php b/resources/lang/hu-HU/admin/settings/general.php
index 367c62dd8f6e..a9ab93b76816 100644
--- a/resources/lang/hu-HU/admin/settings/general.php
+++ b/resources/lang/hu-HU/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'További lábjegyzet szöveg ',
     'footer_text_help'          => 'Ez a szöveg a lábléc jobb oldalán fog megjelenni. Linkek használata engedélyezett <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a> formátumban. Sortörések, fejlécek, képek, stb. okozhatnak problémákat a megjelenítés során.',
     'general_settings'			=> 'Általános beállítások',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Alapértelmezett EULA és egyéb',
     'generate_backup'			=> 'Háttér létrehozása',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP verzió',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, rendszer, információ',
     'php_overview_help'         => 'PHP Rendszer információk',
     'php_gd_info'               => 'A QR-kódok megjelenítéséhez telepíteni kell a php-gd-t, lásd a telepítési utasításokat.',
     'php_gd_warning'            => 'A PHP Image Processing és a GD plugin NEM van telepítve.',
@@ -231,7 +229,6 @@
     'update'                    => 'Frissítési beállítások',
     'value'                     => 'Érték',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'lábléc, logó, nyomtatás, téma, megjelenés, fejléc, színek, szín, css',
     'brand_help'                => 'Logó, oldal neve',
     'web_brand'                 => 'Weboldalon megjelenő branding típusa',
     'about_settings_title'      => 'A Beállítások részről',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Szűrés beállítási kulcsszó alapján',
     'security' => 'Biztonság',
     'security_title' => 'Biztonsági beállítások frissítése',
-    'security_keywords' => 'jelszó, jelszavak, követelmények, kétfaktoros, két-faktoros, közös jelszavak, távoli bejelentkezés, kijelentkezés, hitelesítés',
     'security_help' => 'Kétfaktoros, jelszavas korlátozások',
-    'groups_keywords' => 'jogosultságok, jogosultsági csoportok, engedélyezés',
     'groups_help' => 'Fiókjogosultsági csoportok',
     'localization' => 'Lokalizáció',
     'localization_title' => 'Lokalizációs beállítások frissítése',
-    'localization_keywords' => 'lokalizáció, pénznem, helyi, lokalitás, időzóna, időzóna, nemzetközi, internatinalizáció, nyelv, nyelvek, fordítás',
     'localization_help' => 'Nyelv, dátum kijelzés',
     'notifications' => 'Értesítések',
     'notifications_help' => 'E-mail riasztások, audit beállítások',
     'asset_tags_help' => 'Inkrementálás és előtagok',
     'labels' => 'Címkék',
     'labels_title' => 'Címke beállítások frissítése',
-    'labels_help' => 'Címke méretek &amp; beállításai',
-    'purge_keywords' => 'véglegesen törölni',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D vonalkód típus',
     'label2_2d_type_help'     => '2D vonalkód formátuma',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Mező definíciók',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Alapértelmezés',
     'none'                  => 'Egyik sem',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'lábléc, logó, nyomtatás, téma, megjelenés, fejléc, színek, szín, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'jogosultságok, jogosultsági csoportok, engedélyezés',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalizáció, pénznem, helyi, lokalitás, időzóna, időzóna, nemzetközi, internatinalizáció, nyelv, nyelvek, fordítás',
+        'php_overview'      => 'phpinfo, rendszer, információ',
+        'purge'             => 'véglegesen törölni',
+        'security'          => 'jelszó, jelszavak, követelmények, kétfaktoros, két-faktoros, közös jelszavak, távoli bejelentkezés, kijelentkezés, hitelesítés',
+    ],
+
 ];
diff --git a/resources/lang/hu-HU/admin/settings/message.php b/resources/lang/hu-HU/admin/settings/message.php
index 2839242cd996..7d11816bb8c3 100644
--- a/resources/lang/hu-HU/admin/settings/message.php
+++ b/resources/lang/hu-HU/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Valami hiba történt. A Slack a következő üzenettel válaszolt: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/hu-HU/general.php b/resources/lang/hu-HU/general.php
index d13cc7233ee1..678dbec67a1f 100644
--- a/resources/lang/hu-HU/general.php
+++ b/resources/lang/hu-HU/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Nincs találat.',
     'no'  					=> 'Nem ',
     'notes'  				=> 'Megjegyzések',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Rendelésszám',
     'only_deleted'          => 'Csak törölt eszközök',
     'page_menu'				=> '_MENU_ elemet megjelenítve',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/id-ID/admin/settings/general.php b/resources/lang/id-ID/admin/settings/general.php
index 01b1e89e2a19..4ce7f34f8e9b 100644
--- a/resources/lang/id-ID/admin/settings/general.php
+++ b/resources/lang/id-ID/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Teks Footer Tambahan ',
     'footer_text_help'          => 'Teks ini akan muncul di footer sebelah kanan. Tautan diizinkan menggunakan <a href="https://help.github.com/articles/github-flavored-markdown/">marka bergaya Github</a>. Baris baru, header, gambar, dll mungkin akan mengakibatkan hasil yang tidak sesuai.',
     'general_settings'			=> 'Konfigurasi umum',
-    'general_settings_keywords' => 'dukungan company, tanda tangan, penerimaan, format email, format nama pengguna, gambar, per halaman, thumbnail, Eula, gravatar, tos, dasbor, privasi',
     'general_settings_help'     => 'EULA Default dan lainnya',
     'generate_backup'			=> 'Membuat cadangan',
     'google_workspaces'         => 'Google Workspace',
@@ -154,7 +153,6 @@
     'php'                       => 'Versi PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Anda harus memasang php-gd untuk menampilkan kode QR, baca petunjuk pemasangan.',
     'php_gd_warning'            => 'Plugin PHP pengolahan citra dan GD tidak diinstal.',
@@ -231,7 +229,6 @@
     'update'                    => 'Pengaturan perbaruan',
     'value'                     => 'Harga',
     'brand'                     => 'Merek',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Nama Website',
     'web_brand'                 => 'Jenis Web Branding',
     'about_settings_title'      => 'Tentang pengaturan',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter dengan mengatur kata kunci',
     'security' => 'Keamanan',
     'security_title' => 'Perbarui Pengaturan Keamanan',
-    'security_keywords' => 'sandi, persyaratan, dua faktor, kata sandi umum, login jarak jauh, keluar, autentikasi',
     'security_help' => 'Dua Faktor, Batasan Kata Sandi',
-    'groups_keywords' => 'Izin, grup izin, otorisasi',
     'groups_help' => 'Grup izin akun',
     'localization' => 'Lokalisasi',
     'localization_title' => 'Perbarui Pengaturan Lokalisasi',
-    'localization_keywords' => 'Lokalisasi, mata uang, lokal, zona waktu, internasionalisasi, bahasa, terjemahan',
     'localization_help' => 'Bahasa, tampilan tanggal',
     'notifications' => 'Notifikasi',
     'notifications_help' => 'Peringatan Email & Pengaturan Audit',
     'asset_tags_help' => 'Penambahan dan awalan',
     'labels' => 'Label',
     'labels_title' => 'Perbarui Pengaturan Label',
-    'labels_help' => 'Ukuran label &amp; pengaturan',
-    'purge_keywords' => 'Hapus permanen',
+    'labels_help' => 'Pengaturan Barcode &amp; label',
     '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',
@@ -362,12 +355,15 @@
     'label2_2d_type'          => 'Tipe Barcode 2D',
     'label2_2d_type_help'     => 'Format untuk barcode 2D',
     'label2_2d_target'        => 'Targer Barcode 2D',
-    'label2_2d_target_help'   => 'URL yang dituju oleh barcode 2D saat dipindai',
+    'label2_2d_target_help'   => 'Data yang akan dimuat dalam barcode 2D',
     'label2_fields'           => 'Definisi Kolom',
     'label2_fields_help'      => 'Kolom dapat ditambahkan, dihapus, dan diurutkan ulang di bagian kiri. Untuk setiap kolom, beberapa opsi untuk Label dan Sumber Data dapat ditambahkan, dihapus, dan diurutkan ulang di bagian kanan.',
     'help_asterisk_bold'    => 'Teks yang dimasukkan sebagai <code>**text**</code>  akan ditampilkan dengan huruf tebal',
     'help_blank_to_use'     => 'Biarkan kosong untuk menggunakan nilai dari <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    'help_default_will_use' => '<code>:default</code> akan menggunakan nilai dari <code>:setting_name</code>.
+<br>Perhatikan bahwa nilai barcode harus mematuhi spesifikasi barcode terkait agar berhasil diger. Silakan lihat <a href="https://snipe-it.readme.io/docs/barcodes">dokumentasi <i class="fa fa-external-link"></i></a> untuk detail lebih lanjut. ',
+    'asset_id'              => 'ID Aset',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'Kosong',
     'google_callback_help' => 'Ini harus dimasukkan sebagai URL panggilan balik atau callback URL di pengaturan aplikasi Google OAuth Anda di <strong><a href="https://console.cloud.google.com/" target="_blank">Google Developer Console organisasi Anda <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +385,17 @@
     'due_checkin_days_help' => 'Berapa hari sebelum perkiraan check-in dari aset yang harus terdaftar di halaman "Due for checkin"?',
     'no_groups' => 'Belum ada grup yang dibuat. Kunjungi <code>Pengaturan Admin > Grup Izin</code> untuk menambahkannya.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'dukungan company, tanda tangan, penerimaan, format email, format nama pengguna, gambar, per halaman, thumbnail, Eula, gravatar, tos, dasbor, privasi',
+        'groups'            => 'izin, grup izin, otorisasi',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisasi, mata uang, lokal, zona waktu, internasionalisasi, bahasa, terjemahan',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'hapus permanen',
+        'security'          => 'sandi, persyaratan, dua faktor, kata sandi umum, login jarak jauh, keluar, autentikasi',
+    ],
+
 ];
diff --git a/resources/lang/id-ID/admin/settings/message.php b/resources/lang/id-ID/admin/settings/message.php
index 567c6427ee62..e4efb1fe6193 100644
--- a/resources/lang/id-ID/admin/settings/message.php
+++ b/resources/lang/id-ID/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Terjadi kesalahan. :app merespons dengan: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/id-ID/general.php b/resources/lang/id-ID/general.php
index 5358068e2687..309be330232d 100644
--- a/resources/lang/id-ID/general.php
+++ b/resources/lang/id-ID/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Tidak ada hasil.',
     'no'  					=> 'Tidak',
     'notes'  				=> 'Catatan',
+    'note_added'            => 'Catatan Ditambahkan',
+    'add_note'              => 'Tambah Catatan',
+    'note_edited'            => 'Catatan Diedit',
+    'edit_note'              => 'Edit Catatan',
+    'note_deleted'            => 'Catatan Dihapus',
+    'delete_note'              => 'Hapus Catatan',
     'order_number'          => 'Jumlah order',
     'only_deleted'          => 'Hanya Aset yang Dihapus',
     'page_menu'				=> 'Menampilkan item _MENU_',
@@ -567,5 +573,8 @@
     'import_asset_tag_exists' => 'Aset dengan tag aset :asset_tag sudah ada dan tidak ada permintaan pembaruan. Tidak ada perubahan yang dibuat.',
     'countries_manually_entered_help' => 'Nilai yang ditandai dengan tanda bintang (*) dimasukkan secara manual dan tidak cocok dengan nilai dropdown ISO 3166 yang ada',
     'accessories_assigned' => 'Aksesoris yang Dipasangkan',
+    'user_managed_passwords' => 'Manajemen Kata Sandi',
+    'user_managed_passwords_disallow' => 'Jangan izinkan pengelolaan kata sandi oleh pengguna',
+    'user_managed_passwords_allow' => 'Izinkan pengguna mengelola kata sandi mereka sendiri',
 
 ];
diff --git a/resources/lang/is-IS/admin/settings/general.php b/resources/lang/is-IS/admin/settings/general.php
index e65c2e963c71..fcbb9c77986b 100644
--- a/resources/lang/is-IS/admin/settings/general.php
+++ b/resources/lang/is-IS/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Búa til öryggisafrit',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP útgáfa',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Núvirði',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/is-IS/admin/settings/message.php b/resources/lang/is-IS/admin/settings/message.php
index c6a5d4c977df..ff2e5102fb7b 100644
--- a/resources/lang/is-IS/admin/settings/message.php
+++ b/resources/lang/is-IS/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/is-IS/general.php b/resources/lang/is-IS/general.php
index 6794e61c12ff..3ed975c83746 100644
--- a/resources/lang/is-IS/general.php
+++ b/resources/lang/is-IS/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Engar niðurstöður.',
     'no'  					=> 'Nei',
     'notes'  				=> 'Athugasemdir',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Reikningsnúmer',
     'only_deleted'          => 'Aðeins eyddar eignir',
     'page_menu'				=> 'Sýni _MENU_ atriði',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/it-IT/admin/settings/general.php b/resources/lang/it-IT/admin/settings/general.php
index 5d83426d7608..0a23037733ba 100644
--- a/resources/lang/it-IT/admin/settings/general.php
+++ b/resources/lang/it-IT/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Ulteriori testo di piè di pagina ',
     'footer_text_help'          => 'Questo testo verrà visualizzato nel piè di pagina a destra. I collegamenti sono consentiti usando <a href="https://help.github.com/articles/github-flavored-markdown/">Markdown in stile Github</a>. Interruzioni di linea, intestazioni, immagini, ecc. possono dare risultati imprevedibili.',
     'general_settings'			=> 'Impostazioni Generali',
-    'general_settings_keywords' => 'supporto aziendale, firma, accettazione, formato email, formato username, immagini, per pagina, miniature, eula, gravatar, tos, cruscotto, privacy',
     'general_settings_help'     => 'EULA predefinita e altro',
     'generate_backup'			=> 'Crea Backup',
     'google_workspaces'         => 'Google Workspace',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'Info PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, informazioni',
     'php_overview_help'         => 'Informazioni di sistema PHP',
     'php_gd_info'               => 'È necessario installare php-gd per visualizzare i codici QR, consultare le istruzioni di installazione.',
     'php_gd_warning'            => 'Il plugin PHP Image Processing and GD non è installato.',
@@ -231,7 +229,6 @@
     'update'                    => 'Aggiorna impostazioni',
     'value'                     => 'Valore',
     'brand'                     => 'Personalizzazione',
-    'brand_keywords'            => 'piè di pagina, logo, stampa, tema, skin, intestazione, colori, colore, css',
     'brand_help'                => 'Logo, Nome Sito',
     'web_brand'                 => 'Tipologia di Web Branding',
     'about_settings_title'      => 'Impostazioni',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtra per parola chiave impostazioni',
     'security' => 'Sicurezza',
     'security_title' => 'Aggiorna Impostazioni Di Sicurezza',
-    'security_keywords' => 'password, passwords, requisiti, due fattori, two-factor, password comuni, login remoto, logout, autenticazione',
     'security_help' => 'Due Fattori, Restrizioni Password',
-    'groups_keywords' => 'permessi, gruppi di autorizzazioni, autorizzazione',
     'groups_help' => 'Gruppi di autorizzazioni account',
     'localization' => 'Lingua',
     'localization_title' => 'Aggiorna Impostazioni Lingua',
-    'localization_keywords' => 'localizzazione, valuta, locale, locali fuso orario, orario, internazionale, internazionalizzazione, lingua, lingue, traduzione',
     'localization_help' => 'Lingua, formato data',
     'notifications' => 'Notifiche',
     'notifications_help' => 'Impostazioni Avvisi E Email Controlli',
     'asset_tags_help' => 'Incrementi e prefissi',
     'labels' => 'Etichette',
     'labels_title' => 'Aggiorna Impostazioni Etichette',
-    'labels_help' => 'Dimensioni etichette &amp; impostazioni',
-    'purge_keywords' => 'elimina definitivamente',
+    'labels_help' => 'Codici a barre &amp; impostazioni etichette',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Tipo Barcode 2D',
     'label2_2d_type_help'     => 'Formato barcode 2D',
     'label2_2d_target'        => 'Target Barcode 2D',
-    'label2_2d_target_help'   => 'L\'URL a cui il codice a barre 2D punterà quando scansionato',
+    'label2_2d_target_help'   => 'I dati che saranno contenuti nel codice a barre 2D',
     'label2_fields'           => 'Definizioni Campi',
     'label2_fields_help'      => 'I campi possono essere aggiunti, rimossi e riordinati nella colonna di sinistra. Per ogni campo, possono essere aggionte, rimosse e riordinate più opzioni per Label e DataSource nella colonna di destra.',
     'help_asterisk_bold'    => 'Il testo inserito <code>**così**</code> verrà visualizzato in grassetto',
     'help_blank_to_use'     => 'Lascia vuoto per usare il valore in <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Il valore dei codici a barre deve essere conforme alla rispettiva specifica per poter essere generato. Si prega di leggere <a href="https://snipe-it.readme.io/docs/barcodes">la documentazione <i class="fa fa-external-link"></i></a> per maggiori dettagli. ',
+    'help_default_will_use' => '<code>:default</code> userà il valore di <code>:setting_name</code>. <br>Nota che il valore dei codici a barre deve essere conforme alla rispettiva specifica per essere generati correttamente. Per maggiori dettagli consultare <a href="https://snipe-it.readme.io/docs/barcodes">la documentazione <i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'ID Bene',
+    'data'               => 'Dati',
     'default'               => 'Predefinito',
     'none'                  => 'Niente',
     'google_callback_help' => 'Inserisci qeusto URL come URL di callback nelle impostazioni della tua app Google OAuth nella <strong><a href="https://console.cloud.google.com/" target="_blank">Google Cloud Console<i class="fa fa-external-link" aria-hidden="true"></i></a></strong> della tua organizzazione.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Quanti giorni prima della restituzione prevista di un Bene dovrebbe essere elencato nella pagina della "Restituzioni Previste"?',
     'no_groups' => 'Ancora non è stato creato alcun gruppo. Per aggiungerne uno vai a <code>Impostazioni Admin > Gruppi</code>.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'piè di pagina, logo, stampa, tema, skin, intestazione, colori, colore, css',
+        'general_settings'  => 'supporto aziendale, firma, accettazione, formato email, formato username, immagini, per pagina, miniature, eula, gravatar, tos, cruscotto, privacy',
+        'groups'            => 'permessi, gruppi di autorizzazioni, autorizzazione',
+        'labels'            => 'etichette, codici a barre, codice a barre, fogli, stampa, upc, qr, 1d, 2d',
+        'localization'      => 'localizzazione, valuta, locale, locali fuso orario, orario, internazionale, internazionalizzazione, lingua, lingue, traduzione',
+        'php_overview'      => 'phpinfo, sistema, informazioni',
+        'purge'             => 'elimina definitivamente',
+        'security'          => 'password, passwords, requisiti, due fattori, two-factor, password comuni, login remoto, logout, autenticazione',
+    ],
+
 ];
diff --git a/resources/lang/it-IT/admin/settings/message.php b/resources/lang/it-IT/admin/settings/message.php
index 3ea292745c48..87245998b73f 100644
--- a/resources/lang/it-IT/admin/settings/message.php
+++ b/resources/lang/it-IT/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Qualcosa è andato storto. :app ha risposto con: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/it-IT/general.php b/resources/lang/it-IT/general.php
index e946b85b0ca6..81a5e16184ff 100644
--- a/resources/lang/it-IT/general.php
+++ b/resources/lang/it-IT/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Nessun risultato.',
     'no'  					=> 'No',
     'notes'  				=> 'Note',
+    'note_added'            => 'Nota Aggiunta',
+    'add_note'              => 'Aggiungi nota',
+    'note_edited'            => 'Nota Modificata',
+    'edit_note'              => 'Modifica Nota',
+    'note_deleted'            => 'Nota cancellata',
+    'delete_note'              => 'Cancella nota',
     'order_number'          => 'Numero d\'ordine',
     'only_deleted'          => 'Solo Beni Eliminati',
     'page_menu'				=> 'Visualizza _MENU_ articoli',
@@ -567,5 +573,8 @@
     'import_asset_tag_exists' => 'Esiste già un Bene con tag :asset_tag e non è stato richiesto un aggiornamento. Nessuna modifica effettuata.',
     'countries_manually_entered_help' => 'I valori con un asterisco (*) sono stati inseriti manualmente e non corrispondono a valori esistenti ISO 3166 nell\'elenco a discesa',
     'accessories_assigned' => 'Accessori Assegnati',
+    'user_managed_passwords' => 'Gestione password',
+    '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',
 
 ];
diff --git a/resources/lang/iu-NU/admin/settings/general.php b/resources/lang/iu-NU/admin/settings/general.php
index 6dcfee66be14..97567df8dfd4 100644
--- a/resources/lang/iu-NU/admin/settings/general.php
+++ b/resources/lang/iu-NU/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/iu-NU/admin/settings/message.php b/resources/lang/iu-NU/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/iu-NU/admin/settings/message.php
+++ b/resources/lang/iu-NU/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/iu-NU/general.php b/resources/lang/iu-NU/general.php
index 20c1cf8aeaae..77670b5a7e47 100644
--- a/resources/lang/iu-NU/general.php
+++ b/resources/lang/iu-NU/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     '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',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/ja-JP/admin/settings/general.php b/resources/lang/ja-JP/admin/settings/general.php
index d15552b57532..fcced6a48b28 100644
--- a/resources/lang/ja-JP/admin/settings/general.php
+++ b/resources/lang/ja-JP/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => '追加のフッターテキスト ',
     'footer_text_help'          => 'このテキストは右側のフッターに表示されます。 <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>を使用してリンクが作成できます。改行、ヘッダー、画像などは、予期しない表示結果になる可能性があります。',
     'general_settings'			=> '全般設定',
-    'general_settings_keywords' => '会社のサポート、署名、受諾、電子メール形式、ユーザー名形式、ページあたりの画像、サムネイル、eula、gravatar、tos、ダッシュボード、プライバシー',
     'general_settings_help'     => 'デフォルトのEULAなど',
     'generate_backup'			=> 'バックアップを作成',
     'google_workspaces'         => 'Google ワークスペース',
@@ -157,7 +156,6 @@
     'php'                       => 'PHPバージョン',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHPシステム情報',
     'php_gd_info'               => 'QRコードを表示するためにphp-gdをインストールする必要があります。インストールインストラクションを参照して下さい。',
     'php_gd_warning'            => 'PHP Image Processing および GD plugin が、インストールされていません。',
@@ -234,7 +232,6 @@
     'update'                    => '設定を更新',
     'value'                     => '価値',
     'brand'                     => 'ブランディング',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'ロゴ, サイト名',
     'web_brand'                 => 'Webブランディングタイプ',
     'about_settings_title'      => '設定について',
@@ -322,21 +319,17 @@
     'filter_by_keyword' => 'キーワードを設定してフィルター',
     'security' => 'セキュリティ',
     'security_title' => 'セキュリティ設定を更新',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => '二段階認証, パスワードの制限',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'アカウント権限グループ',
     'localization' => 'ローカライズ',
     'localization_title' => 'ローカライズ設定を更新',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => '言語, 日付表示',
     'notifications' => '通知',
     'notifications_help' => 'メールアラートと監査設定',
     'asset_tags_help' => '増分とプレフィクス',
     'labels' => 'ラベル',
     'labels_title' => 'ラベル設定を更新',
-    'labels_help' => 'ラベルサイズ &amp; 設定',
-    'purge_keywords' => '恒久的に削除',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => '削除したレコードを消去',
     'ldap_extension_warning' => 'このサーバーでは、LDAP 拡張モジュールがインストールされていないか、または有効になっていないようです。設定を保存することはできますが、LDAPの同期やログインを機能させるために、PHPのLDAP拡張モジュールを有効にする必要があります。',
     'ldap_ad' => 'LDAP/AD',
@@ -365,12 +358,14 @@
     'label2_2d_type'          => '2次元バーコードタイプ',
     'label2_2d_type_help'     => '2D バーコードのフォーマット',
     'label2_2d_target'        => '2次元バーコードターゲット',
-    'label2_2d_target_help'   => 'スキャン時の 2D バーコードポイントの URL',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'フィールド定義',
     'label2_fields_help'      => '項目は左の列に追加、削除、並び替えができます。 各項目に、LabelとDataSourceの複数のオプションを右側の列に追加、削除、並び替えができます。',
     'help_asterisk_bold'    => '<code>**text**</code> として入力されたテキストは太字で表示されます',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'デフォルト',
     'none'                  => 'なし',
     'google_callback_help' => 'これは、組織&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google 開発者コンソール <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> の Google OAuth アプリ設定のコールバックURLとして入力する必要があります。',
@@ -392,4 +387,17 @@
     'due_checkin_days_help' => 'アセットの期待されるチェックインの何日前に、「チェックイン期限」ページにリストされるべきですか?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => '会社のサポート、署名、受諾、電子メール形式、ユーザー名形式、ページあたりの画像、サムネイル、eula、gravatar、tos、ダッシュボード、プライバシー',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => '恒久的に削除',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/ja-JP/admin/settings/message.php b/resources/lang/ja-JP/admin/settings/message.php
index db8825c73e8c..48f71c2dc132 100644
--- a/resources/lang/ja-JP/admin/settings/message.php
+++ b/resources/lang/ja-JP/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => '問題が発生しました。:app 応答: :error_message',
         'error_redirect' => 'エラー: 301/302 :endpoint はリダイレクトを返します。セキュリティ上の理由から、リダイレクトには従いません。実際のエンドポイントを使用してください。',
         'error_misc' => '問題が発生しました。:( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];
diff --git a/resources/lang/ja-JP/general.php b/resources/lang/ja-JP/general.php
index d830c152e2fb..4c0fe5b35a26 100644
--- a/resources/lang/ja-JP/general.php
+++ b/resources/lang/ja-JP/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> '結果はありません。',
     'no'  					=> 'いいえ',
     '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',
     'order_number'          => '注文番号',
     'only_deleted'          => '削除された資産のみ',
     'page_menu'				=> 'メニューアイテムを表示',
@@ -567,5 +573,8 @@
     'import_asset_tag_exists' => 'アセットタグ :asset_tag のアセットは既に存在し、アップデートは要求されませんでした。変更はありません。',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     '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',
 
 ];
diff --git a/resources/lang/km-KH/admin/consumables/general.php b/resources/lang/km-KH/admin/consumables/general.php
index ea972d19d9fd..6983996b59dc 100644
--- a/resources/lang/km-KH/admin/consumables/general.php
+++ b/resources/lang/km-KH/admin/consumables/general.php
@@ -3,10 +3,10 @@
 return array(
     'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'ឈ្មោះ Consumable',
-    'create'                            => 'Create Consumable',
-    'item_no'                           => 'Item No.',
-    'remaining' 			            => 'Remaining',
+    'create'                            => 'បង្កើតឧបករណ៍ប្រើប្រាស់',
+    'item_no'                           => 'ធាតុលេខ',
+    'remaining' 			            => 'នៅសល់',
     'total' 			                => 'សរុប',
-    'update'                            => 'Update Consumable',
-    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
+    'update'                            => 'ធ្វើបច្ចុប្បន្នភាពឧបករណ៍ប្រើប្រាស់',
+    'inventory_warning'                 => 'សារពើភ័ណ្ឌនៃសម្ភារៈប្រើប្រាស់នេះគឺទាបជាងចំនួនអប្បបរមានៃ :min_count',
 );
diff --git a/resources/lang/km-KH/admin/consumables/message.php b/resources/lang/km-KH/admin/consumables/message.php
index 1a8cdd422a7b..b646ffb24ed0 100644
--- a/resources/lang/km-KH/admin/consumables/message.php
+++ b/resources/lang/km-KH/admin/consumables/message.php
@@ -2,8 +2,8 @@
 
 return array(
 
-    'invalid_category_type' => 'The category must be a consumable category.',
-    'does_not_exist' => 'Consumable does not exist.',
+    'invalid_category_type' => 'ប្រភេទត្រូវតែជាប្រភេទប្រើប្រាស់បាន។',
+    'does_not_exist' => 'សម្ភារៈប្រើប្រាស់មិនមានទេ។',
 
     'create' => array(
         'error'   => 'Consumable was not created, please try again.',
diff --git a/resources/lang/km-KH/admin/custom_fields/general.php b/resources/lang/km-KH/admin/custom_fields/general.php
index 34c0e4a0a4d9..8ba71f9382b6 100644
--- a/resources/lang/km-KH/admin/custom_fields/general.php
+++ b/resources/lang/km-KH/admin/custom_fields/general.php
@@ -43,19 +43,19 @@
     'add_field_to_fieldset' => 'Add Field to Fieldset',
     'make_optional' => 'Required - click to make optional',
     'make_required' => 'Optional - click to make required',
-    'reorder' => 'Reorder',
+    'reorder' => 'តម្រៀបឡើងវិញ',
     'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
-    'is_unique' => 'This value must be unique across all assets',
+    'db_convert_warning' => 'ព្រមាន។ fieldនេះស្ថិតនៅក្នុងតារាងfieldsផ្ទាល់ខ្លួនជា <code>:db_column</code> ប៉ុន្តែគួរតែជា <code>:expected</code>។',
+    'is_unique' => 'តម្លៃនេះត្រូវតែមានតែមួយគត់នៅទូទាំងទ្រព្យសកម្មទាំងអស់។',
     'unique' => 'Unique',
-    'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
-    'display_in_user_view_table' => 'Visible to User',
-    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
-    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
-    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
-    'show_in_listview_short' => 'Show in lists',
-    'show_in_requestable_list_short' => 'Show in requestable assets list',
-    'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
-    'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_in_user_view' => 'អនុញ្ញាតឱ្យអ្នកប្រើប្រាស់ដែលបានប្រគល់ អាចមើលតម្លៃទាំងនេះនៅក្នុងទំព័រមើលទ្រព្យសម្បត្តិដែលបានចាត់តាំងរបស់ពួកគេ។',
+    'display_in_user_view_table' => 'អ្នកប្រើប្រាស់អាចមើលឃើញ',
+    'auto_add_to_fieldsets' => 'បន្ថែមវាដោយស្វ័យប្រវត្តិទៅគ្រប់fieldsetថ្មី',
+    'add_to_preexisting_fieldsets' => 'បន្ថែមទៅfieldsetsដែលមានស្រាប់',
+    'show_in_listview' => 'បង្ហាញក្នុងទិដ្ឋភាពបញ្ជីតាមលំនាំដើម។ អ្នកប្រើប្រាស់ដែលមានការអនុញ្ញាតនឹងនៅតែអាចបង្ហាញ/លាក់តាមរយៈឧបករណ៍ជ្រើសរើសជួរឈរ',
+    'show_in_listview_short' => 'បង្ហាញក្នុងបញ្ជី',
+    'show_in_requestable_list_short' => 'បង្ហាញក្នុងបញ្ជីទ្ទ្រព្យសកម្មដែលអាចស្នើសុំបាន។',
+    'show_in_requestable_list' => 'បង្ហាញតម្លៃក្នុងបញ្ជីទ្រព្យសកម្មដែលអាចស្នើសុំបាន។ fields ដែលបានអ៊ិនគ្រីបនឹងមិនត្រូវបានបង្ហាញទេ។',
+    'encrypted_options' => 'Fieldនេះត្រូវបានអ៊ិនគ្រីប ដូច្នេះជម្រើសបង្ហាញមួយចំនួននឹងមិនមានទេ។',
 
 ];
diff --git a/resources/lang/km-KH/admin/hardware/general.php b/resources/lang/km-KH/admin/hardware/general.php
index 20dab1fe031f..0cf85c6cf3cc 100644
--- a/resources/lang/km-KH/admin/hardware/general.php
+++ b/resources/lang/km-KH/admin/hardware/general.php
@@ -9,13 +9,13 @@
     'bulk_checkin'              => 'Checkin Assets',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
-    'clone'  					=> 'Clone Asset',
+    'clone'  					=> 'ក្លូន ទ្រព្យសកម្ម',
     'deployable'  				=> 'អាចប្រើបាន',
     'deleted'  					=> 'ទ្រព្យសកម្មនេះត្រូវបានលុប។',
     'delete_confirm'            => 'តើអ្នកប្រាកដថាចង់លុបទ្រព្យសម្បត្តិនេះទេ?',
     'edit'  					=> 'កែសម្រួលទ្រព្យសកម្ម',
     'model_deleted'  			=> 'គំរូទ្រព្យសកម្មនេះត្រូវបានលុប។ អ្នក​ត្រូវ​តែ​ស្ដារ​គំរូ​មុន​ពេល​អ្នក​អាច​ស្ដារ​ទ្រព្យសកម្ម។',
-    'model_invalid'             => 'This model for this asset is invalid.',
+    'model_invalid'             => 'គំរូនេះសម្រាប់ទ្រព្យសកម្មនេះមិនត្រឹមត្រូវទេ។',
     '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.',
     'requestable'               => 'អាចស្នើសុំបាន',
     'requested'				    => 'បានស្នើសុំ',
@@ -29,11 +29,11 @@
     'csv_error' => 'អ្នកមានកំហុសនៅក្នុងឯកសារ CSV របស់អ្នក៖',
     'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
     ',
-    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
-    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
-    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
-    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
-    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
+    'csv_import_match_f-l' => 'ព្យាយាមផ្គូផ្គងអ្នកប្រើប្រាស់តាមទម្រង់ <strong>firstname.lastname</strong> (<code>jane.smith</code>)',
+    'csv_import_match_initial_last' => 'ព្យាយាមផ្គូផ្គងអ្នកប្រើប្រាស់តាមទម្រង់ <strong>នាមត្រកូលដំបូង</strong> (<code>jsmith</code>)',
+    'csv_import_match_first' => 'ព្យាយាមផ្គូផ្គងអ្នកប្រើប្រាស់តាមទម្រង់ <strong>ឈ្មោះដំបូង</strong> (<code>jane</code>)',
+    'csv_import_match_email' => 'ព្យាយាមផ្គូផ្គងអ្នកប្រើប្រាស់តាម <strong>អ៊ីមែល</strong> ជាឈ្មោះអ្នកប្រើប្រាស់',
+    'csv_import_match_username' => 'ព្យាយាមផ្គូផ្គងអ្នកប្រើប្រាស់ដោយ <strong>ឈ្មោះអ្នកប្រើប្រាស់</strong>',
     'error_messages' => 'សារបង្ហាញពីកំហុស៖',
     'success_messages' => 'សារជោគជ័យ៖',
     'alert_details' => 'សូមមើលខាងក្រោមសម្រាប់ព័ត៌មានលម្អិត។',
diff --git a/resources/lang/km-KH/admin/hardware/message.php b/resources/lang/km-KH/admin/hardware/message.php
index 6c5867eac749..6bbbae6827b6 100644
--- a/resources/lang/km-KH/admin/hardware/message.php
+++ b/resources/lang/km-KH/admin/hardware/message.php
@@ -2,13 +2,13 @@
 
 return [
 
-    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		 => '<strong>ការព្រមាន៖ </strong> ទ្រព្យសកម្មនេះត្រូវបានសម្គាល់ថាមិនអាចប្រើប្រាស់បាននាពេលបច្ចុប្បន្ន។ ប្រសិនបើស្ថានភាពនេះត្រូវបានផ្លាស់ប្តូរ សូមធ្វើបច្ចុប្បន្នភាពស្ថានភាពទ្រព្យសម្បត្តិ។',
     'does_not_exist' 	 => 'ទ្រព្យសកម្មមិនមានទេ។',
-    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
-    'no_tag' 	         => 'No asset tag provided.',
+    'does_not_exist_var' => 'ទ្រព្យសកម្មដែលមានស្លាក៖ asset_tag រកមិនឃើញទេ។',
+    'no_tag' 	         => 'មិនមានស្លាកទ្រព្យសម្បត្តិត្រូវបានផ្តល់ឱ្យទេ។',
     'does_not_exist_or_not_requestable' => 'ទ្រព្យសកម្មនោះមិនមានទេ ឬមិនអាចស្នើសុំបាន។',
     'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'warning_audit_date_mismatch' 	=> 'កាលបរិច្ឆេទសវនកម្មបន្ទាប់របស់ទ្រព្យសកម្មនេះ (:next_audit_date) គឺមុនកាលបរិច្ឆេទសវនកម្មចុងក្រោយ (:last_audit_date)។ សូមធ្វើបច្ចុប្បន្នភាពកាលបរិច្ឆេទសវនកម្មបន្ទាប់។',
     'labels_generated'   => 'ស្លាកត្រូវបានបង្កើតដោយជោគជ័យ។',
     'error_generating_labels' => 'កំហុសខណៈពេលបង្កើតស្លាក។',
     'no_assets_selected' => 'មិនបានជ្រើសរើសទ្រព្យសម្បត្តិទេ។',
@@ -17,8 +17,8 @@
         'error'   		=> 'ទ្រព្យសកម្មមិនត្រូវបានបង្កើតទេ សូមព្យាយាមម្តងទៀត។ :(',
         'success' 		=> 'ទ្រព្យសកម្មត្រូវបានបង្កើតដោយជោគជ័យ។ :)',
         'success_linked' => 'ទ្រព្យសកម្មជាមួយស្លាក៖ ស្លាកត្រូវបានបង្កើតដោយជោគជ័យ។ <strong><a href=":link" style="color: white;">ចុចទីនេះដើម្បីមើល</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' => 'ទ្រព្យសកម្មជាមួយស្លាក៖ តំណត្រូវបានបង្កើតដោយជោគជ័យ។|: ទ្រព្យសម្បត្តិរាប់ត្រូវបានបង្កើតដោយជោគជ័យ។ ៖ តំណភ្ជាប់។',
+        'partial_failure' => 'ទ្រព្យសកម្មមិនអាចបង្កើតបានទេ។ ហេតុផល៖ :failures|:រាប់ទ្រព្យសកម្មមិនអាចបង្កើតបានទេ។ មូលហេតុ៖៖ បរាជ័យ',
     ],
 
     'update' => [
@@ -27,7 +27,7 @@
         'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
         'nothing_updated'	=>  'គ្មាន​វាល​ត្រូវ​បាន​ជ្រើស ដូច្នេះ​មិន​មាន​អ្វី​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​។',
         'no_assets_selected'  =>  'គ្មានទ្រព្យសម្បត្តិត្រូវបានជ្រើសរើស ដូច្នេះគ្មានអ្វីត្រូវបានធ្វើបច្ចុប្បន្នភាពទេ។',
-        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+        'assets_do_not_exist_or_are_invalid' => 'ទ្រព្យសកម្មដែលបានជ្រើសរើសមិនអាចធ្វើបច្ចុប្បន្នភាពបានទេ។',
     ],
 
     'restore' => [
@@ -38,7 +38,7 @@
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'សវនកម្មទ្រព្យសកម្មមិនជោគជ័យ៖ : error ',
         'success' 		=> 'សវនកម្មទ្រព្យសកម្មត្រូវបានកត់ត្រាដោយជោគជ័យ។',
     ],
 
@@ -56,14 +56,14 @@
     ],
 
     'import' => [
-        'import_button'         => 'Process Import',
-        'error'                 => 'Some items did not import correctly.',
-        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'import_button'         => 'ដំណើរការនាំចូល',
+        'error'                 => 'ធាតុមួយចំនួនមិនបាននាំចូលត្រឹមត្រូវ។',
+        'errorDetail'           => 'ធាតុខាងក្រោមមិនត្រូវបាននាំចូលទេ ដោយសារមានកំហុស។',
         'success'               => 'ឯកសាររបស់អ្នកត្រូវបាននាំចូល',
         'file_delete_success'   => 'ឯកសាររបស់អ្នកត្រូវបានលុបដោយជោគជ័យ',
         'file_delete_error'      => 'ឯកសារមិនអាចលុបបានទេ។',
         'file_missing' => 'បាត់ឯកសារដែលបានជ្រើសរើស',
-        'file_already_deleted' => 'The file selected was already deleted',
+        'file_already_deleted' => 'ឯកសារដែលបានជ្រើសរើសត្រូវបានលុបរួចហើយ',
         'header_row_has_malformed_characters' => 'គុណលក្ខណៈមួយ ឬច្រើននៅក្នុងជួរបឋមកថាមានតួអក្សរ UTF-8 ខុសទម្រង់',
         'content_row_has_malformed_characters' => 'គុណលក្ខណៈមួយ ឬច្រើននៅក្នុងជួរទីមួយនៃមាតិកាមានតួអក្សរ UTF-8 ខុសទម្រង់',
     ],
diff --git a/resources/lang/km-KH/admin/hardware/table.php b/resources/lang/km-KH/admin/hardware/table.php
index bcf18e924f3f..c090d98f58d1 100644
--- a/resources/lang/km-KH/admin/hardware/table.php
+++ b/resources/lang/km-KH/admin/hardware/table.php
@@ -5,12 +5,12 @@
     'asset_tag'   	=> 'ស្លាកទ្រព្យសម្បត្តិ',
     'asset_model'       => 'គំរូ',
     'assigned_to'   => 'ចាត់តាំងទៅ',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> 'តម្លៃបច្ចុប្បន្ន',
     'change' 		=> 'In/Out',
     'checkout_date' => 'ថ្ងៃប្រគល់អោយ',
     'checkoutto' 	=> 'Checked Out',
     'components_cost' => 'Total Components Cost',
-    'current_value' => 'Current Value',
+    'current_value' => 'តម្លៃបច្ចុប្បន្ន',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'ទាញយក CSV',
     'eol' 			=> 'EOL',
@@ -18,15 +18,15 @@
     'last_checkin_date' => 'Last Checkin Date',
     'location' 		=> 'ទីតាំង',
     'purchase_cost'	=> 'ការចំណាយ',
-    'purchase_date'	=> 'Purchased',
+    'purchase_date'	=> 'បានទិញ',
     'serial'   		=> 'Serial',
     'status'   		=> 'ស្ថានភាព',
     'title'      	=> 'ទ្រព្យសកម្ម ',
-    'image'		    => 'Device Image',
-    'days_without_acceptance' => 'Days Without Acceptance',
-    'monthly_depreciation' => 'Monthly Depreciation',
-    'requesting_user' => 'Requesting User',
+    'image'		    => 'រូបភាពឧបករណ៍',
+    'days_without_acceptance' => 'ថ្ងៃដែលគ្មានការទទួលយក',
+    'monthly_depreciation' => 'ការរំលោះប្រចាំខែ',
+    'requesting_user' => 'ស្នើសុំអ្នកប្រើប្រាស់',
     'requested_date' => 'កាលបរិច្ឆេទដែលបានស្នើសុំ',
     'changed'       => 'បានផ្លាស់ប្តូរ',
-    'icon' => 'Icon',
+    'icon' => 'រូបតំណាង',
 ];
diff --git a/resources/lang/km-KH/admin/labels/table.php b/resources/lang/km-KH/admin/labels/table.php
index 6d531ffde70d..ac8415c6ed19 100644
--- a/resources/lang/km-KH/admin/labels/table.php
+++ b/resources/lang/km-KH/admin/labels/table.php
@@ -13,7 +13,7 @@
     'support_asset_tag'  => 'Tag',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
-    'support_logo'       => 'Logo',
+    'support_logo'       => 'និមិត្តសញ្ញា',
     'support_title'      => 'ចំណងជើង',
 
 ];
\ No newline at end of file
diff --git a/resources/lang/km-KH/admin/licenses/table.php b/resources/lang/km-KH/admin/licenses/table.php
index 1e5fc6586539..fb6211a481e5 100644
--- a/resources/lang/km-KH/admin/licenses/table.php
+++ b/resources/lang/km-KH/admin/licenses/table.php
@@ -9,7 +9,7 @@
     'license_email'   	=> 'License Email',
     'license_name'   	=> 'Licensed To',
     'purchase_date'   	=> 'កាលបរិច្ឆេទទិញ',
-    'purchased'   		=> 'Purchased',
+    'purchased'   		=> 'បានទិញ',
     'seats'   			=> 'កៅអី',
     'hardware'   		=> 'Hardware',
     'serial'   			=> 'Serial',
diff --git a/resources/lang/km-KH/admin/reports/general.php b/resources/lang/km-KH/admin/reports/general.php
index 70d09e4e7f46..418b7954b25c 100644
--- a/resources/lang/km-KH/admin/reports/general.php
+++ b/resources/lang/km-KH/admin/reports/general.php
@@ -14,9 +14,9 @@
         'user_country' => 'ប្រទេសអ្នកប្រើប្រាស់',
         'user_zip' => 'លេខ​កូដ​អ្នក​ប្រើ'
     ],
-    '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' => 'បើកគំរូដែលបានរក្សាទុក',
+    'save_template' =>  'រក្សាទុកគំរូ',
+    'select_a_template' => 'ជ្រើសរើសគំរូមួយ។',
+    'template_name' => 'ឈ្មោះគំរូ',
+    'update_template' => 'ធ្វើបច្ចុប្បន្នភាពគំរូ',
 ];
diff --git a/resources/lang/km-KH/admin/reports/message.php b/resources/lang/km-KH/admin/reports/message.php
index 2800bbdf0bc5..c09c30c0d6c9 100644
--- a/resources/lang/km-KH/admin/reports/message.php
+++ b/resources/lang/km-KH/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' => 'អំពីគំរូដែលបានរក្សាទុក',
+    'saving_templates_description' => 'ជ្រើសរើសជម្រើសរបស់អ្នក បន្ទាប់មកបញ្ចូលឈ្មោះគំរូរបស់អ្នកក្នុងប្រអប់ខាងលើ ហើយចុចប៊ូតុង \'រក្សាទុកគំរូ\'។ ប្រើបញ្ជីទម្លាក់ចុះដើម្បីជ្រើសរើសគំរូដែលបានរក្សាទុកពីមុន។',
     'create'  => [
-        'success' => 'Template saved successfully',
+        'success' => 'គំរូត្រូវបានរក្សាទុកដោយជោគជ័យ',
     ],
     'update' => [
-        'success' => 'Template updated successfully',
+        'success' => 'បានធ្វើបច្ចុប្បន្នភាពគំរូដោយជោគជ័យ',
     ],
     'delete' => [
-        'success' => 'Template deleted',
-        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+        'success' => 'គំរូត្រូវបានលុប',
+        'no_delete_permission' => 'មិនមានគំរូឬអ្នកមិនមានសិទ្ធិលុបវាទេ។',
     ],
 ];
diff --git a/resources/lang/km-KH/admin/settings/general.php b/resources/lang/km-KH/admin/settings/general.php
index e52366fac2b2..68d52ba84852 100644
--- a/resources/lang/km-KH/admin/settings/general.php
+++ b/resources/lang/km-KH/admin/settings/general.php
@@ -55,7 +55,7 @@
     'display_asset_name'        => 'បង្ហាញ​ឈ្មោះ​ទ្រព្យសកម្ម',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'បង្ហាញ EOL នៅក្នុងទិដ្ឋភាពតារាង',
-    'display_qr'                => 'Display 2D barcode',
+    'display_qr'                => 'បង្ហាញបាកូដ 2D',
     'display_alt_barcode'		=> 'បង្ហាញបាកូដ 1D',
     'email_logo'                => 'រូបសញ្ញាអ៊ីមែល',
     'barcode_type'				=> 'ប្រភេទ 2D Barcode',
@@ -70,7 +70,6 @@
     'footer_text'               => 'អត្ថបទបាតកថាបន្ថែម ',
     'footer_text_help'          => 'អត្ថបទនេះនឹងបង្ហាញនៅក្នុងបាតកថាខាងស្តាំ។ តំណភ្ជាប់ត្រូវបានអនុញ្ញាតដោយប្រើ <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>។ ការបំបែកបន្ទាត់ បឋមកថា រូបភាព ជាដើម អាចបណ្តាលឱ្យមានលទ្ធផលដែលមិនអាចទាយទុកជាមុនបាន។',
     'general_settings'			=> 'ការកំណត់ទូទៅ',
-    'general_settings_keywords' => 'ការគាំទ្ររបស់ក្រុមហ៊ុន ហត្ថលេខា ការទទួលយក ទម្រង់អ៊ីមែល ទម្រង់ឈ្មោះអ្នកប្រើប្រាស់ រូបភាពក្នុងមួយទំព័រ រូបភាពតូច eula gravatar tos ផ្ទាំងគ្រប់គ្រង ភាពឯកជន',
     'general_settings_help'     => 'EULA លំនាំដើម និងច្រើនទៀត',
     'generate_backup'			=> 'បង្កើតការបម្រុងទុក',
     'google_workspaces'         => 'Google Workspaces',
@@ -97,64 +96,63 @@
     '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_server_cert'			=> 'LDAP SSL certificate validation',
+    '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_uname'                => 'LDAP Bind Username',
-    'ldap_dept'                 => 'LDAP Department',
-    'ldap_phone'                => 'LDAP Telephone Number',
-    'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
-    'ldap_pword'                => 'LDAP Bind Password',
-    'ldap_basedn'               => 'Base Bind DN',
-    'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_uname'                => 'LDAP ចងឈ្មោះអ្នកប្រើប្រាស់',
+    'ldap_dept'                 => 'នាយកដ្ឋាន LDAP',
+    'ldap_phone'                => 'លេខទូរស័ព្ទ LDAP',
+    'ldap_jobtitle'             => 'ចំណងជើងការងារ LDAP',
+    'ldap_country'              => 'ប្រទេស LDAP',
+    '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_lname_field'          => 'នាមត្រកូល',
-    'ldap_fname_field'          => 'LDAP First Name',
-    'ldap_auth_filter_query'    => 'LDAP Authentication query',
-    'ldap_version'              => 'LDAP Version',
-    'ldap_active_flag'          => 'LDAP Active Flag',
+    '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_emp_num'              => 'LDAP Employee Number',
-    'ldap_email'                => 'LDAP Email',
-    'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_emp_num'              => 'លេខបុគ្គលិក LDAP',
+    'ldap_email'                => 'LDAP អ៊ីមែល',
+    'ldap_test'                 => 'សាកល្បង LDAP',
+    'ldap_test_sync'            => 'សាកល្បងការធ្វើសមកាលកម្ម LDAP',
     'license'                   => 'អាជ្ញាប័ណ្ណកម្មវិធី',
-    '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'               => 'ផ្ទុក Avatar ពីចម្ងាយ',
+    'load_remote_help_text'		=> 'ដោះធីកប្រអប់នេះ ប្រសិនបើការដំឡើងរបស់អ្នកមិនអាចផ្ទុកស្គ្រីបពីអ៊ីនធឺណិតខាងក្រៅបានទេ។ វានឹងរារាំង Snipe-IT ពីការព្យាយាមផ្ទុករូបតំណាងពី Gravatar ឬប្រភពខាងក្រៅផ្សេងទៀត។',
     'login'                     => 'ការប៉ុនប៉ងចូល',
     'login_attempt'             => 'ការប៉ុនប៉ងចូល',
     'login_ip'                  => 'អាសយដ្ឋាន IP',
     'login_success'             => 'ជោគជ័យ?',
-    'login_user_agent'          => 'User Agent',
+    'login_user_agent'          => 'ភ្នាក់ងារអ្នកប្រើប្រាស់',
     'login_help'                => 'បញ្ជីនៃការព្យាយាមចូល',
     'login_note'                => 'កំណត់ចំណាំចូល',
-    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
+    'login_note_help'           => 'ជាជម្រើស រួមបញ្ចូលប្រយោគមួយចំនួននៅលើអេក្រង់ចូលរបស់អ្នក ឧទាហរណ៍ ដើម្បីជួយមនុស្សដែលបានរកឃើញឧបករណ៍ដែលបាត់ ឬត្រូវបានគេលួច។ វាលនេះទទួលយក <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'ជម្រើសចូលប្រើពីចម្ងាយ',
     'login_remote_user_enabled_text' => 'បើកការចូលដោយប្រើបឋមកថាអ្នកប្រើពីចម្ងាយ',
-    'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
-    'login_common_disabled_text' => 'Disable other authentication mechanisms',
-    'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
+    '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_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    '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_help' => 'Use the specified header instead of REMOTE_USER',
-    'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
-    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
-    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'login_remote_user_header_name_help' => 'ប្រើបឋមកថាដែលបានបញ្ជាក់ជំនួសឱ្យ REMOTE_USER',
+    'logo'                    	=> 'និមិត្តសញ្ញា',
+    'logo_print_assets'         => 'ប្រើក្នុងការបោះពុម្ព',
+    'logo_print_assets_help'    => 'ប្រើម៉ាកយីហោនៅលើបញ្ជីទ្រព្យសម្បត្តិដែលអាចបោះពុម្ពបាន ',
+    'full_multiple_companies_support_help_text' => 'ការដាក់កម្រិតអ្នកប្រើប្រាស់ (រាប់បញ្ចូលទាំងអ្នកគ្រប់គ្រង) ដែលត្រូវបានចាត់តាំងឱ្យក្រុមហ៊ុនចំពោះទ្រព្យសម្បត្តិរបស់ក្រុមហ៊ុនពួកគេ។',
+    'full_multiple_companies_support_text' => 'ការគាំទ្រក្រុមហ៊ុនច្រើនយ៉ាងពេញលេញ',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'លទ្ធផលក្នុងមួយទំព័រ',
     'php'                       => 'កំណែ PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'ព័ត៌មាន PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'អ្នកត្រូវតែដំឡើង php-gd ដើម្បីបង្ហាញកូដ QR សូមមើលការណែនាំដំឡើង។',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -211,58 +209,57 @@
     'webhook'                   => ':app',
     'webhook_presave'           => 'Test to Save',
     'webhook_title'               => 'Update Webhook Settings',
-    'webhook_help'                => 'Integration settings',
-    'webhook_botname'             => ':app Botname',
-    'webhook_channel'             => ':app Channel',
-    'webhook_endpoint'            => ':app Endpoint',
-    'webhook_integration'         => ':app Settings',
-    'webhook_test'                 =>'Test :app integration',
-    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
-    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
-    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
-    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'webhook_help'                => 'ការកំណត់ការរួមបញ្ចូល',
+    'webhook_botname'             => '៖ ឈ្មោះកម្មវិធី',
+    'webhook_channel'             => ': ឆានែលកម្មវិធី',
+    'webhook_endpoint'            => '៖ ចំណុចបញ្ចប់កម្មវិធី',
+    'webhook_integration'         => '៖ ការកំណត់កម្មវិធី',
+    'webhook_test'                 =>'សាកល្បង៖ ការរួមបញ្ចូលកម្មវិធី',
+    'webhook_integration_help'    => '៖ ការរួមបញ្ចូលកម្មវិធីគឺស្រេចចិត្ត ទោះជាយ៉ាងណាក៏ដោយ ចំណុចបញ្ចប់ និងឆានែលត្រូវបានទាមទារប្រសិនបើអ្នកចង់ប្រើវា។ ដើម្បីកំណត់រចនាសម្ព័ន្ធ៖ ការរួមបញ្ចូលកម្មវិធី ដំបូងអ្នកត្រូវតែ <a href=":webhook_link" target="_new" rel="noopener">បង្កើត webhook ចូល</a> នៅលើគណនី :app របស់អ្នក។ ចុចលើប៊ូតុង <strong>Test :app Integration</strong> ដើម្បីបញ្ជាក់ថាការកំណត់របស់អ្នកត្រឹមត្រូវមុនពេលរក្សាទុក។ ',
+    'webhook_integration_help_button'    => 'នៅពេលដែលអ្នកបានរក្សាទុកព័ត៌មាន៖ កម្មវិធីរបស់អ្នក ប៊ូតុងសាកល្បងនឹងលេចឡើង។',
+    'webhook_test_help'           => 'សាកល្បងថាតើការរួមបញ្ចូលៈកម្មវិធីរបស់អ្នកត្រូវបានកំណត់រចនាសម្ព័ន្ធត្រឹមត្រូវ។ អ្នកត្រូវតែរក្សាទុកការអាប់ដេតរបស់អ្នក៖ ការកំណត់កម្មវិធីជាមុនសិន។',
+    'shortcuts_enabled'         => 'បើកផ្លូវកាត់',
     'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
-    'support_footer'            => 'Support Footer Links ',
-    'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
-    'version_footer'            => 'Version in Footer ',
-    'version_footer_help'       => 'Specify who sees the Snipe-IT version and build number.',
-    'system'                    => 'System Information',
-    'update'                    => 'Update Settings',
-    'value'                     => 'Value',
-    'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
-    'web_brand'                 => 'Web Branding Type',
-    'about_settings_title'      => 'About Settings',
+    'support_footer'            => 'គាំទ្រតំណភ្ជាប់បាតកថា ',
+    'support_footer_help'       => 'បញ្ជាក់អ្នកដែលឃើញតំណភ្ជាប់ទៅកាន់ព័ត៌មានជំនួយ Snipe-IT និងសៀវភៅណែនាំអ្នកប្រើប្រាស់',
+    'version_footer'            => 'កំណែនៅក្នុងបាតកថា ',
+    'version_footer_help'       => 'បញ្ជាក់អ្នកដែលឃើញកំណែ Snipe-IT និងលេខសាងសង់។',
+    'system'                    => 'ព័ត៌មានប្រព័ន្ធ',
+    'update'                    => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់',
+    'value'                     => 'តម្លៃ',
+    'brand'                     => 'ម៉ាកយីហោ',
+    'brand_help'                => 'និមិត្តសញ្ញា, ឈ្មោះគេហទំព័រ',
+    'web_brand'                 => 'ប្រភេទយីហោគេហទំព័រ',
+    'about_settings_title'      => 'អំពីការកំណត់',
     'about_settings_text'       => 'ការកំណត់ទាំងនេះអនុញ្ញាតឱ្យអ្នកប្ដូរទិដ្ឋភាពជាក់លាក់នៃការដំឡើងរបស់អ្នក។',
-    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'          => 'Label dimensions (inches)',
-    'next_auto_tag_base'        => 'Next auto-increment',
-    'page_padding'              => 'Page margins (inches)',
-    'privacy_policy_link'       => 'Link to Privacy Policy',
-    'privacy_policy'            => 'Privacy Policy',
-    'privacy_policy_link_help'  => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ',
+    'labels_per_page'           => 'ស្លាកក្នុងមួយទំព័រ',
+    'label_dimensions'          => 'ទំហំស្លាក (អ៊ីញ)',
+    'next_auto_tag_base'        => 'ការបង្កើនដោយស្វ័យប្រវត្តិបន្ទាប់',
+    'page_padding'              => 'រឹម​ទំព័រ (អ៊ីញ)',
+    'privacy_policy_link'       => 'ភ្ជាប់ទៅគោលការណ៍ឯកជនភាព',
+    'privacy_policy'            => 'គោលការណ៍ឯកជនភាព',
+    'privacy_policy_link_help'  => 'ប្រសិនបើ url ត្រូវបានរួមបញ្ចូលនៅទីនេះ តំណភ្ជាប់ទៅកាន់គោលការណ៍ឯកជនភាពរបស់អ្នកនឹងត្រូវបានរួមបញ្ចូលនៅក្នុងបាតកថាកម្មវិធី និងនៅក្នុងអ៊ីមែលដែលប្រព័ន្ធផ្ញើចេញ ដោយអនុលោមតាម GDPR ។ ',
     'purge'                     => 'Purge Deleted Records',
     'purge_deleted'             => 'Purge Deleted ',
     'labels_display_bgutter'    => 'Label bottom gutter',
     'labels_display_sgutter'    => 'Label side gutter',
-    'labels_fontsize'           => 'Label font size',
-    'labels_pagewidth'          => 'Label sheet width',
-    'labels_pageheight'         => 'Label sheet height',
-    'label_gutters'        => 'Label spacing (inches)',
-    'page_dimensions'        => 'Page dimensions (inches)',
-    'label_fields'          => 'Label visible fields',
-    'inches'        => 'inches',
+    'labels_fontsize'           => 'ស្លាកទំហំពុម្ពអក្សរ',
+    'labels_pagewidth'          => 'ទទឹងសន្លឹកស្លាក',
+    'labels_pageheight'         => 'កម្ពស់សន្លឹកស្លាក',
+    'label_gutters'        => 'គម្លាតស្លាក (អ៊ីញ)',
+    'page_dimensions'        => 'ទំហំទំព័រ (អ៊ីញ)',
+    'label_fields'          => 'ដាក់ស្លាកវាលដែលមើលឃើញ',
+    'inches'        => 'អុិនឈ៍',
     'width_w'        => 'w',
     'height_h'        => 'h',
-    'show_url_in_emails'                => 'Link to Snipe-IT in Emails',
-    'show_url_in_emails_help_text'      => 'Uncheck this box if you do not wish to link back to your Snipe-IT installation in your email footers. Useful if most of your users never login. ',
+    'show_url_in_emails'                => 'ភ្ជាប់ទៅ Snipe-IT នៅក្នុងអ៊ីមែល',
+    'show_url_in_emails_help_text'      => 'ដោះធីកប្រអប់នេះ ប្រសិនបើអ្នកមិនចង់ភ្ជាប់ទៅការដំឡើង Snipe-IT របស់អ្នកនៅក្នុងបាតកថាអ៊ីមែលរបស់អ្នក។ មានប្រយោជន៍ប្រសិនបើអ្នកប្រើភាគច្រើនរបស់អ្នកមិនដែលចូល។ ',
     'text_pt'        => 'pt',
-    'thumbnail_max_h'   => 'Max thumbnail height',
-    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
-    'two_factor'        => 'Two Factor Authentication',
-    'two_factor_secret'        => 'Two-Factor Code',
+    'thumbnail_max_h'   => 'កម្ពស់រូបភាពតូចអតិបរមា',
+    'thumbnail_max_h_help'   => 'កម្ពស់អតិបរមាជាភីកសែលដែលរូបភាពតូចអាចបង្ហាញក្នុងទិដ្ឋភាពបញ្ជី។ អប្បបរមា 25, អតិបរមា 500 ។',
+    'two_factor'        => 'ការផ្ទៀងផ្ទាត់កត្តាពីរ',
+    'two_factor_secret'        => 'កូដកត្តាពីរ',
     'two_factor_enrollment'        => 'Two-Factor Enrollment',
     'two_factor_enabled_text'        => 'Enable Two Factor',
     'two_factor_reset'        => 'Reset Two-Factor Secret',
@@ -308,85 +305,96 @@
     'asset_tag_title' => 'Update Asset Tag Settings',
     'barcode_title' => 'Update Barcode Settings',
     'barcodes' => 'Barcodes',
-    'barcodes_help_overview' => 'Barcode &amp; QR settings',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
-    'barcodes_spinner' => 'Attempting to delete files...',
+    'barcodes_help_overview' => 'បាកូដ &amp; ការកំណត់ QR',
+    'barcodes_help' => 'វា​នឹង​ព្យាយាម​លុប​បាកូដ​ដែល​បាន​ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់។ ជាធម្មតា វានឹងត្រូវបានប្រើតែប្រសិនបើការកំណត់បាកូដរបស់អ្នកបានផ្លាស់ប្តូរ ឬប្រសិនបើ URL Snipe-IT របស់អ្នកបានផ្លាស់ប្តូរ។ Barcodes នឹង​ត្រូវ​បាន​បង្កើត​ឡើង​វិញ​នៅ​ពេល​ចូល​ប្រើ​បន្ទាប់។',
+    'barcodes_spinner' => 'កំពុងព្យាយាមលុបឯកសារ...',
     'barcode_delete_cache' => 'Delete Barcode Cache',
-    'branding_title' => 'Update Branding Settings',
-    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
-    'localization_help' => 'Language, date display',
-    'notifications' => 'Notifications',
-    'notifications_help' => 'Email Alerts & Audit Settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
+    'branding_title' => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់ម៉ាកយីហោ',
+    'general_title' => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់ទូទៅ',
+    'mail_test' => 'ផ្ញើការធ្វើតេស្ត',
+    'mail_test_help' => 'វានឹងព្យាយាមផ្ញើសំបុត្រសាកល្បងទៅ :replyto ។',
+    'filter_by_keyword' => 'ត្រងដោយកំណត់ពាក្យគន្លឹះ',
+    'security' => 'សន្តិសុខ',
+    'security_title' => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់សុវត្ថិភាព',
+    'security_help' => 'កត្តាពីរ ការរឹតបន្តឹងពាក្យសម្ងាត់',
+    'groups_help' => 'ក្រុមអនុញ្ញាតគណនី',
+    'localization' => 'ការធ្វើមូលដ្ឋានីយកម្ម',
+    'localization_title' => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់មូលដ្ឋានីយកម្ម',
+    'localization_help' => 'ភាសា ការបង្ហាញកាលបរិច្ឆេទ',
+    'notifications' => 'ការជូនដំណឹង',
+    'notifications_help' => 'ការជូនដំណឹងតាមអ៊ីមែល និងការកំណត់សវនកម្ម',
+    'asset_tags_help' => 'ការបង្កើននិងបុព្វបទ',
     'labels' => 'ស្លាក',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_title' => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់ស្លាក',
+    'labels_help' => 'បាកូដ &amp; ការកំណត់ស្លាក',
     '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_extension_warning' => 'វាមិនមើលទៅដូចជាផ្នែកបន្ថែម LDAP ត្រូវបានដំឡើង ឬបើកនៅលើម៉ាស៊ីនមេនេះទេ។ អ្នកនៅតែអាចរក្សាទុកការកំណត់របស់អ្នកបាន ប៉ុន្តែអ្នកនឹងត្រូវបើកដំណើរការផ្នែកបន្ថែម LDAP សម្រាប់ PHP មុនពេលការធ្វើសមកាលកម្ម LDAP ឬការចូលនឹងដំណើរការ។',
     'ldap_ad' => 'LDAP/AD',
     'employee_number' => 'លេខបុគ្គលិក',
-    'create_admin_user' => 'Create a User ::',
-    'create_admin_success' => 'Success! Your admin user has been added!',
-    'create_admin_redirect' => 'Click here to go to your app login!',
-    'setup_migrations' => 'Database Migrations ::',
-    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
-    'setup_successful_migrations' => 'Your database tables have been created',
-    'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
-    'ldap_settings_link' => 'LDAP Settings Page',
-    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
-    'label2_enable'           => 'New Label Engine',
-    'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
-    'label2_template'         => 'Template',
-    'label2_template_help'    => 'Select which template to use for label generation',
+    'create_admin_user' => 'បង្កើតអ្នកប្រើប្រាស់ ::',
+    'create_admin_success' => 'ជោគជ័យ! អ្នកប្រើប្រាស់អ្នកគ្រប់គ្រងរបស់អ្នកត្រូវបានបន្ថែម!',
+    'create_admin_redirect' => 'ចុចត្រង់នេះ ដើម្បីចូលទៅកាន់កម្មវិធីរបស់អ្នក!',
+    'setup_migrations' => 'ការផ្លាស់ប្តូរមូលដ្ឋានទិន្នន័យ ::',
+    'setup_no_migrations' => 'មិនមានអ្វីត្រូវធ្វើចំណាកស្រុកទេ។ តារាងទិន្នន័យរបស់អ្នកត្រូវបានតំឡើងរួចហើយ!',
+    'setup_successful_migrations' => 'តារាងមូលដ្ឋានទិន្នន័យរបស់អ្នកត្រូវបានបង្កើត',
+    'setup_migration_output' => 'លទ្ធផល​នៃ​ការ​ធ្វើ​ចំណាក​ស្រុក៖',
+    'setup_migration_create_user' => 'បន្ទាប់៖ បង្កើតអ្នកប្រើប្រាស់',
+    'ldap_settings_link' => 'ទំព័រការកំណត់ LDAP',
+    'slack_test' => 'សាកល្បង<i class="fab fa-slack"></i> ការរួមបញ្ចូល',
+    'label2_enable'           => 'ម៉ាស៊ីនស្លាកថ្មី។',
+    'label2_enable_help'      => 'ប្តូរទៅម៉ាស៊ីនស្លាកថ្មី។ <b>ចំណាំ៖ អ្នកនឹងត្រូវរក្សាទុកការកំណត់នេះមុនពេលកំណត់ផ្សេងទៀត។</b>',
+    'label2_template'         => 'គំរូ',
+    'label2_template_help'    => 'ជ្រើសរើសគំរូដែលត្រូវប្រើសម្រាប់ការបង្កើតស្លាក',
     'label2_title'            => 'ចំណងជើង',
-    'label2_title_help'       => 'The title to show on labels that support it',
-    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
-    'label2_asset_logo'       => 'Use Asset Logo',
-    'label2_asset_logo_help'  => 'Use the logo of the asset&apos;s assigned company, rather than the value at <code>:setting_name</code>',
-    'label2_1d_type'          => '1D Barcode Type',
-    'label2_1d_type_help'     => 'Format for 1D barcodes',
+    'label2_title_help'       => 'ចំណងជើងដែលត្រូវបង្ហាញនៅលើស្លាកដែលគាំទ្រវា។',
+    'label2_title_help_phold' => 'កន្លែងដាក់ <code>{COMPANY}</code> នឹងត្រូវបានជំនួសដោយឈ្មោះក្រុមហ៊ុនរបស់ទ្រព្យសកម្ម',
+    'label2_asset_logo'       => 'ប្រើនិមិត្តសញ្ញាទ្រព្យសកម្ម',
+    'label2_asset_logo_help'  => 'ប្រើនិមិត្តសញ្ញារបស់ក្រុមហ៊ុនដែលបានចាត់តាំងជាទ្រព្យសកម្ម &apos;s ជាជាងតម្លៃនៅ <code>:setting_name</code>',
+    'label2_1d_type'          => 'ប្រភេទ 1D បាកូដ',
+    'label2_1d_type_help'     => 'ទម្រង់សម្រាប់លេខកូដ 1D',
     'label2_2d_type'          => 'ប្រភេទ 2D Barcode',
-    'label2_2d_type_help'     => 'Format for 2D barcodes',
-    'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_type_help'     => 'ទម្រង់សម្រាប់លេខកូដ 2D',
+    'label2_2d_target'        => 'គោលដៅ 2D Barcode',
+    'label2_2d_target_help'   => 'ទិន្នន័យ​ដែល​នឹង​ត្រូវ​បាន​ផ្ទុក​ក្នុង​បាកូដ 2D',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
-    'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
-    'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
-    'default'               => 'Default',
-    'none'                  => 'None',
-    'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
-    'google_login'      => 'Google Workspace Login Settings',
-    'enable_google_login'  => 'Enable users to login with Google Workspace',
-    'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
-    'mail_reply_to' => 'Mail Reply-To Address',
-    'mail_from' => 'Mail From Address',
+    'help_asterisk_bold'    => 'អត្ថបទដែលបានបញ្ចូលជា <code>**text**</code> នឹងត្រូវបានបង្ហាញជាដិត',
+    'help_blank_to_use'     => 'ទុកទទេដើម្បីប្រើតម្លៃពី <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> នឹងប្រើតម្លៃពី <code>:setting_name</code>។ <br>ចំណាំថាតម្លៃនៃ barcodes ត្រូវតែគោរពតាម barcode spec រៀងៗខ្លួន ដើម្បីអាចបង្កើតបានដោយជោគជ័យ។ សូមមើល <a href="https://snipe-it.readme.io/docs/barcodes">ឯកសារ <i class="fa fa-external-link"></i></a> សម្រាប់ព័ត៌មានលម្អិតបន្ថែម. ',
+    'asset_id'              => 'លេខសម្គាល់ទ្រព្យសកម្ម',
+    'data'               => 'ទិន្នន័យ',
+    'default'               => 'លំនាំដើម',
+    'none'                  => 'គ្មាន',
+    'google_callback_help' => 'វាគួរតែត្រូវបានបញ្ចូលជា URL ហៅត្រឡប់មកវិញនៅក្នុងការកំណត់កម្មវិធី Google OAuth របស់អ្នកនៅក្នុងស្ថាប័ន &apos;s របស់អ្នក <strong><a href="https://console.cloud.google.com/" target="_blank">កុងសូលអ្នកអភិវឌ្ឍន៍ Google < i class="fa fa-external-link" aria-hidden="true"></i></a></strong>។',
+    'google_login'      => 'ការកំណត់ការចូល Google Workspace',
+    'enable_google_login'  => 'បើកឱ្យអ្នកប្រើប្រាស់ចូលជាមួយ Google Workspace',
+    'enable_google_login_help'  => 'អ្នកប្រើប្រាស់នឹងមិនត្រូវបានផ្តល់ដោយស្វ័យប្រវត្តិទេ។ ពួកគេត្រូវតែមានគណនីដែលមានស្រាប់នៅទីនេះ និងនៅក្នុង Google Workspace ហើយឈ្មោះអ្នកប្រើប្រាស់របស់ពួកគេនៅទីនេះត្រូវតែផ្គូផ្គងអាសយដ្ឋានអ៊ីមែល Google Workspace របស់ពួកគេ។ ',
+    'mail_reply_to' => 'អ៊ីមែលឆ្លើយតបទៅអាសយដ្ឋាន',
+    'mail_from' => 'សំបុត្រពីអាសយដ្ឋាន',
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
-    'timezone' => 'Timezone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'timezone' => 'តំបន់ពេលវេលា',
+    'profile_edit'          => 'កែសម្រួលប្រវត្តិរូប',
+    'profile_edit_help'          => 'អនុញ្ញាតឱ្យអ្នកប្រើកែសម្រួលទម្រង់ផ្ទាល់ខ្លួនរបស់ពួកគេ។',
     '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>',
+    'default_avatar_help' => 'រូបភាពនេះនឹងត្រូវបានបង្ហាញជាទម្រង់ ប្រសិនបើអ្នកប្រើមិនមានរូបថតកម្រងព័ត៌មាន។',
+    'restore_default_avatar' => 'ស្ដារ <a href=":default_avatar" data-toggle="lightbox" data-type="image">រូបតំណាងលំនាំដើមនៃប្រព័ន្ធដើម</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.',
+    'no_groups' => 'មិន​ទាន់​មាន​ក្រុម​ត្រូវ​បាន​បង្កើត​នៅ​ឡើយ​ទេ។ ចូលទៅកាន់ <code>Admin Settings> Permission Groups</code> ដើម្បីបន្ថែមមួយ។',
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'បាតកថា, និមិត្តសញ្ញា, បោះពុម្,ព ស្បែក, ស្បែក, បឋមកថា, ពណ៌, ពណ៌, css',
+        'general_settings'  => 'ការគាំទ្ររបស់ក្រុមហ៊ុន ហត្ថលេខា ការទទួលយក ទម្រង់អ៊ីមែល ទម្រង់ឈ្មោះអ្នកប្រើប្រាស់ រូបភាពក្នុងមួយទំព័រ រូបភាពតូច eula gravatar tos ផ្ទាំងគ្រប់គ្រង ភាពឯកជន',
+        'groups'            => 'ការអនុញ្ញាត ក្រុមការអនុញ្ញាត ការអនុញ្ញាត',
+        'labels'            => 'ស្លាក, បាកូដ, បាកូដ, សន្លឹក, បោះពុម្ព, upc, qr, 1d, 2d',
+        'localization'      => 'ការធ្វើមូលដ្ឋានីយកម្ម, រូបិយប័ណ្ណ, មូលដ្ឋាន, មូលដ្ឋាន, តំបន់ពេលវេលា, តំបន់ពេលវេលា, អន្តរជាតិ, អន្តរជាតិ, ភាសា, ភាសា, ការបកប្រែ',
+        'php_overview'      => 'phpinfo, ប្រព័ន្ធ, info',
+        'purge'             => 'លុបជាអចិន្ត្រៃយ៍',
+        'security'          => 'ពាក្យសម្ងាត់, ពាក្យសម្ងាត់, តម្រូវការ, កត្តាពីរ, កត្តាពីរ, ពាក្យសម្ងាត់ទូទៅ, ការចូលពីចម្ងាយ, ការចាកចេញ, ការផ្ទៀងផ្ទាត់',
+    ],
 
 ];
diff --git a/resources/lang/km-KH/admin/settings/message.php b/resources/lang/km-KH/admin/settings/message.php
index adcc21a977b1..99b0dfdc714c 100644
--- a/resources/lang/km-KH/admin/settings/message.php
+++ b/resources/lang/km-KH/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'មាន​អ្វីមួយ​មិន​ប្រក្រតី។ :app បានឆ្លើយតបជាមួយ៖ :error_message',
         'error_redirect' => 'កំហុស៖ 301/302៖ ចំណុចបញ្ចប់ត្រឡប់ការបញ្ជូនបន្ត។ សម្រាប់ហេតុផលសុវត្ថិភាព យើងមិនធ្វើតាមការបញ្ជូនបន្តទេ។ សូមប្រើចំណុចបញ្ចប់ពិតប្រាកដ។',
         'error_misc' => 'មាន​អ្វីមួយ​មិន​ប្រក្រតី។ :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];
diff --git a/resources/lang/km-KH/button.php b/resources/lang/km-KH/button.php
index 3c37f2c4fa41..42ac6d8cf4c2 100644
--- a/resources/lang/km-KH/button.php
+++ b/resources/lang/km-KH/button.php
@@ -23,11 +23,11 @@
     'append'                    => 'បន្ថែម',
     'new'                       => 'ថ្មី',
     'var' => [
-        'clone'     => 'Clone :item_type',
-        'edit'      => 'Edit :item_type',
-        'delete'    => 'Delete :item_type',
-        'restore'   => 'Restore :item_type',
-        'create'    => 'Create New :item_type',
+        'clone'     => 'ក្លូន៖ item_type',
+        'edit'      => 'កែសម្រួល៖ item_type',
+        'delete'    => 'លុប៖ item_type',
+        'restore'   => 'ស្ដារ៖ item_type',
+        'create'    => 'បង្កើតថ្មី៖ item_type',
         'checkout'  => 'Checkout :item_type',
         'checkin'   => 'Checkin :item_type',
     ]
diff --git a/resources/lang/km-KH/general.php b/resources/lang/km-KH/general.php
index e2da985b4478..e261772ba09a 100644
--- a/resources/lang/km-KH/general.php
+++ b/resources/lang/km-KH/general.php
@@ -64,7 +64,7 @@
     'checkout'  			=> 'ប្រគល់អោយ',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
-    'checkin_and_delete'  	=> 'Checkin and Delete',
+    'checkin_and_delete'  	=> 'សង់មកវិញ និងលុប',
     'user_requests_count'   => 'សំណើ',
     'city'  				=> 'ទីក្រុង',
     'click_here'			=> 'ចុច​ទីនេះ',
@@ -216,6 +216,12 @@
     'no_results'			=> 'គ្មានលទ្ធផល។',
     'no'  					=> 'No',
     'notes'  				=> 'កំណត់ចំណាំ',
+    'note_added'            => 'ចំណាំបានបន្ថែម',
+    'add_note'              => 'បន្ថែមចំណាំ',
+    'note_edited'            => 'ចំណាំបានកែសម្រួល',
+    'edit_note'              => 'កែសម្រួលចំណាំ',
+    'note_deleted'            => 'បានលុបចំណាំ',
+    'delete_note'              => 'លុបចំណាំ',
     'order_number'          => 'លេខបញ្ជាទិញ',
     'only_deleted'          => 'មានតែទ្រព្យសម្បត្តិដែលបានលុបប៉ុណ្ណោះ។',
     'page_menu'				=> 'បង្ហាញ _MENU_ ធាតុ',
@@ -232,7 +238,7 @@
     'quantity'		        => 'បរិមាណ',
     'quantity_minimum'      => 'អ្នកមានធាតុមួយខាងក្រោម ឬស្ទើរតែទាបជាងកម្រិតបរិមាណអប្បបរមា|អ្នកមាន៖ រាប់ធាតុខាងក្រោម ឬស្ទើរតែទាបជាងកម្រិតបរិមាណអប្បបរមា',
     'quickscan_checkin'  	=> 'ពិនិត្យស្កេនរហ័ស',
-    'quickscan_checkin_status'  	=> 'Checkin Status',
+    'quickscan_checkin_status'  	=> 'ស្ថានភាព សងមកវិញ',
     'ready_to_deploy'		=> 'រួចរាល់អាចប្រើប្រាស់',
     'recent_activity'		=> 'សកម្មភាពថ្មីៗ',
     'remaining'             => 'នៅសល់',
@@ -250,11 +256,11 @@
     'request_item'          => 'ស្នើសុំធាតុនេះ។',
     'external_link_tooltip' => 'តំណភ្ជាប់ទៅខាងក្រៅ',
     'save'  				=> 'រក្សា​ទុក',
-    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
+    'select_var'            => 'ជ្រើសរើស៖ thing... ', // this will eventually replace all of our other selects
     'select'				=> 'ជ្រើសរើស',
     'select_all'            => 'ជ្រើសរើសទាំងអស់។',
     'search'				=> 'ស្វែងរក',
-    'select_category'       => 'Select a Category',
+    'select_category'       => 'ជ្រើសរើសប្រភេទមួយ',
     'select_datasource' => 'ជ្រើសរើសប្រភពទិន្នន័យ',
     'select_department'     => 'ជ្រើសរើសនាយកដ្ឋានមួយ។',
     'select_depreciation'	=> 'ជ្រើសរើសប្រភេទរំលោះ',
@@ -302,14 +308,14 @@
     'username_format'		=> 'Username Format',
     'username'              => 'ឈ្មោះ​អ្នកប្រើប្រាស់',
     'update'                => 'ធ្វើបច្ចុប្បន្នភាព',
-    'updating_item' => 'Updating :item',
+    'updating_item' => 'ការធ្វើបច្ចុប្បន្នភាព៖ ធាតុ',
     'upload_filetypes_help'      => 'ប្រភេទឯកសារដែលបានអនុញ្ញាតគឺ png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf និង rar ។ ទំហំផ្ទុកឡើងអតិបរមាដែលអនុញ្ញាតគឺ៖ ទំហំ។',
     'uploaded'              => 'បានបង្ហោះ',
     'user'					=> 'អ្នក​ប្រើ',
     'accepted'			    => 'យល់ព្រម',
     'declined'			    => 'បានបដិសេធ',
     'declined_note'         => 'កំណត់ចំណាំដែលបដិសេធ',
-    'unassigned'            => 'Unassigned',
+    'unassigned'            => 'មិនបានចាត់តាំង',
     'unaccepted_asset_report' => 'ទ្រព្យសម្បត្តិដែលមិនទាន់យល់ព្រម។',
     'users'                 => 'អ្នកប្រើប្រាស់ច្រើន',
     'viewall'				=> 'មើលទាំងអស់',
@@ -328,9 +334,9 @@
     'login_enabled'         => 'បានបើកការចូល',
     'audit_due'             => 'ដល់កំណត់សម្រាប់សវនកម្ម',
     'audit_due_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'           => 'ដល់ពេលសងមកវិញ',
+    'checkin_overdue'       => 'ហួសកាលកំណត់សម្រាប់ការសងមកវិញ',
+    'checkin_due_days'      => 'ទ្រព្យសកម្មដែលត្រូវសងមកវិញក្នុងរយៈពេល : ថ្ងៃ ថ្ងៃ| ទ្រព្យសកម្មដែលត្រូវសងមកវិញក្នុង : ថ្ងៃ ថ្ងៃ',
     'audit_overdue'         => 'ហួសកាលកំណត់សម្រាប់សវនកម្ម',
     'accept'                => 'ទទួលយក៖ ទ្រព្យសម្បត្តិ',
     'i_accept'              => 'ខ្ញុំទទួលយក',
@@ -355,19 +361,19 @@
     'setup_create_admin'    => 'បង្កើតអ្នកប្រើប្រាស់អ្នកគ្រប់គ្រង',
     'setup_done'            => 'ចប់ហើយ!',
     'bulk_edit_about_to'    => 'អ្នករៀបនឹងកែសម្រួលដូចខាងក្រោម៖ ',
-    'checked_out'           => 'Checked Out',
-    'checked_out_to'        => 'Checked out to',
+    'checked_out'           => 'បានប្រគល់',
+    'checked_out_to'        => 'បានប្រគល់ទៅ',
     'fields'                => 'Fields',
-    'last_checkout'         => 'Last Checkout',
-    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
-    'expected_checkin'      => 'Expected Checkin',
-    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
+    'last_checkout'         => 'ប្រគល់ ចុងក្រោយ',
+    'due_to_checkin'        => 'ខាង​ក្រោម៖ រាប់​ធាតុ​នឹង​ត្រូវសងមកវិញក្នុង​ពេល​ឆាប់ៗ​នេះ៖',
+    'expected_checkin'      => 'ការសងមកវិញ ដែលរំពឹងទុក',
+    'reminder_checked_out_items' => 'នេះ​ជា​ការ​រំលឹក​អំពី​ធាតុ​ដែល​បាន​ប្រគល់​ទៅ​អ្នក​នា​ពេល​បច្ចុប្បន្ន។ ប្រសិនបើអ្នកមានអារម្មណ៍ថាបញ្ជីនេះមិនត្រឹមត្រូវ (មានអ្វីមួយបាត់ ឬមានអ្វីមួយលេចឡើងនៅទីនេះដែលអ្នកជឿថាអ្នកមិនបានទទួល) សូមផ្ញើអ៊ីមែល៖ reply_to_name នៅ :reply_to_address។',
     'changed'               => 'បានផ្លាស់ប្តូរ',
     'to'                    => 'ទៅ',
     'report_fields_info'    => '<p>ជ្រើសរើសវាលដែលអ្នកចង់បញ្ចូលក្នុងរបាយការណ៍ផ្ទាល់ខ្លួនរបស់អ្នក ហើយចុចបង្កើត។  ឯកសារ (custom-asset-report-YYYY-mm-dd.csv) នឹងទាញយកដោយស្វ័យប្រវត្តិ ហើយអ្នកអាចបើកវានៅក្នុង Excel។</p>
              <p>ប្រសិនបើអ្នកចង់នាំចេញតែទ្រព្យសកម្មមួយចំនួន សូមប្រើជម្រើសខាងក្រោមដើម្បីកែសម្រួលលទ្ធផលរបស់អ្នក។</p>',
-    'range'                 => 'Range',
-    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
+    'range'                 => 'ជួរ',
+    'bom_remark'            => 'បន្ថែម BOM (សញ្ញាបញ្ជាទិញបៃ) ទៅ CSV នេះ។',
     'improvements'          => 'ការកែលម្អ',
     'information'           => 'ព័ត៌មាន',
     'permissions'           => 'ការអនុញ្ញាត',
@@ -378,8 +384,8 @@
     'synchronize'           => 'ធ្វើសមកាលកម្ម',
     'sync_results'          => 'លទ្ធផលសមកាលកម្ម',
     'license_serial'        => 'សៀរៀល/សោផលិតផល',
-    'invalid_category'      => 'Invalid or missing category',
-    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
+    'invalid_category'      => 'ប្រភេទមិនត្រឹមត្រូវ ឬបាត់',
+    'invalid_item_category_single' => 'មិនត្រឹមត្រូវ ឬបាត់៖ ប្រភេទប្រភេទ។ សូមអាប់ដេតប្រភេទនេះ៖ វាយបញ្ចូលប្រភេទដែលមានសុពលភាពមុនពេល checking out។',
     'dashboard_info'        => 'នេះគឺជាផ្ទាំងគ្រប់គ្រងរបស់អ្នក។ មានអ្នកចូលចិត្តច្រើន ប៉ុន្តែមួយនេះជារបស់អ្នក',
     '60_percent_warning'    => 'សម្រេចបាន 60% (ព្រមាន)',
     'dashboard_empty'       => 'វាហាក់ដូចជាអ្នកមិនទាន់បានបន្ថែមអ្វីនៅឡើយទេ ដូច្នេះយើងមិនមានអ្វីដែលអស្ចារ្យដើម្បីបង្ហាញនោះទេ។ ចាប់ផ្តើមដោយបន្ថែមទ្រព្យសម្បត្តិ គ្រឿងបន្លាស់ សម្ភារៈប្រើប្រាស់ ឬអាជ្ញាប័ណ្ណមួយចំនួនឥឡូវនេះ!',
@@ -390,10 +396,10 @@
     'collapse'              => 'Collapse',
     'assigned'              => 'បានចាត់តាំង',
     'asset_count'           => 'ចំនួនទ្រព្យសកម្ម',
-    'accessories_count'     => 'Accessories Count',
+    'accessories_count'     => 'ចំនួនគ្រឿងបន្ថែម',
     'consumables_count'     => 'Consumables Count',
     'components_count'      => 'Components Count',
-    'licenses_count'        => 'Licenses Count',
+    'licenses_count'        => 'ចំនួនអាជ្ញាប័ណ្ណ',
     'notification_error'    => 'កំហុស',
     'notification_error_hint' => 'សូមពិនិត្យមើលទម្រង់ខាងក្រោមសម្រាប់កំហុស',
     'notification_bulk_error_hint' => 'វាលខាងក្រោមមានកំហុសក្នុងការផ្ទៀងផ្ទាត់ ហើយមិនត្រូវបានកែសម្រួលទេ៖',
@@ -407,11 +413,11 @@
     'consumable_name'       => 'ឈ្មោះ Consumable:',
     'accessory_information' => 'ព័ត៌មានអំពីគ្រឿងបន្លាស់',
     'accessory_name'       => 'ឈ្មោះគ្រឿងបន្លាស់៖',
-    'clone_item'            => 'Clone Item',
+    '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_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' => 'អ្នកអាចជ្រើសរើសដើម្បីពិនិត្យមើលទ្រព្យសកម្មនេះនៅក្នុងទីតាំងផ្សេងក្រៅពីទីតាំងលំនាំដើមរបស់ទ្រព្យសកម្មនេះនៃ :default_location ប្រសិនបើទីតាំងមួយត្រូវបានកំណត់',
     'maintenance_mode'      => 'សេវាកម្មនេះមិនមានជាបណ្តោះអាសន្នសម្រាប់ការអាប់ដេតប្រព័ន្ធទេ។ សូមពិនិត្យមើលឡើងវិញនៅពេលក្រោយ។',
     'maintenance_mode_title' => 'ប្រព័ន្ធមិនអាចប្រើបានជាបណ្តោះអាសន្ន',
     'ldap_import'           => 'ពាក្យសម្ងាត់របស់អ្នកប្រើមិនគួរត្រូវបានគ្រប់គ្រងដោយ LDAP ទេ។ (វាអនុញ្ញាតឱ្យអ្នកផ្ញើសំណើសុំពាក្យសម្ងាត់ដែលភ្លេច។)',
@@ -425,19 +431,19 @@
     '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',
-    'assets_by_status'      => 'Assets by Status',
-    'assets_by_status_type'      => 'Assets by Status Type',
-    'pie_chart_type'        => 'Dashboard Pie Chart Type',
-    'hello_name'            => 'Hello, :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',
+    'assets_by_status'      => 'ទ្រព្យសម្បត្តិតាមស្ថានភាព',
+    'assets_by_status_type'      => 'ទ្រព្យសកម្មតាមប្រភេទស្ថានភាព',
+    'pie_chart_type'        => 'ប្រភេទគំនូសតាងចំណិតនៃផ្ទាំងគ្រប់គ្រង',
+    'hello_name'            => 'សួស្តី, :ឈ្មោះ!',
+    'unaccepted_profile_warning'   => 'អ្នកមានធាតុមួយដែលត្រូវការការទទួលយក។ ចុចទីនេះដើម្បីទទួលយក ឬបដិសេធវា | អ្នកមាន៖ រាប់ធាតុដែលទាមទារការទទួលយក។ ចុចទីនេះដើម្បីទទួលយក ឬបដិសេធពួកគេ។',
     'start_date'            => 'ថ្ងៃ​ចាប់ផ្តើម',
-    'end_date'            => 'End Date',
+    'end_date'            => 'កាលបរិច្ឆេទបញ្ចប់',
     'alt_uploaded_image_thumbnail' => 'រូបភាពតូចដែលបានបង្ហោះ',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'រកមិនឃើញឯកសារ',
     'log_record_not_found'  => 'រក​មិន​ឃើញ​កំណត់ត្រា​សម្រាប់​ការ​ចូល​កំណត់​ហេតុ​នោះ​ទេ។',
     'preview_not_available' => '(គ្មានការមើលជាមុន)',
-    'setup'                 => 'Setup',
+    'setup'                 => 'រៀបចំ',
     'pre_flight'            => 'Pre-Flight',
     'skip_to_main_content'  => 'រំលងទៅមាតិកាសំខាន់',
     'toggle_navigation'     => 'Toggle navigation',
@@ -447,50 +453,50 @@
     'false'                 => 'មិនពិត',
     'integration_option'    => 'ជម្រើសនៃការរួមបញ្ចូល',
     'log_does_not_exist'    => 'មិនមានកំណត់ត្រាដែលត្រូវគ្នាទេ។',
-    'merge_users'           => 'Merge Users',
-    'merge_information' =>  'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licenses, etc will be moved over to the selected user and the other users will be marked as deleted.',
-    'warning_merge_information' => 'This action CANNOT be undone and should ONLY be used when you need to merge users because of a bad import or sync. Be sure to run a backup first.',
-    'no_users_selected'     => 'No users selected',
-    'not_enough_users_selected'     => 'At least :count users must be selected',
-    'merge_success'         => ':count users merged successfully into :into_username!',
-    'merged'                => 'merged',
-    'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
-    'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
-    'clear_and_save'            => 'Clear & Save',
-    'update_existing_values'    => 'Update Existing Values?',
-    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
-    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
-    'send_welcome_email_to_users'   => ' Send Welcome Email for new Users?',
-    'send_email'                => 'Send Email',
-    'call'                      => 'Call number',
-    'back_before_importing'     => 'Backup before importing?',
+    'merge_users'           => 'បញ្ចូលអ្នកប្រើប្រាស់',
+    'merge_information' =>  'វានឹងបញ្ចូល៖ រាប់អ្នកប្រើប្រាស់ចូលទៅក្នុងអ្នកប្រើប្រាស់តែមួយ។ ជ្រើសរើសអ្នកប្រើប្រាស់ដែលអ្នកចង់បញ្ចូលអ្នកផ្សេងទៀតចូលទៅក្នុងខាងក្រោម ហើយទ្រព្យសម្បត្តិដែលពាក់ព័ន្ធ អាជ្ញាប័ណ្ណជាដើម នឹងត្រូវបានផ្ទេរទៅអ្នកប្រើប្រាស់ដែលបានជ្រើសរើស ហើយអ្នកប្រើប្រាស់ផ្សេងទៀតនឹងត្រូវបានសម្គាល់ថាបានលុប។',
+    'warning_merge_information' => 'សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ ហើយគួរតែត្រូវបានប្រើតែនៅពេលដែលអ្នកត្រូវបញ្ចូលអ្នកប្រើប្រាស់ចូលគ្នា ដោយសារតែមានការនាំចូល ឬការធ្វើសមកាលកម្មមិនល្អ។ ត្រូវប្រាកដថាដំណើរការការបម្រុងទុកជាមុនសិន។',
+    'no_users_selected'     => 'គ្មានអ្នកប្រើប្រាស់ត្រូវបានជ្រើសរើសទេ។',
+    'not_enough_users_selected'     => 'យ៉ាងហោចណាស់៖ រាប់អ្នកប្រើប្រាស់ត្រូវតែត្រូវបានជ្រើសរើស',
+    'merge_success'         => ': រាប់អ្នកប្រើប្រាស់បញ្ចូលគ្នាដោយជោគជ័យទៅក្នុង :into_username!',
+    'merged'                => 'បញ្ចូលគ្នា',
+    'merged_log_this_user_into' => 'បញ្ចូល​អ្នក​ប្រើ​នេះ (ID :to_id - :to_username) ទៅ​ជា​ user ID:from_id (:from_username) ',
+    'merged_log_this_user_from' => 'បញ្ចូល​លេខ​សម្គាល់​អ្នក​ប្រើ៖from_id (:from_username) ទៅ​ក្នុង​អ្នក​ប្រើ​នេះ (ID:to_id - :to_username)',
+    'clear_and_save'            => 'ជម្រះ & រក្សាទុក',
+    'update_existing_values'    => 'ធ្វើបច្ចុប្បន្នភាពតម្លៃដែលមានស្រាប់?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'ការបង្កើតស្លាកទ្រព្យសម្បត្តិដែលបង្កើនដោយស្វ័យប្រវត្តិត្រូវបានបិទ ដូច្នេះជួរទាំងអស់ត្រូវតែមានជួរឈរ "ស្លាកទ្រព្យសម្បត្តិ" លេចឡើង។',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'ចំណាំ៖ ការបង្កើតស្លាកទ្រព្យសម្បត្តិដែលបង្កើនដោយស្វ័យប្រវត្តិត្រូវបានបើក ដូច្នេះទ្រព្យសកម្មនឹងត្រូវបានបង្កើតសម្រាប់ជួរដែលមិនមាន "ស្លាក​ទ្រព្យ​សកម្ម" លេចឡើង។ ជួរ​ដេក​ដែល​មាន "ស្លាក​ទ្រព្យ​សកម្ម" ដែល​បាន​បង្ហាញ​នឹង​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ជាមួយ​នឹង​ព័ត៌មាន​ដែល​បាន​ផ្តល់។',
+    'send_welcome_email_to_users'   => ' ផ្ញើអ៊ីមែលស្វាគមន៍សម្រាប់អ្នកប្រើប្រាស់ថ្មី?',
+    'send_email'                => 'ផ្ញើអ៊ីមែល',
+    'call'                      => 'ហៅទៅលេខ',
+    'back_before_importing'     => 'បម្រុងទុកមុនពេលនាំចូល?',
     'csv_header_field'          => 'CSV Header Field',
     'import_field'              => 'Import Field',
-    'sample_value'              => 'Sample Value',
-    'no_headers'                => 'No Columns Found',
-    'error_in_import_file'      => 'There was an error reading the CSV file: :error',
-    'errors_importing'          => 'Some Errors occurred while importing: ',
-    'warning'                   => 'WARNING: :warning',
-    'success_redirecting'       => '"Success... Redirecting.',
-    'cancel_request'            => 'Cancel this item request',
-    'setup_successful_migrations' => 'Your database tables have been created',
-    'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
-    'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
-    'confirm' => 'Confirm',
-    'autoassign_licenses' => 'Auto-Assign Licenses',
+    'sample_value'              => 'តម្លៃគំរូ',
+    'no_headers'                => 'រកមិនឃើញជួរឈរទេ',
+    'error_in_import_file'      => 'មានកំហុសក្នុងការអានឯកសារ CSV: :error',
+    'errors_importing'          => 'កំហុសមួយចំនួនបានកើតឡើងនៅពេលនាំចូល៖ ',
+    'warning'                   => 'ព្រមាន: : ព្រមាន',
+    'success_redirecting'       => '"ជោគជ័យ... បញ្ជូនបន្ត។',
+    'cancel_request'            => 'បោះបង់ការស្នើសុំធាតុនេះ។',
+    'setup_successful_migrations' => 'តារាងមូលដ្ឋានទិន្នន័យរបស់អ្នកត្រូវបានបង្កើត',
+    'setup_migration_output' => 'លទ្ធផល​នៃ​ការ​ធ្វើ​ចំណាក​ស្រុក៖',
+    'setup_migration_create_user' => 'បន្ទាប់៖ បង្កើតអ្នកប្រើប្រាស់',
+    '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.',
-    'modal_confirm_generic'      => 'Are you sure?',
-    'cannot_be_deleted'      => 'This item cannot be deleted',
-    'cannot_be_edited'      => 'This item cannot be edited.',
-    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
-    'serial_number'        => 'Serial Number',
-    'item_notes' => ':item Notes',
-    'item_name_var' => ':item Name',
+    'modal_confirm_generic'      => 'តើអ្នកប្រាកដទេ?',
+    'cannot_be_deleted'      => 'ធាតុនេះមិនអាចលុបបានទេ។',
+    'cannot_be_edited'      => 'ធាតុនេះមិនអាចកែសម្រួលបានទេ។',
+    'undeployable_tooltip'      => 'ធាតុនេះមិនអាចត្រូវបានchecked out។ ពិនិត្យបរិមាណដែលនៅសល់។',
+    'serial_number'        => 'លេខស៊េរី',
+    'item_notes' => ': ចំណាំធាតុ',
+    'item_name_var' => '៖ ឈ្មោះធាតុ',
     'error_user_company' => 'Checkout target company and asset company do not match',
-    'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
+    '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',
@@ -498,74 +504,77 @@
         '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',
-        'manager_first_name' => 'Manager First Name',
-        'manager_last_name' => 'Manager Last Name',
-        'manager_full_name' => 'Manager Full Name',
-        'manager_username' => 'Manager Username',
-        'checkout_type' => 'Checkout Type',
-        'checkout_location' => 'Checkout to Location',
+        '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',
         'vip' => 'VIP',
         'avatar'  => 'Avatar',
         'gravatar' => 'Gravatar Email',
-        'currency' => 'Currency',
-        'address2' => 'Address Line 2',
+        'currency' => 'រូបិយប័ណ្ណ',
+        'address2' => 'ខ្សែអាស័យដ្ឋាន 2',
         'import_note' => 'Imported using 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',
-    'percent_complete' => '% complete',
-    'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
-    'copy_to_clipboard' => 'Copy to Clipboard',
-    'copied' => 'Copied!',
-    'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
+    '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',
-    'item_not_found' => ':item_type ID :id does not exist or has been deleted',
-    'action_permission_denied' => 'You do not have permission to :action :item_type ID :id',
-    'action_permission_generic' => 'You do not have permission to :action this :item_type',
+    'item_not_found' => ':item_type ID :id មិនមានទេ ឬត្រូវបានលុប',
+    'action_permission_denied' => 'អ្នកមិនមានសិទ្ធិក្នុងការ :action :item_type ID :id',
+    'action_permission_generic' => 'អ្នកមិនមានសិទ្ធិក្នុងការ :action this :item_type',
     'edit' => 'កែសម្រួល',
-    'action_source' => 'Action Source',
-    'or' => 'or',
+    'action_source' => 'ប្រភពសកម្មភាព',
+    'or' => 'ឬ',
     'url'                   => 'URL',
     'edit_fieldset' => 'Edit fieldset fields and options',
-    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
-    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
-    'error_sending_email' => 'Error sending email',
-    '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.',
+    'permission_denied_superuser_demo' => 'ការអនុញ្ញាតត្រូវបានបដិសេធ។ អ្នកមិនអាចធ្វើបច្ចុប្បន្នភាពព័ត៌មានអ្នកប្រើប្រាស់សម្រាប់អ្នកគ្រប់គ្រងជាន់ខ្ពស់នៅលើការបង្ហាញនោះទេ។',
+    'pwd_reset_not_sent' => 'អ្នក​ប្រើ​មិន​ត្រូវ​បាន​ធ្វើ​ឱ្យ​សកម្ម, ត្រូវ​បាន​ធ្វើ​សមកាលកម្ម LDAP, ឬ​មិន​មាន​អាសយដ្ឋាន​អ៊ីមែល',
+    'error_sending_email' => 'កំហុសក្នុងការផ្ញើអ៊ីមែល',
+    'sad_panda' => 'ខ្លាឃ្មុំផេនដា។ អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យធ្វើរឿងនេះទេ។ ប្រហែលជា <a href=":link">ត្រឡប់ទៅផ្ទាំងគ្រប់គ្រង</a> ឬទាក់ទងអ្នកគ្រប់គ្រងរបស់អ្នក។',
     'bulk' => [
             'delete' =>
                 [
                 'header' => 'Bulk Delete :object_type',
-                'warn'   =>  'You are about to delete one :object_type|You are about to delete :count :object_type',
-                'success'   =>  ':object_type successfully deleted|Successfully deleted :count :object_type',
-                'error'   =>  'Could not delete :object_type',
-                'nothing_selected'   =>  'No :object_type selected - nothing to do',
-                'partial'   =>  'Deleted :success_count :object_type, but :error_count :object_type could not be deleted',
+                'warn'   =>  'អ្នកហៀបនឹងលុបមួយ :object_type|អ្នកហៀបនឹងលុប :count :object_type',
+                'success'   =>  ':object_type បានលុបដោយជោគជ័យ|បានលុបដោយជោគជ័យ :count :object_type',
+                'error'   =>  'មិនអាចលុប៖object_type',
+                'nothing_selected'   =>  'ទេ :object_type បានជ្រើសរើស - គ្មានអ្វីត្រូវធ្វើទេ។',
+                'partial'   =>  'បានលុប :success_count :object_type ប៉ុន្តែ :error_count :object_type មិនអាចលុបបានទេ',
              ],
     ],
-    'no_requestable' => 'There are no requestable assets or asset models.',
+    'no_requestable' => 'មិនមានទ្រព្យសកម្ម ឬគំរូទ្រព្យដែលអាចស្នើសុំបានទេ។',
 
     'countable' => [
-        'accessories'  => ':count Accessory|:count Accessories',
-        'assets'  => ':count Asset|:count Assets',
-        'licenses'  => ':count License|:count Licenses',
+        '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',
     ],
     '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!',
-    'something_went_wrong' => 'Something went wrong with your request.',
-    'close' => 'Close',
+    'whoops' => 'អូយ!',
+    'something_went_wrong' => 'មានអ្វីមួយខុសជាមួយសំណើរបស់អ្នក។',
+    'close' => 'បិទ',
     'expires' => 'ផុតកំណត់',
     'map_fields'=> 'ផែនទី៖ item_type Fields',
-    'remaining_var' => ':count Remaining',
-    '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',
+    'remaining_var' => ': រាប់នៅសល់',
+    'label' => 'ស្លាក',
+    'import_asset_tag_exists' => 'ទ្រព្យសកម្មដែលមានស្លាកទ្រព្យសកម្ម :asset_tag មានរួចហើយ ហើយការធ្វើបច្ចុប្បន្នភាពមិនត្រូវបានស្នើសុំទេ។ មិនមានការផ្លាស់ប្តូរត្រូវបានធ្វើឡើងទេ។',
+    'countries_manually_entered_help' => 'តម្លៃដែលមានសញ្ញាផ្កាយ (*) ត្រូវបានបញ្ចូលដោយដៃ ហើយមិនត្រូវគ្នានឹងតម្លៃទម្លាក់ចុះ ISO 3166 ដែលមានស្រាប់ទេ',
+    'accessories_assigned' => 'គ្រឿងបន្ថែមដែលបានកំណត់',
+    'user_managed_passwords' => 'ការគ្រប់គ្រងពាក្យសម្ងាត់',
+    'user_managed_passwords_disallow' => 'មិនអនុញ្ញាតឱ្យអ្នកប្រើប្រាស់គ្រប់គ្រងពាក្យសម្ងាត់ផ្ទាល់ខ្លួនរបស់ពួកគេ។',
+    'user_managed_passwords_allow' => 'អនុញ្ញាតឱ្យអ្នកប្រើប្រាស់គ្រប់គ្រងពាក្យសម្ងាត់ផ្ទាល់ខ្លួនរបស់ពួកគេ។',
 
 ];
diff --git a/resources/lang/ko-KR/admin/settings/general.php b/resources/lang/ko-KR/admin/settings/general.php
index c9e7a5c1b9fb..cab2efff1fc5 100644
--- a/resources/lang/ko-KR/admin/settings/general.php
+++ b/resources/lang/ko-KR/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => '추가 꼬리말',
     'footer_text_help'          => '이 글은 오른쪽 꼬리말에 보여집니다. 링크는 <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>를 참조하시면 됩니다. 줄 바꿈 머리글, 이미지 등은 보여지지 않습니다.',
     'general_settings'			=> '일반 설정',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> '백업 생성',
     'google_workspaces'         => '구글 워크스페이스',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP 버전',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'QR 코드를 보려면 php-gd를 설치하셔야 합니다. 설치 설명서를 참고하세요.',
     'php_gd_warning'            => 'PHP 이미지 처리 및 GD 플러그인이 설치되어 있지 않습니다.',
@@ -231,7 +229,6 @@
     'update'                    => '갱신 설정',
     'value'                     => '가치',
     'brand'                     => '브랜딩',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => '설정에 관해',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D 바코드 형식',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/ko-KR/admin/settings/message.php b/resources/lang/ko-KR/admin/settings/message.php
index c93054ddd5fc..26eb32cb68f4 100644
--- a/resources/lang/ko-KR/admin/settings/message.php
+++ b/resources/lang/ko-KR/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/ko-KR/general.php b/resources/lang/ko-KR/general.php
index 5e8f8c83b951..43094ffe3d38 100644
--- a/resources/lang/ko-KR/general.php
+++ b/resources/lang/ko-KR/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> '결과 없음.',
     'no'  					=> '아니오',
     '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',
     'order_number'          => '주문 번호',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/lt-LT/admin/consumables/general.php b/resources/lang/lt-LT/admin/consumables/general.php
index 8a7f930a1bb1..a20245714a77 100644
--- a/resources/lang/lt-LT/admin/consumables/general.php
+++ b/resources/lang/lt-LT/admin/consumables/general.php
@@ -4,7 +4,7 @@
     'checkout'                          => 'Išduoti eksploatacines medžiagas naudotojui',
     'consumable_name'                   => 'Eksploatacinės medžiagos pavadinimas',
     'create'                            => 'Sukurti eksploatacinę medžiagą',
-    'item_no'                           => 'Elemento Nr.',
+    'item_no'                           => 'Daikto Nr.',
     'remaining' 			            => 'Likutis',
     'total' 			                => 'Iš viso',
     'update'                            => 'Atnaujinti eksploatacinę medžiagą',
diff --git a/resources/lang/lt-LT/admin/hardware/form.php b/resources/lang/lt-LT/admin/hardware/form.php
index aa44eac5562f..7845202a0593 100644
--- a/resources/lang/lt-LT/admin/hardware/form.php
+++ b/resources/lang/lt-LT/admin/hardware/form.php
@@ -60,5 +60,5 @@
     'processing_spinner' => 'Apdorojama... (Dideliems failams gali šiek tiek užtrukti)',
     'optional_infos'  => 'Papildoma informacija',
     'order_details'   => 'Su užsakymu susijusi informacija',
-    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
+    'calc_eol'    => 'Jei EOL data nustatoma iš naujo, naudoti automatinį EOL apskaičiavimą pagal pirkimo datą ir EOL laipsnį.',
 ];
diff --git a/resources/lang/lt-LT/admin/licenses/form.php b/resources/lang/lt-LT/admin/licenses/form.php
index 0b52c7465d31..0dd91ec054ae 100644
--- a/resources/lang/lt-LT/admin/licenses/form.php
+++ b/resources/lang/lt-LT/admin/licenses/form.php
@@ -11,7 +11,7 @@
     'name'              => 'Programinės įrangos pavadinimas',
     'no_depreciation'   => 'Neskaičiuoti nusidėvėjimo',
     'purchase_order'    => 'Pirkimo užsakymo numeris',
-    'reassignable'      => 'Perduodamas',
+    'reassignable'      => 'Perduodama',
     'remaining_seats'   => 'Likusių vietų skaičius',
     'seats'             => 'Vietos',
     'termination_date'  => 'Galiojimo pabaiga',
diff --git a/resources/lang/lt-LT/admin/licenses/general.php b/resources/lang/lt-LT/admin/licenses/general.php
index 3d8818eadcae..e936066f97e8 100644
--- a/resources/lang/lt-LT/admin/licenses/general.php
+++ b/resources/lang/lt-LT/admin/licenses/general.php
@@ -27,7 +27,7 @@
                 'modal'             => 'Šis veiksmas paims vieną vietą. | Šis veiksmas paims visas :checkedout_seats_count šios licencijos vietas.',
                 'enabled_tooltip'   => 'Paimkite VISAS licencijos vietas – tiek iš naudotojų, tiek iš turto',
                 'disabled_tooltip'  => 'Išjungta, kadangi šiuo metu nėra išduotų vietų',
-                'disabled_tooltip_reassignable'  => 'Išjungta, kadangi licencijos negalima perskirti',
+                'disabled_tooltip_reassignable'  => 'Išjungta, kadangi licencijos negalima perduoti',
                 'success'           => 'Licencija paimta sėkmingai! | Visos licencijos paimtos sėkmingai!',
                 'log_msg'           => 'Paimta naudojant masinio licencijų paėmimo sąsają',
             ],
diff --git a/resources/lang/lt-LT/admin/licenses/message.php b/resources/lang/lt-LT/admin/licenses/message.php
index 201349526231..8a4ff7eb4bb4 100644
--- a/resources/lang/lt-LT/admin/licenses/message.php
+++ b/resources/lang/lt-LT/admin/licenses/message.php
@@ -50,7 +50,7 @@
 
     'checkin' => array(
         'error'   => 'Bandant paimti licenciją įvyko klaida. Bandykite dar kartą.',
-        'not_reassignable' => 'License not reassignable',
+        'not_reassignable' => 'Ši licencija nėra perduodama',
         'success' => 'Licencija paimta sėkmingai'
     ),
 
diff --git a/resources/lang/lt-LT/admin/reports/general.php b/resources/lang/lt-LT/admin/reports/general.php
index 1bc4203af2cf..0be7c2683f81 100644
--- a/resources/lang/lt-LT/admin/reports/general.php
+++ b/resources/lang/lt-LT/admin/reports/general.php
@@ -14,9 +14,9 @@
         'user_country' => 'Naudotojo šalis',
         'user_zip' => 'Naudotojo pašto kodas'
     ],
-    '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' => 'Atverti išsaugotą šabloną',
+    'save_template' =>  'Išsaugoti šabloną',
+    'select_a_template' => 'Pasirinkti šabloną',
+    'template_name' => 'Šablono pavadinimas',
+    'update_template' => 'Atnaujinti šabloną',
 ];
diff --git a/resources/lang/lt-LT/admin/reports/message.php b/resources/lang/lt-LT/admin/reports/message.php
index 2800bbdf0bc5..d7b5bcb0dcac 100644
--- a/resources/lang/lt-LT/admin/reports/message.php
+++ b/resources/lang/lt-LT/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' => 'Apie išsaugotus šablonus',
+    'saving_templates_description' => 'Atlikite nustatymus, tada aukščiau esančiame laukelyje įveskite šablono pavadinimą ir spustelėkite mygtuką „Išsaugoti šabloną“. Norėdami pasirinkti anksčiau išsaugotą šabloną, naudokite išskleidžiamąjį meniu.',
     'create'  => [
-        'success' => 'Template saved successfully',
+        'success' => 'Šablonas išsaugotas sėkmingai',
     ],
     'update' => [
-        'success' => 'Template updated successfully',
+        'success' => 'Šablonas atnaujintas sėkmingai',
     ],
     'delete' => [
-        'success' => 'Template deleted',
-        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+        'success' => 'Šablonas panaikintas',
+        'no_delete_permission' => 'Tokio šablono nėra arba jūs neturite teisės jį ištrinti.',
     ],
 ];
diff --git a/resources/lang/lt-LT/admin/settings/general.php b/resources/lang/lt-LT/admin/settings/general.php
index 311c307be1d8..0335a4112b42 100644
--- a/resources/lang/lt-LT/admin/settings/general.php
+++ b/resources/lang/lt-LT/admin/settings/general.php
@@ -55,8 +55,8 @@
     'display_asset_name'        => 'Rodyti turto pavadinimą',
     'display_checkout_date'     => 'Rodyti išdavimo datą',
     'display_eol'               => 'Rodyti nurašymo datas lentelės rodinyje',
-    'display_qr'                => 'Display 2D barcode',
-    'display_alt_barcode'		=> 'Rodyti 1D brūkšninius kodus',
+    'display_qr'                => 'Rodyti 2D brūkšninį kodą',
+    'display_alt_barcode'		=> 'Rodyti 1D brūkšninį kodą',
     'email_logo'                => 'El. pašto logotipas',
     'barcode_type'				=> '2D brūkšninio kodo tipas',
     'alt_barcode_type'			=> '1D brūkšninio kodo tipas',
@@ -70,7 +70,6 @@
     'footer_text'               => 'Papildomas poraštė tekstas ',
     'footer_text_help'          => 'Šis tekstas bus rodomas dešinėje poraštės pusėje. Nuorodos leidžiamos naudojant <a href="https://help.github.com/articles/github-flavored-markdown/">Github tipo žymėjimą (markdown)</a>. Eilučių lūžiai, antraštės, atvaizdai ir kt. gali sukelti nenuspėjamus rezultatus.',
     'general_settings'			=> 'Bendrieji nustatymai',
-    'general_settings_keywords' => 'įmonės palaikymas, parašas, sutikimas, el. laiško formatas, naudotojo vardo formatas, atvaizdai, viename puslapyje, miniatiūra, eula, gravatar, paslaugos sąlygos, valdymo skydas, privatumas',
     'general_settings_help'     => 'Numatytasis licencinis sutikimas (EULA) ir kita',
     'generate_backup'			=> 'Kurti atsarginę kopiją',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP versija',
     'php_info'                  => 'PHP informacija',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP sistemos informacija',
     'php_gd_info'               => 'Turite įdiegti php-gd, kad būtų rodomi QR kodai (žr. diegimo instrukcijas).',
     'php_gd_warning'            => 'Neįdiegti „PHP Image Processing“ ir „GD“ papildiniai.',
@@ -231,7 +229,6 @@
     'update'                    => 'Atnaujinti nustatymus',
     'value'                     => 'Reikšmė',
     'brand'                     => 'Ženklodara',
-    'brand_keywords'            => 'poraštė, logotipas, spaudiniai, tema, apipavidalinimas, antraštė, spalvos, spalva, css',
     'brand_help'                => 'Logotipas, Puslapio pavadinimas',
     'web_brand'                 => 'Žiniatinklio ženklodaros tipas',
     'about_settings_title'      => 'Apie nustatymus',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtruoti pagal nustatymų raktažodį',
     'security' => 'Saugumas',
     'security_title' => 'Atnaujinti saugumo nustatymus',
-    'security_keywords' => 'slaptažodis, slaptažodžiai, reikalavimai, dviejų faktorių, dviejų veiksnių, įprasti slaptažodžiai, nuotolinis prisijungimas, atsijungimas, autentifikavimas',
     'security_help' => 'Dviejų veiksnių, slaptažodžio apribojimai',
-    'groups_keywords' => 'teisės, teisių grupės, autorizacija',
     'groups_help' => 'Paskyros teisių grupės',
     'localization' => 'Lokalizacija',
     'localization_title' => 'Atnaujinti lokalizacijos nustatymus',
-    'localization_keywords' => 'lokalizacija, valiuta, vietinis, lokalė, laiko juosta, laiko juosta, tarptautinis, internacionalizavimas, kalba, kalbos, vertimas',
     'localization_help' => 'Kalba, datos atvaizdavimas',
     'notifications' => 'Pranešimai',
     'notifications_help' => 'El. pašto įspėjimų ir audito nustatymai',
     'asset_tags_help' => 'Didinimas ir prefiksai',
     'labels' => 'Etiketės',
     'labels_title' => 'Atnaujinti etikečių nustatymus',
-    'labels_help' => 'Etikečių dydžiai ir nustatymai',
-    'purge_keywords' => 'ištrinti visam laikui',
+    'labels_help' => 'Brūkšninių kodų ir etikečių nustatymai',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D brūkšninio kodo tipas',
     'label2_2d_type_help'     => '2D brūkšninio kodo formatas',
     'label2_2d_target'        => '2D brūkšninio kodo kelias',
-    'label2_2d_target_help'   => 'Adresas (URL), į kurį nukreipiama nuskaičius 2D brūkšninį kodą',
+    'label2_2d_target_help'   => 'Duomenys, kurie bus 2D brūkšniniame kode',
     'label2_fields'           => 'Laukų apibrėžimai',
     'label2_fields_help'      => 'Laukus galima pridėti, pašalinti ir pertvarkyti kairiajame stulpelyje. Kiekvienam laukui, dešiniajame stulpelyje galima pridėti kelias etiketės ir „DataSource“ parinktis, taip pat, jas pašalinti ir pertvarkyti.',
     'help_asterisk_bold'    => 'Tekstas, įvestas kaip <code>**tekstas**</code>, bus rodomas paryškintu šriftu',
     'help_blank_to_use'     => 'Palikite tuščią, kad būtų nauudojama <code>:setting_name</code> reikšmė',
-    'help_default_will_use' => '<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. ',
+    'help_default_will_use' => '<code>:default</code> naudos reikšmę iš <code>:setting_name</code>. <br>Atkreipkite dėmesį, kad brūkšninio kodo reikšmė turi atitikti atitinkamą brūkšninio kodo specifikaciją tam, kad būtų sėkmingai sugeneruota. Jei reikia daugiau informacijos, peržiūrėkite <a href="https://snipe-it.readme.io/docs/barcodes">dokumentaciją<i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'Turto ID',
+    'data'               => 'Duomenys',
     'default'               => 'Numatytasis',
     'none'                  => 'Joks',
     'google_callback_help' => 'Čia turėtų būti nurodytas tas pats autorizacijos tikrinimo adresas (URL), kurį nurodėte savo organizacijos „Google OAuth“ programos nustatymuose adresu <strong><a href="https://console.cloud.google.com/" target="_blank">„Google Developer Console“ <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Likus kiek dienų iki numatomo turto paėmimo, jis turėtų būti rodomas puslapyje „Laukia paėmimo“?',
     'no_groups' => 'Grupės dar nesukurtos. Apsilankykite <code>Administratoriaus nustatymai > Paskyros teisių grupės</code>, kad jų pridėtumėte.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'poraštė, logotipas, spaudiniai, tema, apipavidalinimas, antraštė, spalvos, spalva, css',
+        'general_settings'  => 'įmonės palaikymas, parašas, sutikimas, el. laiško formatas, naudotojo vardo formatas, atvaizdai, viename puslapyje, miniatiūra, eula, gravatar, paslaugos sąlygos, valdymo skydas, privatumas',
+        'groups'            => 'teisės, teisių grupės, autorizacija',
+        'labels'            => 'etiketės, brūkšniniai kodai, brūkšninis kodas, lapai, spaudiniai, upc, qr, 1d, 2d',
+        'localization'      => 'lokalizacija, valiuta, vietinis, lokalė, laiko juosta, laiko juosta, tarptautinis, internacionalizavimas, kalba, kalbos, vertimas',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'ištrinti visam laikui',
+        'security'          => 'slaptažodis, slaptažodžiai, reikalavimai, dviejų veiksnių, dviejų veiksnių, įprasti slaptažodžiai, nuotolinis prisijungimas, atsijungimas, autentifikavimas',
+    ],
+
 ];
diff --git a/resources/lang/lt-LT/admin/settings/message.php b/resources/lang/lt-LT/admin/settings/message.php
index e969f1db55d1..378f9c07782e 100644
--- a/resources/lang/lt-LT/admin/settings/message.php
+++ b/resources/lang/lt-LT/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Kažkas ne taip. :app atsakė: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/lt-LT/admin/users/table.php b/resources/lang/lt-LT/admin/users/table.php
index 05d7c0dfa3d8..3e5a00ef071f 100644
--- a/resources/lang/lt-LT/admin/users/table.php
+++ b/resources/lang/lt-LT/admin/users/table.php
@@ -29,7 +29,7 @@
     'phone'  				=> 'Telefono Nr.',
     'show_current'          => 'Rodyti esamus naudotojus',
     'show_deleted'          => 'Rodyti panaikintus naudotojus',
-    'title' 				=> 'Antraštė',
+    'title' 				=> 'Pareigos',
 	'to_restore_them'		=> 'juos atkurti.',
     'total_assets_cost'     => "Bendra turto vertė",
     'updateuser' 			=> 'Atnaujinti naudotoją',
diff --git a/resources/lang/lt-LT/general.php b/resources/lang/lt-LT/general.php
index cbb3d3f5881b..a960b159052c 100644
--- a/resources/lang/lt-LT/general.php
+++ b/resources/lang/lt-LT/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Rezultatų nėra.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Pastabos',
+    'note_added'            => 'Pastaba pridėta',
+    'add_note'              => 'Pridėti pastabą',
+    'note_edited'            => 'Pastaba atnaujinta',
+    'edit_note'              => 'Redaguoti pastabą',
+    'note_deleted'            => 'Pastaba panaikinta',
+    'delete_note'              => 'Naikinti pastabą',
     'order_number'          => 'Užsakymo numeris',
     'only_deleted'          => 'Tik panaikintas turtas',
     'page_menu'				=> 'Rodomi _MENU_ elementai',
@@ -230,7 +236,7 @@
     'purchase_date'         => 'Pirkimo data',
     'qty'		            => 'Kiekis',
     'quantity'		        => 'Kiekis',
-    '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'      => '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į',
     'quickscan_checkin'  	=> 'Greitas paėmimas skenuojant',
     'quickscan_checkin_status'  	=> 'Paėmimo būsena',
     'ready_to_deploy'		=> 'Paruoštas naudojimui',
@@ -302,7 +308,7 @@
     'username_format'		=> 'Naudotojo vardo formatas',
     'username'              => 'Naudotojo vardas',
     'update'                => 'Atnaujinti',
-    'updating_item' => 'Updating :item',
+    'updating_item' => 'Atnaujinamas :item',
     'upload_filetypes_help'      => 'Leidžiami failų tipai yra: png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf ir rar. Didžiausias leidžiamas įkeliamų failų dydis yra :size.',
     'uploaded'              => 'Įkelta',
     'user'					=> 'Naudotojas',
@@ -435,7 +441,7 @@
     'alt_uploaded_image_thumbnail' => 'Įkelta miniatiūra',
     'placeholder_kit'       => 'Pasirinkite rinkinį',
     'file_not_found'        => 'Failas nerastas',
-    'log_record_not_found'  => 'No record for that log entry was found.',
+    'log_record_not_found'  => 'Įrašų apie šį žurnalo įrašą nerasta.',
     'preview_not_available' => '(nėra peržiūros galimybės)',
     'setup'                 => 'Sąranka',
     'pre_flight'            => 'Išankstinis patikrinimas',
@@ -486,7 +492,7 @@
     'cannot_be_deleted'      => 'Šio daikto ištrinti negalima',
     'cannot_be_edited'      => 'Šio daikto redaguoti negalima.',
     'undeployable_tooltip'      => 'Šio daikto išduoti negalima. Patikrinkite likutį.',
-    'serial_number'        => 'Serijos numeris',
+    'serial_number'        => 'Serijinis numeris',
     'item_notes' => ':item Pastabos',
     'item_name_var' => ':item Pavadinimas',
     'error_user_company' => 'Paskirties ir turto įmonės nesutampa',
@@ -566,6 +572,9 @@
     'label' => 'Etiketė',
     'import_asset_tag_exists' => 'Turtas su inventoriniu numeriu :asset_tag jau yra ir atnaujinimo užklausa nebuvo pateikta. Jokie pakeitimai nebuvo atlikti.',
     'countries_manually_entered_help' => 'Žvaigždute (*) pažymėtos reikšmės buvo įvestos rankiniu būdu ir neatitinka esamų ISO 3166 išskleidžiamojo sąrašo reikšmių',
-    'accessories_assigned' => 'Assigned Accessories',
+    'accessories_assigned' => 'Priskirti priedai',
+    'user_managed_passwords' => 'Slaptažodžių tvarkymas',
+    'user_managed_passwords_disallow' => 'Neleisti naudotojams tvarkyti savo slaptažodžių',
+    'user_managed_passwords_allow' => 'Leisti naudotojams tvarkyti savo slaptažodžius',
 
 ];
diff --git a/resources/lang/lv-LV/admin/settings/general.php b/resources/lang/lv-LV/admin/settings/general.php
index eccb1cae26d3..2309a5fc761e 100644
--- a/resources/lang/lv-LV/admin/settings/general.php
+++ b/resources/lang/lv-LV/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Papildu kājenes teksts ',
     'footer_text_help'          => 'Šis teksts tiks parādīts labajā kājenē. Saites ir atļautas, izmantojot <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Līniju pārtraukumi, galvenes, attēli, utt. var radīt neparedzamus rezultātus.',
     'general_settings'			=> 'Vispārīgie iestatījumi',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Izveidot dublējumu',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP versija',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Jums jāinstalē php-gd, lai parādītu QR kodus, skatiet instalēšanas instrukcijas.',
     'php_gd_warning'            => 'PHP attēlu apstrāde un GD spraudnis nav instalēts.',
@@ -231,7 +229,6 @@
     'update'                    => 'Atjauniniet iestatījumus',
     'value'                     => 'Vērtība',
     'brand'                     => 'Brendings',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Par iestatījumiem',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D svītru kodu tips',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/lv-LV/admin/settings/message.php b/resources/lang/lv-LV/admin/settings/message.php
index f2f47138f0fb..a9740634487e 100644
--- a/resources/lang/lv-LV/admin/settings/message.php
+++ b/resources/lang/lv-LV/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/lv-LV/general.php b/resources/lang/lv-LV/general.php
index 52318d482cd9..2cfba8baa9fa 100644
--- a/resources/lang/lv-LV/general.php
+++ b/resources/lang/lv-LV/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Nav rezultātu.',
     'no'  					=> 'Nē',
     'notes'  				=> 'Piezīmes',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Pasūtījuma numurs',
     'only_deleted'          => 'Tikai Dzēsts Inventārs',
     'page_menu'				=> 'Rāda _MENU_ vienumus',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/mi-NZ/admin/settings/general.php b/resources/lang/mi-NZ/admin/settings/general.php
index 881c837b4d73..d1d045449da5 100644
--- a/resources/lang/mi-NZ/admin/settings/general.php
+++ b/resources/lang/mi-NZ/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'Tautuhinga Whānui',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Whakaritea te Whakaora',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Me whakauruhia te php-g ki te whakaatu i nga waehere QR, tirohia nga tohutohu whakauru.',
     'php_gd_warning'            => 'Kāore i te whakauruhia te taputapu Atahanga PHP me te monohanga GD.',
@@ -231,7 +229,6 @@
     'update'                    => 'Tautuhinga Whakahōu',
     'value'                     => 'Uara',
     'brand'                     => 'Waitohu',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Mō Ngā Tautuhinga',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Type Barcode',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/mi-NZ/admin/settings/message.php b/resources/lang/mi-NZ/admin/settings/message.php
index 4cd44a6d38cb..b522ea832e1c 100644
--- a/resources/lang/mi-NZ/admin/settings/message.php
+++ b/resources/lang/mi-NZ/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/mi-NZ/general.php b/resources/lang/mi-NZ/general.php
index 897ee390a804..a5cc21fa7f1d 100644
--- a/resources/lang/mi-NZ/general.php
+++ b/resources/lang/mi-NZ/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Kore Hua.',
     'no'  					=> 'No',
     'notes'  				=> 'Tuhipoka',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Tau Tau',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Te whakaatu i nga mea _MENU_',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/mk-MK/admin/settings/general.php b/resources/lang/mk-MK/admin/settings/general.php
index 9d711819acd0..fea9a6082299 100644
--- a/resources/lang/mk-MK/admin/settings/general.php
+++ b/resources/lang/mk-MK/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Дополнителен текст на подножјето ',
     'footer_text_help'          => 'Овој текст ќе се појави во подножјето на десната страна. Врските се дозволени со употреба <a href="https://help.github.com/articles/github-flavored-markdown/">Github верзија markdown</a>. Line breaks, headers, images, итн може да резултира во непредвидливи резултати.',
     'general_settings'			=> 'Општи поставки',
-    'general_settings_keywords' => 'поддршка на компанијата, потпис, прифаќање, формат на е-пошта, формат на корисничко име, слики, по страница, сликичка, eula, gravatar, tos, работна табла, приватност',
     'general_settings_help'     => 'Стандардно EULA и многу повеќе',
     'generate_backup'			=> 'Генерирај резевна копија',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP верзија',
     'php_info'                  => 'PHP Инфо',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpИнфо, систем, Инфо',
     'php_overview_help'         => 'PHP Информации за системот',
     'php_gd_info'               => 'Мора да инсталирате php-gd за прикажување QR кодови, погледнете ги инструкциите за инсталирање.',
     'php_gd_warning'            => 'PHP обработка на слика и GD додатокот не е инсталиран.',
@@ -231,7 +229,6 @@
     'update'                    => 'Ажурирајте ги поставките',
     'value'                     => 'Вредност',
     'brand'                     => 'Брендирање',
-    'brand_keywords'            => 'подножје, лого, печатење, тема, изглед, заглавје, бои, боја, css',
     'brand_help'                => 'Лого, Име на страницата',
     'web_brand'                 => 'Тип на веб-брендирање',
     'about_settings_title'      => 'За поставките',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Филтер со поставување клучен збор',
     'security' => 'Безбедност',
     'security_title' => 'Ажурирајте ги поставките за безбедност',
-    'security_keywords' => 'лозинка, лозинки, барања, двофакторни, двофакторни, вообичаени лозинки, далечинско најавување, одјавување, автентикација',
     'security_help' => 'Двофакторско, ограничувања на лозинката',
-    'groups_keywords' => 'дозволи, групи на дозволи, авторизација',
     'groups_help' => 'Групи за дозволи за сметка',
     'localization' => 'Локализација',
     'localization_title' => 'Ажурирајте ги поставките за локализација',
-    'localization_keywords' => 'локализација, валута, локално, локација, временска зона, временска зона, меѓународна, Интернационализација, јазик, јазици, превод',
     'localization_help' => 'Јазик, приказ на датумот',
     'notifications' => 'Известувања',
     'notifications_help' => 'Известувања по е-пошта & Поставки за попис',
     'asset_tags_help' => 'Зголемување и префикси',
     'labels' => 'Етикети',
     'labels_title' => 'Ажурирајте ги поставките за етикета',
-    'labels_help' => 'Големини на етикетата &amp; поставки',
-    'purge_keywords' => 'трајно избришете',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Прочистете ги избришаните записи',
     'ldap_extension_warning' => 'Не изгледа како LDAP додатокот е инсталиран или овозможен на овој сервер. Сè уште можете да ги зачувате вашите поставки, Но, ќе треба да го овозможите LDAP додатокот за PHP пред LDAP сихронизацијата и најавата да работат',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Тип на 2D бар код',
     'label2_2d_type_help'     => 'Формат за 2D баркод',
     'label2_2d_target'        => '2D баркод мета',
-    'label2_2d_target_help'   => 'URL адреса која е цел на 2D баркод-от кога се скенира',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Дефиниции на поле',
     'label2_fields_help'      => 'Полињата можат да се додадат, отстранат и да се преуредат во левата колона. За секое поле, повеќе опции за Назив и Извор на податоци можат да се додадат, отстранат и преуредат во десната колона.',
     'help_asterisk_bold'    => 'Текстот внесен како <code>**text**</code> ќе биде прикажан како здебелен',
     'help_blank_to_use'     => 'Оставете празно за да ја користите вредноста од <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Стандардно',
     'none'                  => 'Ништо',
     'google_callback_help' => 'Ова треба да се внесе како callback URL адреса во поставките на Google OAuth апликацијата за вашата организација&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer конзола <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Колку дена пред очекуваното раздолжување на средството треба да биде наведено на страницата „Време е за раздолжување“?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'подножје, лого, печатење, тема, изглед, заглавје, бои, боја, css',
+        'general_settings'  => 'поддршка на компанијата, потпис, прифаќање, формат на е-пошта, формат на корисничко име, слики, по страница, сликичка, eula, gravatar, tos, работна табла, приватност',
+        'groups'            => 'дозволи, групи на дозволи, авторизација',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'локализација, валута, локално, локација, временска зона, временска зона, меѓународна, Интернационализација, јазик, јазици, превод',
+        'php_overview'      => 'phpИнфо, систем, Инфо',
+        'purge'             => 'трајно избришете',
+        'security'          => 'лозинка, лозинки, барања, двофакторни, двофакторни, вообичаени лозинки, далечинско најавување, одјавување, автентикација',
+    ],
+
 ];
diff --git a/resources/lang/mk-MK/admin/settings/message.php b/resources/lang/mk-MK/admin/settings/message.php
index 1d8c8c38983e..332af8ef321c 100644
--- a/resources/lang/mk-MK/admin/settings/message.php
+++ b/resources/lang/mk-MK/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Нешто не е во ред. :app одговори со :error_message',
         'error_redirect' => 'ГРЕШКА: 301/302 :endpoint враќа пренасочување. Од безбедносни причини, ние не ги следиме пренасочувањата. Ве молиме користете директна крајна точка.',
         'error_misc' => 'Нешто не е во ред. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];
diff --git a/resources/lang/mk-MK/general.php b/resources/lang/mk-MK/general.php
index 8ddf6bd309b0..8bac58a5a5ae 100644
--- a/resources/lang/mk-MK/general.php
+++ b/resources/lang/mk-MK/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Нема резултати.',
     'no'  					=> 'Не',
     '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',
     'order_number'          => 'Број на нарачка',
     'only_deleted'          => 'Само избришани средства',
     'page_menu'				=> 'Прикажани се _MENU_ ставки',
@@ -567,5 +573,8 @@
     'import_asset_tag_exists' => 'Средство со ознаката :asset_tag веќе постои и не беше побарано ажурирање.Не е направена никаква промена.',
     'countries_manually_entered_help' => 'Вредности со звездичка (*) биле рачно внесени и не се совпаѓаат со постојните 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',
 
 ];
diff --git a/resources/lang/ml-IN/admin/settings/general.php b/resources/lang/ml-IN/admin/settings/general.php
index 6dcfee66be14..97567df8dfd4 100644
--- a/resources/lang/ml-IN/admin/settings/general.php
+++ b/resources/lang/ml-IN/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/ml-IN/admin/settings/message.php b/resources/lang/ml-IN/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/ml-IN/admin/settings/message.php
+++ b/resources/lang/ml-IN/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/ml-IN/general.php b/resources/lang/ml-IN/general.php
index 7b4145a9588e..f67a7793b7f3 100644
--- a/resources/lang/ml-IN/general.php
+++ b/resources/lang/ml-IN/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     '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',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/mn-MN/admin/settings/general.php b/resources/lang/mn-MN/admin/settings/general.php
index f6ed7879be52..c736c9bd228f 100644
--- a/resources/lang/mn-MN/admin/settings/general.php
+++ b/resources/lang/mn-MN/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Нэмэлт хөл хэсгийн текст ',
     'footer_text_help'          => 'Энэ текст баруун талын хөл хэсэгт гарч ирнэ. Холбоосыг <a href="https://help.github.com/articles/github-flavored-markdown/"> Github маягийн markdown </a> ашиглан хэрэглэнэ. Шинэ мөр, толгой, зураг гэх мэт нь урьдчилан таамаглах аргагүй үр дүнд хүргэж болзошгүй.',
     'general_settings'			=> 'Ерөнхий Тохиргоо',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Нөөц үүсгэх',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP хувилбар',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Та php-gd-г QR кодуудыг харуулахын тулд суулгах зааврыг харах хэрэгтэй.',
     'php_gd_warning'            => 'PHP Image Processing болон GD залгаас суулгаагүй байна.',
@@ -231,7 +229,6 @@
     'update'                    => 'Тохиргоог шинэчлэнэ',
     'value'                     => 'Утга',
     'brand'                     => 'Брэнд',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Тохиргооны тухай',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D бар кодны төрөл',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/mn-MN/admin/settings/message.php b/resources/lang/mn-MN/admin/settings/message.php
index 606f2ef01534..97e2d3d5d1f2 100644
--- a/resources/lang/mn-MN/admin/settings/message.php
+++ b/resources/lang/mn-MN/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/mn-MN/general.php b/resources/lang/mn-MN/general.php
index d9f0f6fbd754..99eb53f9c478 100644
--- a/resources/lang/mn-MN/general.php
+++ b/resources/lang/mn-MN/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Үр дүнгүй.',
     'no'  					=> 'Үгүй',
     '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',
     'order_number'          => 'Захиалгын дугаар',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> '_MENU_ зүйлсийг харуулж байна',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/ms-MY/admin/settings/general.php b/resources/lang/ms-MY/admin/settings/general.php
index 80c3df005ffe..210f6cfd5a17 100644
--- a/resources/lang/ms-MY/admin/settings/general.php
+++ b/resources/lang/ms-MY/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Teks Pengaki Tambahan ',
     'footer_text_help'          => 'Teks ini akan muncul dalam pengaki sebelah kanan. Pautan dibenarkan menggunakan <a href="https://help.github.com/articles/github-flavored-markdown/">turunkan berperisa Github</a>. Pemisahan baris, pengepala, imej, dll boleh mengakibatkan hasil yang tidak dapat diramalkan.',
     'general_settings'			=> 'Tetapan umum',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Hasilkan Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'Versi PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Anda mesti pasangkan php-gd untuk paparkan kod QR, lihat arahan pemasangan.',
     'php_gd_warning'            => 'Pemproses imej PHP dan \'plugin\' GD TIDAK dipasang.',
@@ -231,7 +229,6 @@
     'update'                    => 'Kemaskini Tetapan',
     'value'                     => 'Nilai',
     'brand'                     => 'Penjenamaan',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Mengenai Tetapan',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Jenis Barcode 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/ms-MY/admin/settings/message.php b/resources/lang/ms-MY/admin/settings/message.php
index 5f35d24f2f35..76c3e365dee1 100644
--- a/resources/lang/ms-MY/admin/settings/message.php
+++ b/resources/lang/ms-MY/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/ms-MY/general.php b/resources/lang/ms-MY/general.php
index 89a80977b075..060805e88dd6 100644
--- a/resources/lang/ms-MY/general.php
+++ b/resources/lang/ms-MY/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Tiada kepututsan.',
     'no'  					=> 'Tidak',
     'notes'  				=> 'Nota',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Nombor Pesanan',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Menunjukkan _MENU_ item',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/nb-NO/admin/settings/general.php b/resources/lang/nb-NO/admin/settings/general.php
index a189074967f1..e1e8191464f6 100644
--- a/resources/lang/nb-NO/admin/settings/general.php
+++ b/resources/lang/nb-NO/admin/settings/general.php
@@ -71,7 +71,6 @@
     'footer_text_help'          => 'Denne teksten vil fremstå i høyre del av bunnteksten. Lenker er tillatt ved å bruke <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.
 Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'general_settings'			=> 'Generelle innstillinger',
-    'general_settings_keywords' => 'bedriftens støtte, signatur, e-postformat, brukerformat, bilder, per side, miniatyrbilde, eula, graviter, forelder, dashbord, personvern',
     'general_settings_help'     => 'Standard EULA og mer',
     'generate_backup'			=> 'Generer Sikkerhetskopi',
     'google_workspaces'         => 'Google arbeidsområder',
@@ -155,7 +154,6 @@
     'php'                       => 'PHP-versjon',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP systeminfo',
     'php_gd_info'               => 'Du må installere php-gd for å vise QR-koder. Se installasjonsinstruksjoner.',
     'php_gd_warning'            => 'PHP bildebehandling og GD-plugin er IKKE installert.',
@@ -232,7 +230,6 @@
     'update'                    => 'Oppdater innstillinger',
     'value'                     => 'Verdi',
     'brand'                     => 'Merkevare',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, nettstedsnavn',
     'web_brand'                 => 'Velg branding-type',
     'about_settings_title'      => 'Om Innstillinger',
@@ -320,21 +317,17 @@
     'filter_by_keyword' => 'Filtrer ved å sette nøkkelord',
     'security' => 'Sikkerhet',
     'security_title' => 'Oppdater sikkerhetsinnstillinger',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Tofaktor, passordbegrensinger',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Tillatelsesgrupper',
     'localization' => 'Oversettelser',
     'localization_title' => 'Oppdater språkinnstillinger',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Språk, datoformat',
     'notifications' => 'Varslinger',
     'notifications_help' => 'E-post varsler og revisjonsinnstillinger',
     'asset_tags_help' => 'Økninger og prefikser',
     'labels' => 'Etiketter',
     'labels_title' => 'Oppdater etikettinnstillinger',
-    'labels_help' => 'Etikettstørrelse &amp; innstillinger',
-    'purge_keywords' => 'slett permanent',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -363,12 +356,14 @@
     'label2_2d_type'          => '2D strekkodetype',
     'label2_2d_type_help'     => 'Format for 2D strekkoder',
     'label2_2d_target'        => '2D strekkodemål',
-    'label2_2d_target_help'   => 'URL-en 2D strekkoden peker til til når den blir skannet',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Feltdefinisjoner',
     'label2_fields_help'      => 'Feltene kan legges til, fjernes, og sorteres i venstre kolonne. For hvert felt kan flere alternativer for etikett og datakilde legges til, fjernes, og sorteres på nytt i høyre kolonne.',
     'help_asterisk_bold'    => 'Teksten som skrives inn som <code>**text**</code> vil vises som fet',
     'help_blank_to_use'     => 'La stå tom for å bruke verdien fra <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Standard',
     'none'                  => 'Ingen',
     'google_callback_help' => 'Dette bør angis som callback-URL-en i Google OAuth app innstillingene i organisasjonen din&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google utvikler konsoll <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -390,4 +385,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'bedriftens støtte, signatur, e-postformat, brukerformat, bilder, per side, miniatyrbilde, eula, graviter, forelder, dashbord, personvern',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'slett permanent',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/nb-NO/admin/settings/message.php b/resources/lang/nb-NO/admin/settings/message.php
index 9964e44a24cc..9a977fcf697f 100644
--- a/resources/lang/nb-NO/admin/settings/message.php
+++ b/resources/lang/nb-NO/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Noe gikk galt. :app svarte med: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/nb-NO/general.php b/resources/lang/nb-NO/general.php
index d463974fc55f..567bf33d5c9f 100644
--- a/resources/lang/nb-NO/general.php
+++ b/resources/lang/nb-NO/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Ingen treff.',
     'no'  					=> 'Nei',
     'notes'  				=> 'Notater',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Ordreummer',
     'only_deleted'          => 'Kun slettede ressurser',
     'page_menu'				=> 'Viser _MENU_ enheter',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/nl-NL/admin/settings/general.php b/resources/lang/nl-NL/admin/settings/general.php
index 683b7e5266f8..e5b676f9fe60 100644
--- a/resources/lang/nl-NL/admin/settings/general.php
+++ b/resources/lang/nl-NL/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Aanvullende voettekst ',
     'footer_text_help'          => 'Deze tekst verschijnt in de voettekst aan de rechterkant. Links zijn toegestaan ​​met gebruik van <a href="https://help.github.com/articles/github-flavored-markdown/">Github-stijlen</a>. Regeleindes, koppen, afbeeldingen, enzovoort kunnen resulteren in onvoorspelbare resultaten.',
     'general_settings'			=> 'Algemene Instellingen',
-    'general_settings_keywords' => 'bedrijfsondersteuning, handtekening, acceptantie, e-mailformaat, gebruikersnaam formaat, afbeeldingen, per pagina, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Standaard gebruikersovereenkomst en meer',
     'generate_backup'			=> 'Genereer een backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP versie',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, systeem, info',
     'php_overview_help'         => 'PHP Systeem info',
     'php_gd_info'               => 'Je moet php-gd installeren om QR codes te laten zien, zie installatie instructies.',
     'php_gd_warning'            => 'PHP Image Processing en GD plugin zijn NIET geïnstalleerd.',
@@ -231,7 +229,6 @@
     'update'                    => 'Wijzig instelingen',
     'value'                     => 'Waarde',
     'brand'                     => 'Merk',
-    'brand_keywords'            => 'voettekst, logo, print, thema, skin, header, kleuren, kleur, css',
     'brand_help'                => 'Logo, websitenaam',
     'web_brand'                 => 'Type webmerknaam',
     'about_settings_title'      => 'Over instellingen',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter door het instellen van trefwoord',
     'security' => 'Beveiliging',
     'security_title' => 'Veiligheidsinstellingen bijwerken',
-    'security_keywords' => 'wachtwoord, wachtwoorden, vereisten, twee factor, twee-factor, veelgebruikte wachtwoorden, externe login, logout, authenticatie',
     'security_help' => 'Twee factor, wachtwoorden beperkingen',
-    'groups_keywords' => 'machtigingen, machtigingsgroepen, autorisatie',
     'groups_help' => 'Account machtigingsgroepen',
     'localization' => 'Lokalisatie',
     'localization_title' => 'Lokalisatie-instellingen bijwerken',
-    'localization_keywords' => 'lokalisatie, valuta, lokaal, lokaal, tijdzone, tijdzone, internationaal, internatinalisatie, taal, vertaling',
     'localization_help' => 'Taal en datum weergave',
     'notifications' => 'Notificaties',
     'notifications_help' => 'E-mail Waarschuwingen & Audit Instellingen',
     'asset_tags_help' => 'Verhogen en voorvoegsels',
     'labels' => 'Labels',
     'labels_title' => 'Labelinstellingen bijwerken',
-    'labels_help' => 'Label maten &amp; instellingen',
-    'purge_keywords' => 'permanent verwijderen',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D streepjescode soort',
     'label2_2d_type_help'     => 'Indeling voor 2D barcodes',
     'label2_2d_target'        => '2D Barcode URL',
-    'label2_2d_target_help'   => 'De URL van de 2D streepjescode als deze gescand wordt',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Veld definities',
     'label2_fields_help'      => 'Velden kunnen worden toegevoegd, verwijderd en opnieuw geordend in de linker kolom. Voor elk veld kunnen meerdere opties voor label en gegevensbron worden toegevoegd, verwijderd en opnieuw geordend in de juiste kolom.',
     'help_asterisk_bold'    => 'Tekst ingevoerd als <code>**tekst**</code> wordt weergegeven als dikgedrukt',
     'help_blank_to_use'     => 'Laat leeg om de waarde van <code>:setting_name</code> te gebruiken',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Standaard',
     'none'                  => 'Geen',
     'google_callback_help' => 'Dit moet worden ingevoerd als de callback URL in je Google OAuth app instellingen in je organisatie&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Hoeveel dagen vóór de verwachte check-in van een product moet het worden weergegeven op de pagina "Waarschuwing voor aankomende Check-in"?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'voettekst, logo, print, thema, skin, header, kleuren, kleur, css',
+        'general_settings'  => 'bedrijfsondersteuning, handtekening, acceptantie, e-mailformaat, gebruikersnaam formaat, afbeeldingen, per pagina, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'machtigingen, machtigingsgroepen, autorisatie',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisatie, valuta, lokaal, lokaal, tijdzone, tijdzone, internationaal, internatinalisatie, taal, vertaling',
+        'php_overview'      => 'phpinfo, systeem, info',
+        'purge'             => 'permanent verwijderen',
+        'security'          => 'wachtwoord, wachtwoorden, vereisten, twee factor, twee-factor, veelgebruikte wachtwoorden, externe login, logout, authenticatie',
+    ],
+
 ];
diff --git a/resources/lang/nl-NL/admin/settings/message.php b/resources/lang/nl-NL/admin/settings/message.php
index d5fe1867ce6f..da8a638bea01 100644
--- a/resources/lang/nl-NL/admin/settings/message.php
+++ b/resources/lang/nl-NL/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Er ging iets mis. :app reageerde met: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/nl-NL/general.php b/resources/lang/nl-NL/general.php
index ecf24dd9a644..1143c1e0735b 100644
--- a/resources/lang/nl-NL/general.php
+++ b/resources/lang/nl-NL/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Geen resultaten.',
     'no'  					=> 'Nee',
     'notes'  				=> 'Notities',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Bestelnummer',
     'only_deleted'          => 'Alleen verwijderde activa',
     'page_menu'				=> '_MENU_ items worden weergegeven',
@@ -567,5 +573,8 @@
     'import_asset_tag_exists' => 'Een asset met de asset tag :asset_tag bestaat al en een update is niet aangevraagd. Er is geen wijziging aangebracht.',
     'countries_manually_entered_help' => 'De waarden met een asterisk (*) zijn handmatig ingevoerd en komen niet overeen met de bestaande ISO 3166 dropdown waarden',
     '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',
 
 ];
diff --git a/resources/lang/nn-NO/admin/settings/general.php b/resources/lang/nn-NO/admin/settings/general.php
index a189074967f1..e1e8191464f6 100644
--- a/resources/lang/nn-NO/admin/settings/general.php
+++ b/resources/lang/nn-NO/admin/settings/general.php
@@ -71,7 +71,6 @@
     'footer_text_help'          => 'Denne teksten vil fremstå i høyre del av bunnteksten. Lenker er tillatt ved å bruke <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.
 Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'general_settings'			=> 'Generelle innstillinger',
-    'general_settings_keywords' => 'bedriftens støtte, signatur, e-postformat, brukerformat, bilder, per side, miniatyrbilde, eula, graviter, forelder, dashbord, personvern',
     'general_settings_help'     => 'Standard EULA og mer',
     'generate_backup'			=> 'Generer Sikkerhetskopi',
     'google_workspaces'         => 'Google arbeidsområder',
@@ -155,7 +154,6 @@
     'php'                       => 'PHP-versjon',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP systeminfo',
     'php_gd_info'               => 'Du må installere php-gd for å vise QR-koder. Se installasjonsinstruksjoner.',
     'php_gd_warning'            => 'PHP bildebehandling og GD-plugin er IKKE installert.',
@@ -232,7 +230,6 @@
     'update'                    => 'Oppdater innstillinger',
     'value'                     => 'Verdi',
     'brand'                     => 'Merkevare',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, nettstedsnavn',
     'web_brand'                 => 'Velg branding-type',
     'about_settings_title'      => 'Om Innstillinger',
@@ -320,21 +317,17 @@
     'filter_by_keyword' => 'Filtrer ved å sette nøkkelord',
     'security' => 'Sikkerhet',
     'security_title' => 'Oppdater sikkerhetsinnstillinger',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Tofaktor, passordbegrensinger',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Tillatelsesgrupper',
     'localization' => 'Oversettelser',
     'localization_title' => 'Oppdater språkinnstillinger',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Språk, datoformat',
     'notifications' => 'Varslinger',
     'notifications_help' => 'E-post varsler og revisjonsinnstillinger',
     'asset_tags_help' => 'Økninger og prefikser',
     'labels' => 'Etiketter',
     'labels_title' => 'Oppdater etikettinnstillinger',
-    'labels_help' => 'Etikettstørrelse &amp; innstillinger',
-    'purge_keywords' => 'slett permanent',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -363,12 +356,14 @@
     'label2_2d_type'          => '2D strekkodetype',
     'label2_2d_type_help'     => 'Format for 2D strekkoder',
     'label2_2d_target'        => '2D strekkodemål',
-    'label2_2d_target_help'   => 'URL-en 2D strekkoden peker til til når den blir skannet',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Feltdefinisjoner',
     'label2_fields_help'      => 'Feltene kan legges til, fjernes, og sorteres i venstre kolonne. For hvert felt kan flere alternativer for etikett og datakilde legges til, fjernes, og sorteres på nytt i høyre kolonne.',
     'help_asterisk_bold'    => 'Teksten som skrives inn som <code>**text**</code> vil vises som fet',
     'help_blank_to_use'     => 'La stå tom for å bruke verdien fra <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Standard',
     'none'                  => 'Ingen',
     'google_callback_help' => 'Dette bør angis som callback-URL-en i Google OAuth app innstillingene i organisasjonen din&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google utvikler konsoll <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -390,4 +385,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'bedriftens støtte, signatur, e-postformat, brukerformat, bilder, per side, miniatyrbilde, eula, graviter, forelder, dashbord, personvern',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'slett permanent',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/nn-NO/admin/settings/message.php b/resources/lang/nn-NO/admin/settings/message.php
index 9964e44a24cc..9a977fcf697f 100644
--- a/resources/lang/nn-NO/admin/settings/message.php
+++ b/resources/lang/nn-NO/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Noe gikk galt. :app svarte med: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/nn-NO/general.php b/resources/lang/nn-NO/general.php
index d463974fc55f..567bf33d5c9f 100644
--- a/resources/lang/nn-NO/general.php
+++ b/resources/lang/nn-NO/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Ingen treff.',
     'no'  					=> 'Nei',
     'notes'  				=> 'Notater',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Ordreummer',
     'only_deleted'          => 'Kun slettede ressurser',
     'page_menu'				=> 'Viser _MENU_ enheter',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/no-NO/admin/settings/general.php b/resources/lang/no-NO/admin/settings/general.php
index a189074967f1..e1e8191464f6 100644
--- a/resources/lang/no-NO/admin/settings/general.php
+++ b/resources/lang/no-NO/admin/settings/general.php
@@ -71,7 +71,6 @@
     'footer_text_help'          => 'Denne teksten vil fremstå i høyre del av bunnteksten. Lenker er tillatt ved å bruke <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.
 Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'general_settings'			=> 'Generelle innstillinger',
-    'general_settings_keywords' => 'bedriftens støtte, signatur, e-postformat, brukerformat, bilder, per side, miniatyrbilde, eula, graviter, forelder, dashbord, personvern',
     'general_settings_help'     => 'Standard EULA og mer',
     'generate_backup'			=> 'Generer Sikkerhetskopi',
     'google_workspaces'         => 'Google arbeidsområder',
@@ -155,7 +154,6 @@
     'php'                       => 'PHP-versjon',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP systeminfo',
     'php_gd_info'               => 'Du må installere php-gd for å vise QR-koder. Se installasjonsinstruksjoner.',
     'php_gd_warning'            => 'PHP bildebehandling og GD-plugin er IKKE installert.',
@@ -232,7 +230,6 @@
     'update'                    => 'Oppdater innstillinger',
     'value'                     => 'Verdi',
     'brand'                     => 'Merkevare',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, nettstedsnavn',
     'web_brand'                 => 'Velg branding-type',
     'about_settings_title'      => 'Om Innstillinger',
@@ -320,21 +317,17 @@
     'filter_by_keyword' => 'Filtrer ved å sette nøkkelord',
     'security' => 'Sikkerhet',
     'security_title' => 'Oppdater sikkerhetsinnstillinger',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Tofaktor, passordbegrensinger',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Tillatelsesgrupper',
     'localization' => 'Oversettelser',
     'localization_title' => 'Oppdater språkinnstillinger',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Språk, datoformat',
     'notifications' => 'Varslinger',
     'notifications_help' => 'E-post varsler og revisjonsinnstillinger',
     'asset_tags_help' => 'Økninger og prefikser',
     'labels' => 'Etiketter',
     'labels_title' => 'Oppdater etikettinnstillinger',
-    'labels_help' => 'Etikettstørrelse &amp; innstillinger',
-    'purge_keywords' => 'slett permanent',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -363,12 +356,14 @@
     'label2_2d_type'          => '2D strekkodetype',
     'label2_2d_type_help'     => 'Format for 2D strekkoder',
     'label2_2d_target'        => '2D strekkodemål',
-    'label2_2d_target_help'   => 'URL-en 2D strekkoden peker til til når den blir skannet',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Feltdefinisjoner',
     'label2_fields_help'      => 'Feltene kan legges til, fjernes, og sorteres i venstre kolonne. For hvert felt kan flere alternativer for etikett og datakilde legges til, fjernes, og sorteres på nytt i høyre kolonne.',
     'help_asterisk_bold'    => 'Teksten som skrives inn som <code>**text**</code> vil vises som fet',
     'help_blank_to_use'     => 'La stå tom for å bruke verdien fra <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Standard',
     'none'                  => 'Ingen',
     'google_callback_help' => 'Dette bør angis som callback-URL-en i Google OAuth app innstillingene i organisasjonen din&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google utvikler konsoll <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -390,4 +385,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'bedriftens støtte, signatur, e-postformat, brukerformat, bilder, per side, miniatyrbilde, eula, graviter, forelder, dashbord, personvern',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'slett permanent',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/no-NO/admin/settings/message.php b/resources/lang/no-NO/admin/settings/message.php
index 9964e44a24cc..9a977fcf697f 100644
--- a/resources/lang/no-NO/admin/settings/message.php
+++ b/resources/lang/no-NO/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Noe gikk galt. :app svarte med: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/no-NO/general.php b/resources/lang/no-NO/general.php
index d463974fc55f..567bf33d5c9f 100644
--- a/resources/lang/no-NO/general.php
+++ b/resources/lang/no-NO/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Ingen treff.',
     'no'  					=> 'Nei',
     'notes'  				=> 'Notater',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Ordreummer',
     'only_deleted'          => 'Kun slettede ressurser',
     'page_menu'				=> 'Viser _MENU_ enheter',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/pl-PL/admin/settings/general.php b/resources/lang/pl-PL/admin/settings/general.php
index aa46797913ea..5d638a8a099a 100644
--- a/resources/lang/pl-PL/admin/settings/general.php
+++ b/resources/lang/pl-PL/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Dodatkowy tekst stopki ',
     'footer_text_help'          => 'Ten tekst pojawi się po prawej stronie stopki. Umieszczanie linków możliwe przy użyciu <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Przejścia linii, nagłowki, obrazki itp. dadzą nieokreślone rezultaty.',
     'general_settings'			=> 'Ustawienia ogólne',
-    'general_settings_keywords' => 'obsługa firmy, podpis, akceptacja, format e-mail, format nazwy użytkownika, obrazy, miniatura, eula, grawatar, tos, kokpit menedżerski, prywatność',
     'general_settings_help'     => 'Domyślna licencja i więcej',
     'generate_backup'			=> 'Stwórz Kopie zapasową',
     'google_workspaces'         => 'Obszary robocze Google',
@@ -154,7 +153,6 @@
     'php'                       => 'Wersja PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'Informacje o systemie PHP',
     'php_gd_info'               => 'Aby wyświetlić kody QR wymagana jest instalacja php-gd, sprawdź instrukcję.',
     'php_gd_warning'            => 'PHP Image Processing i GD plugin nie są zainstalowane.',
@@ -231,7 +229,6 @@
     'update'                    => 'Ustawienia Aktualizacji',
     'value'                     => 'Wartość',
     'brand'                     => 'Nagłówek',
-    'brand_keywords'            => 'stopka, logo, druk, motyw, skórka, nagłówek, kolory, kolor, css',
     'brand_help'                => 'Logo, Nazwa witryny',
     'web_brand'                 => 'Typ markowania witryny',
     'about_settings_title'      => 'O Ustawieniach',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtruj przez ustawienie słowa kluczowego',
     'security' => 'Bezpieczeństwo',
     'security_title' => 'Aktualizuj ustawienia zabezpieczeń',
-    'security_keywords' => 'hasło, hasła, wymagania, dwuskładnikowe, dwuskładnikowe, wspólne hasła, zdalne logowanie, wylogowanie, uwierzytelnianie',
     'security_help' => 'Weryfikacja dwuetapowa, wymagania haseł',
-    'groups_keywords' => 'uprawnienia, grupy uprawnień, autoryzacje',
     'groups_help' => 'Grupy uprawnień',
     'localization' => 'Lokalizacja',
     'localization_title' => 'Aktualizuj ustawienia lokalizacji',
-    'localization_keywords' => 'lokalizacja, waluta, lokalna, lokalna, lokalna, strefa czasowa, strefa czasowa, międzynarodowa, internatalizacja, język, tłumaczenie',
     'localization_help' => 'Język, wyświetlanie daty',
     'notifications' => 'Powiadomienia',
     'notifications_help' => 'Powiadomienia e-mail i ustawienia audytu',
     'asset_tags_help' => 'Zwiększanie i prefiksy',
     'labels' => 'Etykiety',
     'labels_title' => 'Aktualizuj ustawienia etykiety',
-    'labels_help' => 'Rozmiary etykiet i ustawienia',
-    'purge_keywords' => 'trwałe usunięcie',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     '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'   => 'Adres URL kodów kreskowych 2D w przypadku skanowania',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     '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' => '<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. ',
+    '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',
     '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>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        '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',
+        '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',
+        'security'          => 'hasło, hasła, wymagania, dwuskładnikowe, dwuskładnikowe, wspólne hasła, zdalne logowanie, wylogowanie, uwierzytelnianie',
+    ],
+
 ];
diff --git a/resources/lang/pl-PL/admin/settings/message.php b/resources/lang/pl-PL/admin/settings/message.php
index d369bee4de77..4b09bfa9ca9e 100644
--- a/resources/lang/pl-PL/admin/settings/message.php
+++ b/resources/lang/pl-PL/admin/settings/message.php
@@ -45,5 +45,6 @@
         '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.',
     ]
 ];
diff --git a/resources/lang/pl-PL/general.php b/resources/lang/pl-PL/general.php
index 93eb2f6493a9..2445c8e29d6a 100644
--- a/resources/lang/pl-PL/general.php
+++ b/resources/lang/pl-PL/general.php
@@ -216,6 +216,12 @@
     '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',
     'order_number'          => 'Numer zamówienia',
     'only_deleted'          => 'Tylko usunięte aktywa',
     'page_menu'				=> 'Wyświetla pozycje _MENU_',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php
index 1a783d7eaed5..4c2113198dc8 100644
--- a/resources/lang/pt-BR/admin/settings/general.php
+++ b/resources/lang/pt-BR/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Texto de rodapé adicional ',
     'footer_text_help'          => 'Este texto aparecerá no lado direito do rodapé. São permitidos o uso de hiperligações, utilizando <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. O uso de quebras de linha, cabeçalhos, imagens, etc... podem ter resultados imprevisíveis.',
     'general_settings'			=> 'Configuracoes Gerais',
-    'general_settings_keywords' => 'suporte à empresa, assinatura, aceitação, formato de e-mail, formato de nome de usuário, imagens, por página, miniatura, gravatar, por, painel, privacidade',
     'general_settings_help'     => 'EULA padrão e mais',
     'generate_backup'			=> 'Backup Criado',
     'google_workspaces'         => 'Espaços do Google',
@@ -154,7 +153,6 @@
     'php'                       => 'Versão do PHP',
     'php_info'                  => 'Informações do PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, informações',
     'php_overview_help'         => 'Informação do sistema PHP',
     'php_gd_info'               => 'Você deve instalar o php-gd para exibir códigos QR, veja as <a href="http://www.php.net/manual/en/image.installation.php">instruções de instalação</a>.',
     'php_gd_warning'            => 'O plugin PHP Image Processing and GD NÃO está instalado.',
@@ -231,7 +229,6 @@
     'update'                    => 'Atualizar Configurações',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'rodapé, logo, imprimir, tema, tema, skin, cabeçalho, cores, cor, css',
     'brand_help'                => 'Logotipo, Nome do Site',
     'web_brand'                 => 'Tipo de marca da web',
     'about_settings_title'      => 'Sobre as Configurações',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrar definindo a palavra-chave',
     'security' => 'Segurança',
     'security_title' => 'Atualizar Configurações de Segurança',
-    'security_keywords' => 'senha, senhas, requisitos, dois fatores, duas senhas, senha comum, logon remoto, logar, autenticação',
     'security_help' => 'Duas Factores, Restrições de Senha',
-    'groups_keywords' => 'permissões, grupos de permissão, autorização',
     'groups_help' => 'Grupos de permissão',
     'localization' => 'Localização',
     'localization_title' => 'Atualizar configurações de localização',
-    'localization_keywords' => 'localização, moeda, local, localidade, fuso horário, fuso horário, internacional, internatalização, idioma, tradução',
     'localization_help' => 'Idioma, exibição de data',
     'notifications' => 'Notificações',
     'notifications_help' => 'Alertas de e-mail e configurações de auditoria',
     'asset_tags_help' => 'Incrementando e prefixos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Atualizar configurações de etiqueta',
-    'labels_help' => 'Tamanho da etiqueta &amp; configurações',
-    'purge_keywords' => 'excluir permanentemente',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Código de barras do tipo 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Alvo de Código de Barras 2D',
-    'label2_2d_target_help'   => 'A URL para a qual o código de barras 2D aponta quando escaneado',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Definições de Campos',
     'label2_fields_help'      => 'Campos podem ser adicionados, removidos e reordenados na coluna esquerda. Para cada campo, várias opções de Rótulo e Fonte de Dados podem ser adicionadas, removidas e reordenadas na coluna direita.',
     'help_asterisk_bold'    => 'Texto digitado como <code>**texto**</code> será exibido como negrito',
     'help_blank_to_use'     => 'Deixe em branco para usar o valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Padrão',
     'none'                  => 'Nenhum',
     'google_callback_help' => 'Isto deve ser inserido como a URL de callback em suas configurações de aplicativo Google OAuth na sua organização&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">console de desenvolvedor do Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Quantos dias antes da data esperada de devolução de um ativo ele deve ser listado na página "Pendente para devolução"?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'rodapé, logo, imprimir, tema, tema, skin, cabeçalho, cores, cor, css',
+        'general_settings'  => 'suporte à empresa, assinatura, aceitação, formato de e-mail, formato de nome de usuário, imagens, por página, miniatura, gravatar, por, painel, privacidade',
+        'groups'            => 'permissões, grupos de permissão, autorização',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localização, moeda, local, localidade, fuso horário, fuso horário, internacional, internatalização, idioma, tradução',
+        'php_overview'      => 'phpinfo, sistema, informações',
+        'purge'             => 'excluir permanentemente',
+        'security'          => 'senha, senhas, requisitos, dois fatores, duas senhas, senha comum, logon remoto, logar, autenticação',
+    ],
+
 ];
diff --git a/resources/lang/pt-BR/admin/settings/message.php b/resources/lang/pt-BR/admin/settings/message.php
index 0450396ce541..e7a72172ce71 100644
--- a/resources/lang/pt-BR/admin/settings/message.php
+++ b/resources/lang/pt-BR/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Algo deu errado. :app respondeu com: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php
index 1e29a6d51aa1..487f5ba4d1b7 100644
--- a/resources/lang/pt-BR/general.php
+++ b/resources/lang/pt-BR/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Sem Resultados.',
     'no'  					=> 'Não',
     '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',
     'order_number'          => 'Número do Pedido',
     'only_deleted'          => 'Apenas Ativos Removidos',
     'page_menu'				=> 'Mostrando _MENU_ itens',
@@ -568,5 +574,8 @@
     'import_asset_tag_exists' => 'Um ativo com a etiqueta de ativo :asset_tag já existe e uma atualização não foi solicitada. Nenhuma alteração foi feita.',
     'countries_manually_entered_help' => 'Os valores com um asterisco (*) foram inseridos manualmente e não correspondem aos valores existentes na lista suspensa do 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',
 
 ];
diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php
index 76f63802d54b..743afc1ac1d8 100644
--- a/resources/lang/pt-PT/admin/settings/general.php
+++ b/resources/lang/pt-PT/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Texto de rodapé adicional',
     'footer_text_help'          => 'Este texto aparecerá no lado direito do rodapé. São permitidos o uso de hiperligações, utilizando <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. O uso de quebras de linha, cabeçalhos, imagens, etc... podem ter resultados imprevisíveis. ',
     'general_settings'			=> 'Configurações Gerais',
-    'general_settings_keywords' => 'suporte à empresa, assinatura, aceitação, formato de e-mail, formato de nome de usuário, imagens, por página, miniatura, gravatar, por, painel, privacidade',
     'general_settings_help'     => 'EULA padrão e mais',
     'generate_backup'			=> 'Gerar Backup',
     'google_workspaces'         => 'Espaços do Google',
@@ -154,7 +153,6 @@
     'php'                       => 'Versão do PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, informações',
     'php_overview_help'         => 'Informação do sistema PHP',
     'php_gd_info'               => 'Deve instalar a extensão php-gd para mostrar códigos QR, veja as instruções de instalação.',
     'php_gd_warning'            => 'O Processamento de Imagem PHP e o plugin GD não estão instalados.',
@@ -231,7 +229,6 @@
     'update'                    => 'Atualizar Configurações',
     'value'                     => 'Valor',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'rodapé, logo, imprimir, tema, skin, cabeçalho, cores, cor, css',
     'brand_help'                => 'Logótipo, Nome do Site',
     'web_brand'                 => 'Tipo de Marca na web',
     'about_settings_title'      => 'Sobre as Configurações',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrar pela palavra-chave',
     'security' => 'Segurança',
     'security_title' => 'Atualizar Configurações de Segurança',
-    'security_keywords' => 'senha, senhas, requisitos, dois fatores, senha comum, login remoto, login, autenticação',
     'security_help' => 'Dois Fatores, Restrições de palavra-passe',
-    'groups_keywords' => 'permissões, grupos de permissão, autorização',
     'groups_help' => 'Grupos de permissão de conta',
     'localization' => 'Localização',
     'localization_title' => 'Atualizar configurações de localização',
-    'localization_keywords' => 'localização, moeda, local, localidade, fuso horário, fuso horário, internacional, internacionalização, idioma, tradução',
     'localization_help' => 'Idioma, exibição de data',
     'notifications' => 'Notificações',
     'notifications_help' => 'Alertas de e-mail e configurações de auditoria',
     'asset_tags_help' => 'Incrementando e prefixos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Atualizar Configurações de Etiquetas',
-    'labels_help' => 'Tamanho da etiqueta &amp; configurações',
-    'purge_keywords' => 'apagar permanentemente',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Tipo de código de barras 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Alvo de Código de Barras 2D',
-    'label2_2d_target_help'   => 'A URL que o código de barras 2D apresenta quando digitalizado',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Definições de Campos',
     'label2_fields_help'      => 'Os campos podem ser adicionados, removidos, e reordenados na coluna da esquerda. Para cada campo, várias opções para Rótulo e Fonte de Dados podem ser adicionadas, removidas e reordenadas na coluna da direita.',
     'help_asterisk_bold'    => 'Texto digitado como <code>**texto**</code> será exibido como negrito',
     'help_blank_to_use'     => 'Deixe em branco para usar o valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Padrão',
     'none'                  => 'Nenhum',
     'google_callback_help' => 'Isto deve ser inserido como a URL de retorno de chamada nas configurações de aplicação do Google OAuth na sua organização&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">consola de desenvolvedor do Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Quantos dias antes do esperado check-in de um ativo deve ser listado na página "Due for checkin"?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'rodapé, logo, imprimir, tema, skin, cabeçalho, cores, cor, css',
+        'general_settings'  => 'suporte à empresa, assinatura, aceitação, formato de e-mail, formato de nome de usuário, imagens, por página, miniatura, gravatar, por, painel, privacidade',
+        'groups'            => 'permissões, grupos de permissão, autorização',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localização, moeda, local, localidade, fuso horário, fuso horário, internacional, internacionalização, idioma, tradução',
+        'php_overview'      => 'phpinfo, sistema, informações',
+        'purge'             => 'apagar permanentemente',
+        'security'          => 'senha, senhas, requisitos, dois fatores, senha comum, login remoto, login, autenticação',
+    ],
+
 ];
diff --git a/resources/lang/pt-PT/admin/settings/message.php b/resources/lang/pt-PT/admin/settings/message.php
index 12c4fc7f75a9..7449f17b28ca 100644
--- a/resources/lang/pt-PT/admin/settings/message.php
+++ b/resources/lang/pt-PT/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Algo deu erro. :app respondeu com: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php
index 6242b944ef52..3072e5f6ad58 100644
--- a/resources/lang/pt-PT/general.php
+++ b/resources/lang/pt-PT/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Sem Resultados.',
     'no'  					=> 'Não',
     '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',
     'order_number'          => 'Número de encomenda',
     'only_deleted'          => 'Apenas Artigos Excluídos',
     'page_menu'				=> 'Apresentando_MENU_items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/ro-RO/admin/settings/general.php b/resources/lang/ro-RO/admin/settings/general.php
index ed16686fe83b..794e95afdd79 100644
--- a/resources/lang/ro-RO/admin/settings/general.php
+++ b/resources/lang/ro-RO/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Textul suplimentar în subsol ',
     'footer_text_help'          => 'Acest text va apărea în subsolul din dreapta. Linkurile sunt permise folosind <a href="https://help.github.com/articles/github-flavored-markdown/">marcaje de tip Github</a>. Pauzele de linii, anteturile, imaginile etc. pot avea rezultate imprevizibile.',
     'general_settings'			=> 'setari generale',
-    'general_settings_keywords' => 'suport companie, signature, acceptance, e-mail format, nume de utilizator, imagini, per pagină, thumbnail, eula, gravatar, tos, dashboard, confidențialitate',
     'general_settings_help'     => 'EULA implicită și altele',
     'generate_backup'			=> 'Generați Backup',
     'google_workspaces'         => 'Spaţii de lucru Google',
@@ -154,7 +153,6 @@
     'php'                       => 'Versiune PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistem, info',
     'php_overview_help'         => 'Informaţii sistem PHP',
     'php_gd_info'               => 'Trebuie sa instalati php-gd ca sa afisati coduri QR, verificati instructiunile de instalare.',
     'php_gd_warning'            => 'PHP Image Processing si GD plugin NU sunt instalate.',
@@ -231,7 +229,6 @@
     'update'                    => 'Actualizeaza setari',
     'value'                     => 'Valoare',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, temă, piele, antet, culori, culoare, css',
     'brand_help'                => 'Logo, Nume site',
     'web_brand'                 => 'Tip de Branding Web',
     'about_settings_title'      => 'Despre Setări',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrează după setarea cuvântului cheie',
     'security' => 'Securitate',
     'security_title' => 'Actualizați setările de securitate',
-    'security_keywords' => 'parolă, parole, cerințe, doi factori, doi factori, parole comune, conectare la distanță, deconectare, autentificare',
     'security_help' => 'Dublu factor, Restricții la parolă',
-    'groups_keywords' => 'permisiuni, grupuri de permisiuni, autorizare',
     'groups_help' => 'Grupuri permisiuni cont',
     'localization' => 'Localizare',
     'localization_title' => 'Actualizați setările de localizare',
-    'localization_keywords' => 'localizare, monedă, locală, zonă-orar, fus orar, internațional, internatinalizare, limbă, limbă, traducere',
     'localization_help' => 'Limba, afişarea datei',
     'notifications' => 'Notificări',
     'notifications_help' => 'Setări Alerte & Audit Email',
     'asset_tags_help' => 'Creștere și prefixe',
     'labels' => 'Etichete',
     'labels_title' => 'Actualizați setările etichetei',
-    'labels_help' => 'Setări etichete &amp;',
-    'purge_keywords' => 'şterge permanent',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Tip de cod de bare 2D',
     'label2_2d_type_help'     => 'Format pentru coduri de bare 2D',
     'label2_2d_target'        => 'Ținta codului de bare 2D',
-    'label2_2d_target_help'   => 'URL-ul codului de bare 2D indică la momentul scanării',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Definiții câmp',
     'label2_fields_help'      => 'Câmpurile pot fi adăugate, șterse și reordonate în coloana din stânga. Pentru fiecare câmp, mai multe opțiuni pentru Etichetă și Sursă pot fi adăugate, eliminate și reordonate în coloana din dreapta.',
     'help_asterisk_bold'    => 'Textul introdus ca <code>**text**</code> va fi afișat ca îngroșat',
     'help_blank_to_use'     => 'Lăsați necompletat pentru a utiliza valoarea de la <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Implicit',
     'none'                  => 'Niciunul',
     'google_callback_help' => 'Acesta ar trebui introdus ca URL de apel invers în setările aplicației Google OAuth din organizația dvs.&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, temă, piele, antet, culori, culoare, css',
+        'general_settings'  => 'suport companie, signature, acceptance, e-mail format, nume de utilizator, imagini, per pagină, thumbnail, eula, gravatar, tos, dashboard, confidențialitate',
+        'groups'            => 'permisiuni, grupuri de permisiuni, autorizare',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localizare, monedă, locală, zonă-orar, fus orar, internațional, internatinalizare, limbă, limbă, traducere',
+        'php_overview'      => 'phpinfo, sistem, info',
+        'purge'             => 'şterge permanent',
+        'security'          => 'parolă, parole, cerințe, doi factori, doi factori, parole comune, conectare la distanță, deconectare, autentificare',
+    ],
+
 ];
diff --git a/resources/lang/ro-RO/admin/settings/message.php b/resources/lang/ro-RO/admin/settings/message.php
index 74b6c68f02a0..1c5ce7edfdaf 100644
--- a/resources/lang/ro-RO/admin/settings/message.php
+++ b/resources/lang/ro-RO/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Ceva nu a funcționat. :app a răspuns cu: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/ro-RO/general.php b/resources/lang/ro-RO/general.php
index 01ea02af2ecd..9daadbcde7da 100644
--- a/resources/lang/ro-RO/general.php
+++ b/resources/lang/ro-RO/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Nici un rezultat.',
     'no'  					=> 'Nr',
     'notes'  				=> 'Note',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Numar de ordine',
     'only_deleted'          => 'Numai active șterse',
     'page_menu'				=> 'Se afișează elementele _MENU_',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/ru-RU/admin/settings/general.php b/resources/lang/ru-RU/admin/settings/general.php
index 8fd622fbf0c1..786c8413cbe8 100644
--- a/resources/lang/ru-RU/admin/settings/general.php
+++ b/resources/lang/ru-RU/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Дополнительный текст нижнего колонтитула ',
     'footer_text_help'          => 'Этот текст будет отображаться в правой части нижнего колонтитула. Разрешается использовать ссылки следующего вида <a href="https://help.github.com/articles/github-flavored-markdown/">Github ароматизированные уценок</a>. Использование прочей HTML разметки, переводов строк, изображений - может привести к непредсказуемым результатам.',
     'general_settings'			=> 'Общие настройки',
-    'general_settings_keywords' => 'поддержка компании, подписание, принятие, формат электронной почты, формат имени пользователя, изображения, на страницу, эскизы, eula, Gravatar, tos, dashard, конфиденциальность',
     'general_settings_help'     => 'EULA по умолчанию и прочее',
     'generate_backup'			=> 'Создать резервную копию',
     'google_workspaces'         => 'Рабочие области Google',
@@ -154,7 +153,6 @@
     'php'                       => 'Версия PHP',
     'php_info'                  => 'Информация о PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Для отображения QR кодов необходимо установить модуль php-gd.',
     'php_gd_warning'            => 'Библиотеки PHP Image Processing и GD plugin не установлены.',
@@ -231,7 +229,6 @@
     'update'                    => 'Обновить настройки',
     'value'                     => 'Значение',
     'brand'                     => 'Фирменный стиль',
-    'brand_keywords'            => 'нижняя часть страницы, логотип, print, тема, оболочка, верхняя часть страницы, цветовая палитра, цвет, css',
     'brand_help'                => 'Логотип, Имя сайта',
     'web_brand'                 => 'Тип Web-Брендинга',
     'about_settings_title'      => 'О настройках',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Сортировать по ключевому слову',
     'security' => 'Безопасность',
     'security_title' => 'Обновить настройки безопасности',
-    'security_keywords' => 'пароль, пароли, требования, два фактора, два фактора, общие пароли, удаленный вход, выход из системы, аутентификация',
     'security_help' => 'Двухфакторная авторизация, ограничения паролей',
-    'groups_keywords' => 'разрешения, группы разрешений, авторизация',
     'groups_help' => 'Группы прав доступа',
     'localization' => 'Локализация',
     'localization_title' => 'Обновить настройки локализации',
-    'localization_keywords' => 'локализация, валюта, локальный, локаль, временная зона, интернационализация, язык, перевод',
     'localization_help' => 'Язык, формат даты',
     'notifications' => 'Уведомления',
     'notifications_help' => 'Настройки оповещений и аудита электронной почты',
     'asset_tags_help' => 'Инкременты и префиксы',
     'labels' => 'Этикетки',
     'labels_title' => 'Обновить настройки этикетки',
-    'labels_help' => 'Настройки &amp; размеров этикетки',
-    'purge_keywords' => 'удалить полностью',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Очистка удалённых записей',
     'ldap_extension_warning' => 'Похоже на вашем сервере не установлен или не включен модуль LDAP синхронизации. Вы можете сохранить ваши параметры, но вам потребуется установить\\включить модуль для PHP прежде выполнить синхронизацию с доменом.',
     'ldap_ad' => 'LDAP/Active Directory',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Тип 2D штрих-кода',
     'label2_2d_type_help'     => 'Формат 2D штрих-кодов',
     'label2_2d_target'        => 'Цель 2D штрих-кода',
-    'label2_2d_target_help'   => 'URL для 2D штрих-кодов указывает адрес сайта с активом/объектом',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Определения полей',
     'label2_fields_help'      => 'Поля могут быть добавлены, удалены и переупорядочены в левой колонке. Для каждого поля можно добавлять, удалять и переупорядочивать несколько параметров меток и DataSource.',
     'help_asterisk_bold'    => 'Текст, введенный как <code>**текст**</code> будет отображаться как жирный',
     'help_blank_to_use'     => 'Оставьте пустым, чтобы использовать значение из <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'По умолчанию',
     'none'                  => 'None',
     'google_callback_help' => 'Это должно быть введено как URL обратного вызова в настройках приложения Google OAuth в вашей организации&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">консоль разработчика Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Сколько дней до ожидаемого возврата актива должно быть указано на странице «Подлежит возврату»?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'нижняя часть страницы, логотип, print, тема, оболочка, верхняя часть страницы, цветовая палитра, цвет, css',
+        'general_settings'  => 'поддержка компании, подписание, принятие, формат электронной почты, формат имени пользователя, изображения, на страницу, эскизы, eula, Gravatar, tos, dashard, конфиденциальность',
+        'groups'            => 'разрешения, группы разрешений, авторизация',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'локализация, валюта, локальный, локаль, временная зона, интернационализация, язык, перевод',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'удалить полностью',
+        'security'          => 'пароль, пароли, требования, два фактора, два фактора, общие пароли, удаленный вход, выход из системы, аутентификация',
+    ],
+
 ];
diff --git a/resources/lang/ru-RU/admin/settings/message.php b/resources/lang/ru-RU/admin/settings/message.php
index 4e86e8ce7e16..84e3fc8b80da 100644
--- a/resources/lang/ru-RU/admin/settings/message.php
+++ b/resources/lang/ru-RU/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Что-то пошло не так. :app ответил: :error_message',
         'error_redirect' => 'ОШИБКА: 301/302 :endpoint возвращает редирект. По соображениям безопасности мы не переходим по редиректам. Пожалуйста, используйте фактическую конечную точку.',
         'error_misc' => 'Что-то пошло не так. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];
diff --git a/resources/lang/ru-RU/general.php b/resources/lang/ru-RU/general.php
index 8b9e253ea8e6..6b17455b8f4d 100644
--- a/resources/lang/ru-RU/general.php
+++ b/resources/lang/ru-RU/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Нет результатов.',
     'no'  					=> 'Нет',
     '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',
     'order_number'          => 'Номер заказа',
     'only_deleted'          => 'Только удаленные активы',
     'page_menu'				=> 'Показаны элементы _MENU_',
@@ -567,5 +573,8 @@
     'import_asset_tag_exists' => 'Актив с тегом актива :asset_tag уже существует и обновление не было запрошено. Изменения не были произведены.',
     'countries_manually_entered_help' => 'Значения со звездочкой (*) были введены вручную и не соответствуют существующим значениям выпадающего списка 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',
 
 ];
diff --git a/resources/lang/si-LK/admin/settings/general.php b/resources/lang/si-LK/admin/settings/general.php
index 6dcfee66be14..97567df8dfd4 100644
--- a/resources/lang/si-LK/admin/settings/general.php
+++ b/resources/lang/si-LK/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/si-LK/admin/settings/message.php b/resources/lang/si-LK/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/si-LK/admin/settings/message.php
+++ b/resources/lang/si-LK/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/si-LK/general.php b/resources/lang/si-LK/general.php
index a89021993085..f81d5b9148c9 100644
--- a/resources/lang/si-LK/general.php
+++ b/resources/lang/si-LK/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     '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',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/sk-SK/admin/hardware/general.php b/resources/lang/sk-SK/admin/hardware/general.php
index 533d4919129f..f6628da69f19 100644
--- a/resources/lang/sk-SK/admin/hardware/general.php
+++ b/resources/lang/sk-SK/admin/hardware/general.php
@@ -6,38 +6,37 @@
     'archived'  				=> 'Archivované',
     'asset'  					=> 'Majetok',
     'bulk_checkout'             => 'Vyskladniť majetky',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkin'              => 'Prevziať majetok',
     'checkin'  					=> 'Prevziať majetok',
     'checkout'  				=> 'Vyskladniť majetok',
     'clone'  					=> 'Duplikovať majetok',
     'deployable'  				=> 'Vyskladniteľný',
-    'deleted'  					=> 'This asset has been deleted.',
-    'delete_confirm'            => 'Are you sure you want to delete this asset?',
+    'deleted'  					=> 'Tento majetok bol zmazaný.',
+    'delete_confirm'            => 'Ste si istý, že chcete zmazať tento majetok?',
     'edit'  					=> 'Upraviť majetok',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    '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_deleted'  			=> 'Tento Model majetku bol zmazaný. Pred obnovením majetku musíte obnoviť model majetku.',
+    'model_invalid'             => 'Tento model je pre daný majetok neplatný.',
+    'model_invalid_fix'         => 'Tento majetok musí byť upravený. Použite platný model majetku predtým ako sa ho pokúsite prevziať alebo odovzdať alebo auditovať.',
     'requestable'               => 'Vyžiadateľný',
     'requested'				    => 'Vyžiadané',
-    'not_requestable'           => 'Not Requestable',
-    'requestable_status_warning' => 'Do not change requestable status',
+    'not_requestable'           => 'Nevyžiadateľný',
+    'requestable_status_warning' => 'Nemeniť stav vyžiadateľnosti',
     'restore'  					=> 'Obnoviť majetok',
     'pending'  					=> 'Čakajúce',
     'undeployable'  			=> 'Nevyskladniteľný',
-    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
+    'undeployable_tooltip'  	=> 'Tento majetok je v stave, ktorý neumožňuje odovzdanie a preto nemôže byť teraz odovzdaný.',
     'view'  					=> 'Zobraziť majetok',
-    'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
-    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
-    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
-    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
-    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
-    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
-    'error_messages' => 'Error messages:',
-    'success_messages' => 'Success messages:',
-    'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export',
-    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
-    'user_department' => 'User Department',
+    'csv_error' => 'V CSV súbore sa nachádza chyba:',
+    'import_text' => '<p>Nahrajte CSV súbor, ktorý obsahuje históriu majetku. Majetky a používatelia už MUSIA v systéme existovať, inak budú záznamy preskočené. Párovanie majetkov bude realizovaná na základe označenia majetku. Pokúsime sa nájsť zodpovedajúceho používateľa na základe zadaného mena používateľa a kritérií, ktoré vyberiete nižšie. Ak nižšie nevyberiete žiadne kritériá, pokúsi sa napárovať na základe tvaru používateľského mena, ktorý ste nakonfigurovali v časti <code>Nastavenia &gt; Všeobecné nastavenia</code>.</p><p>Polia zahrnuté v súbore CSV sa musia zhodovať s hlavičkami: <strong>Označenie majetku, Názov, Dátum odovzadnia, Dátum prijatia</strong>. Všetky ďaľšie polia budú ignorované. </p><p>Dátum prijatia: prázdne alebo dátum prijatia z budúcnosti budu spôsobia priradenie majetku zvolenému používateľovi. Nezahrnutím stĺpca Dátum prevzatia sa vytvorí dátum prevzatia s dnešným dátumom.</p>    ',
+    'csv_import_match_f-l' => 'Pokúsiť sa porovnať používateľov podľa tvaru <strong>meno.priezvisko</strong>  (<code>jane.smith</code>)',
+    'csv_import_match_initial_last' => 'Pokúsiť sa porovnať používateľov podľa tvaru <strong>inciálka mena priezvisko</strong> (<code>jsmith</code>)',
+    'csv_import_match_first' => 'Pokúsiť sa porovnať používateľov podľa tvaru <strong>meno</strong> (<code>jane</code>)',
+    'csv_import_match_email' => 'Pokúsiť sa porovnať používateľov <strong>email</strong> ako používateľského mena',
+    'csv_import_match_username' => 'Pokúsiť sa porovnať používateľov podľad <strong>používateľského mena</strong>',
+    'error_messages' => 'Chybové hlášky:',
+    'success_messages' => 'Výsledky:',
+    'alert_details' => 'Podrobnosti nájdete nižšie.',
+    'custom_export' => 'Uživateľsky definovaný export',
+    'mfg_warranty_lookup' => 'Vyhľadávanie stavu záruky :manufacturer',
+    'user_department' => 'Oddelenie používateľa',
 ];
diff --git a/resources/lang/sk-SK/admin/hardware/message.php b/resources/lang/sk-SK/admin/hardware/message.php
index ea6913c6168a..a06869857132 100644
--- a/resources/lang/sk-SK/admin/hardware/message.php
+++ b/resources/lang/sk-SK/admin/hardware/message.php
@@ -2,43 +2,43 @@
 
 return [
 
-    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		 => '<strong>Varovanie: </strong> Tento majetok bol označný ako nepriraditeľný. Ak došlo k zmene, prosím upravte aktuálny stav majetku.',
     'does_not_exist' 	 => 'Majetok neexistuje.',
-    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
-    'no_tag' 	         => 'No asset tag provided.',
-    'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
+    'does_not_exist_var' => 'Majetok s označením :asset_tag nebol nájdený.',
+    'no_tag' 	         => 'Nebolo zadané žiadne označenie majetku.',
+    'does_not_exist_or_not_requestable' => 'Tento majetok neexistuje alebo sa nedá vyžiadať.',
     'assoc_users'	 	 => 'Tento majetok je práve priradený používateľovi, preto nemôže byť odstránený. Prosim najprv odoberte majetok používateľovi, následne skúste znovu. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
-    'labels_generated'   => 'Labels were successfully generated.',
-    'error_generating_labels' => 'Error while generating labels.',
-    'no_assets_selected' => 'No assets selected.',
+    '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.',
 
     'create' => [
         'error'   		=> 'Majetok nebol vytvorený, prosím skúste znovu. :(',
         'success' 		=> 'Majetok bol úspešne vytvorený. :)',
-        'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</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',
+        'success_linked' => 'Majetok s označením :tag bol úspešne pridaný. <strong><a href=":link" style="color: white;">Kliknite sem pre zobrazenie</a></strong>.',
+        'multi_success_linked' => 'Majetok s označením :links bol úspešne pridaný.|:count majetkov bolo úspešne pridaných :links.',
+        'partial_failure' => 'Majetok sa nepodarilo pridať. Dôvod: :failuers|:count majetkov nebolo možné pridať. Dôvody: :failures',
     ],
 
     'update' => [
         'error'   			=> 'Majetok sa nepodarilo upraviť, skúste prosím znovu',
         'success' 			=> 'Majetok bol úspešne upravený.',
-        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
+        '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'  =>  'No assets were selected, so nothing was updated.',
-        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+        'no_assets_selected'  =>  'Neboli vybrané žiadne majetky, preto nebolo nič upravené.',
+        'assets_do_not_exist_or_are_invalid' => 'Vybratné majetky nemôzu 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'   => 'No assets were selected, so nothing was restored.', 
+        'nothing_updated'   => 'Nebol vybraný žiaden majetok, preto nebolo nič obnovené.', 
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Audit majetku nebol úspešný :error ',
         'success' 		=> 'Audit majetko bol úspešne zaznamenaný.',
     ],
 
@@ -56,16 +56,16 @@
     ],
 
     'import' => [
-        'import_button'         => 'Process Import',
+        'import_button'         => 'Spracovať import',
         'error'                 => 'Niektoré položky neboli správne naimportované.',
         'errorDetail'           => 'Nasledujúce položky neboli kvôli chybám importované.',
         'success'               => 'Súbor bol naimportovaný',
         'file_delete_success'   => 'Súbor bol úspešné odstránený',
         'file_delete_error'      => 'Súbor sa nepodarilo odstrániť',
-        'file_missing' => 'The file selected is missing',
-        'file_already_deleted' => 'The file selected was already deleted',
-        'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
-        'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'file_missing' => 'Vybraný súbor nebol nájdený',
+        'file_already_deleted' => 'Vybraný súbor už bol odstránený',
+        'header_row_has_malformed_characters' => 'Jeden alebo viacero stĺpcov obsahujú poškodené UTF-8 znaky',
+        'content_row_has_malformed_characters' => 'Jeden alebo viacero atribútov v prvom riadku obsahu obsahuje poškodené UTF-8 znaky',
     ],
 
 
@@ -85,8 +85,8 @@
     ],
 
     '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'   => '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é.',
     ],
 
     'checkin' => [
diff --git a/resources/lang/sk-SK/admin/kits/general.php b/resources/lang/sk-SK/admin/kits/general.php
index 2b5c2d9cd00b..2d803c0aec35 100644
--- a/resources/lang/sk-SK/admin/kits/general.php
+++ b/resources/lang/sk-SK/admin/kits/general.php
@@ -1,51 +1,51 @@
 <?php
 
 return [
-    'about_kits_title'                  => 'About Predefined Kits',
-    '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',
-    'update'                            => 'Update Predefined Kit',
-    'delete_success'                    => 'Kit was successfully deleted.',
-    'update_success'                    => 'Kit was successfully updated.',
-    'none_models'                       => 'There are not enough available assets for :model to checkout. :qty are required. ',
-    'none_licenses'                     => 'There are not enough available seats for :license to checkout. :qty are required. ',
-    'none_consumables'                  => 'There are not enough available units of :consumable to checkout. :qty are required. ',
-    'none_accessory'                    => 'There are not enough available units of :accessory to checkout. :qty are required. ',
-    'append_accessory'                  => 'Append Accessory',
-    'update_appended_accessory'         => 'Update appended Accessory',
-    'append_consumable'                 => 'Append Consumable',
-    'update_appended_consumable'        => 'Update appended Consumable',
-    'append_license'                    => 'Append license',
-    'update_appended_license'           => 'Update appended license',
-    'append_model'                      => 'Append model',
-    'update_appended_model'             => 'Update appended model',
-    'license_error'                     => 'License already attached to kit',
-    'license_added_success'             => 'License added successfully',
-    'license_updated'                   => 'License was successfully updated',
-    'license_none'                      => 'License does not exist',
-    'license_detached'                  => 'License was successfully detached',
-    'consumable_added_success'          => 'Consumable added successfully',
-    'consumable_updated'                => 'Consumable was successfully updated',
-    'consumable_error'                  => 'Consumable already attached to kit',
-    'consumable_deleted'                => 'Delete was successful',
-    'consumable_none'                   => 'Consumable does not exist',
-    'consumable_detached'               => 'Consumable was successfully detached',
-    'accessory_added_success'           => 'Accessory added successfully',
-    'accessory_updated'                 => 'Accessory was successfully updated',
-    'accessory_detached'                => 'Accessory was successfully detached',
-    'accessory_error'                   => 'Accessory already attached to kit',
-    'accessory_deleted'                 => 'Delete was successful',
-    'accessory_none'                    => 'The accessory does not exist',
-    'checkout_success'                  => 'Checkout was successful',
-    'checkout_error'                    => 'Checkout error',
-    'kit_none'                          => 'Kit does not exist',
-    'kit_created'                       => 'Kit was successfully created',
-    'kit_updated'                       => 'Kit was successfully updated',
-    'kit_not_found'                     => 'Kit not found',
-    'kit_deleted'                       => 'Kit was successfully deleted',
-    'kit_model_updated'                 => 'Model was successfully updated',
-    'kit_model_detached'                => 'Model was successfully detached',
-    'model_already_attached'            => 'Model already attached to kit',
+    'about_kits_title'                  => 'O preddefinovaných sadách',
+    'about_kits_text'                   => 'Preddefinované sady umožňujú rýchle odovzdanie sady položiek (majetky, licencie, atď.) používateľovi. Výhodu to ma v prípade, ak je proces nástupu rovnaký pri viacerých používateľoch a všetci dostávajú tie isté položky.',
+    'checkout'                          => 'Odovzdať sadu ',
+    'create_success'                    => 'Sada bol úspešne vytvorená.',
+    'create'                            => 'Vytvoriť preddefinovanú sadu',
+    'update'                            => 'Upraviť preddefinovanú sadu',
+    'delete_success'                    => 'Sada bol úspešne zmazaná.',
+    'update_success'                    => 'Sada bol úspešne upravená.',
+    'none_models'                       => 'Nie je k dispozícií dostatočný počet majetkov typu :model k odovzdaniu. Je potrebných :qty. ',
+    'none_licenses'                     => 'Nie je k dispozícií dostatočný počet licenčných miest pre :license k odovzdaniu. Je potrebných :qty. ',
+    'none_consumables'                  => 'Nie je k dispozícií dostatočný počet položiek :consumable k odovzdaniu. Je potrebných :qty. ',
+    'none_accessory'                    => 'Nie je k dispozícií dostatočný počet položiek :accessory k odovzdaniu. Je potrebných :qty. ',
+    'append_accessory'                  => 'Pripojiť príslušenstvo',
+    'update_appended_accessory'         => 'Upraviť pripojené príslušenstvo',
+    'append_consumable'                 => 'Pripojiť spotrebný materiál',
+    'update_appended_consumable'        => 'Upraviť pripojený spotrebný materiál',
+    'append_license'                    => 'Pripojiť licencie',
+    'update_appended_license'           => 'Upraviť pripojené licencie',
+    'append_model'                      => 'Pripojiť model',
+    'update_appended_model'             => 'Upraviť pripojený model',
+    'license_error'                     => 'Licencie sú už súčasťou sady',
+    'license_added_success'             => 'Licencia bola úspešne pridaná',
+    'license_updated'                   => 'Licensie bol úspešne upravená',
+    'license_none'                      => 'Licensia neexistuje',
+    'license_detached'                  => 'Licencia bola úspešne odpojená',
+    'consumable_added_success'          => 'Spotrebný materiál bol úspešne pridaný',
+    'consumable_updated'                => 'Spotrebný materiál bol úspešne upravený',
+    'consumable_error'                  => 'Spotrebná materiál je už súčasťou sady',
+    'consumable_deleted'                => 'Zmazanie bolo úspešné',
+    'consumable_none'                   => 'Spotrebný materiál neexistuje',
+    'consumable_detached'               => 'Spotrebný materiál bol úspešne odpojený',
+    'accessory_added_success'           => 'Príslušenstvo bolo úspešne pridané',
+    'accessory_updated'                 => 'Príslušenstvo bolo úspešne upravené',
+    'accessory_detached'                => 'Príslušenstvo bolo úspešne odpojené',
+    'accessory_error'                   => 'Príslúšenstvo je už súčasťou sady',
+    'accessory_deleted'                 => 'Zmazanie bolo úspešné',
+    'accessory_none'                    => 'Príslušenstvo neexistuje',
+    'checkout_success'                  => 'Odovzdanie bolo úspešné',
+    'checkout_error'                    => 'Pri odovzdaní nastala chyba',
+    'kit_none'                          => 'Sada neexistuje',
+    'kit_created'                       => 'Sada bol úspešne vytvorená',
+    'kit_updated'                       => 'Sada bola úspešne upravená',
+    'kit_not_found'                     => 'Sada nebol nájdená',
+    'kit_deleted'                       => 'Sada bola úspešne odstránená',
+    'kit_model_updated'                 => 'Model bol úspešne upravený',
+    'kit_model_detached'                => 'Model bol úspešne odpojený',
+    'model_already_attached'            => 'Model je už súčasťou sady',
 ];
diff --git a/resources/lang/sk-SK/admin/licenses/general.php b/resources/lang/sk-SK/admin/licenses/general.php
index f9a76e2e6673..e5f78139f0d6 100644
--- a/resources/lang/sk-SK/admin/licenses/general.php
+++ b/resources/lang/sk-SK/admin/licenses/general.php
@@ -2,51 +2,51 @@
 
 return array(
     'about_licenses_title'      => 'O licenciach',
-    'about_licenses'            => 'Licenses are used to track software.  They have a specified number of seats that can be checked out to individuals',
-    'checkin'  					=> 'Checkin License Seat',
-    'checkout_history'  		=> 'Checkout History',
-    'checkout'  				=> 'Checkout License Seat',
-    'edit'  					=> 'Edit License',
+    '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',
+    'edit'  					=> 'Upraviť licenciu',
     'filetype_info'				=> 'Podporované typy súborov: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip a rar.',
-    'clone'  					=> 'Clone License',
-    'history_for'  				=> 'History for ',
+    'clone'  					=> 'Duplikovať licenciu',
+    'history_for'  				=> 'História pre ',
     'in_out'  					=> 'Vsetup/Výstup',
-    'info'  					=> 'License Info',
-    'license_seats'  			=> 'License Seats',
-    'seat'  					=> 'Seat',
-    'seat_count'  				=> 'Seat :count',
-    'seats'  					=> 'Sídla',
-    'software_licenses'  		=> 'Software Licenses',
-    'user'  					=> 'User',
-    'view'  					=> 'View License',
-    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    'info'  					=> 'Informácie o licencii',
+    'license_seats'  			=> 'Počet slotov',
+    'seat'  					=> 'Slot',
+    'seat_count'  				=> 'Slot :count',
+    'seats'  					=> 'Sloty',
+    'software_licenses'  		=> 'Softvérové licencie',
+    'user'  					=> 'Používateľ',
+    'view'  					=> 'Podrobnosti o licencii',
+    'delete_disabled'           => 'Tieto licencie nemôžu byť zmazané pretože niektoré sloty sú stále odovzdané.',
     'bulk'                      =>
         [
             'checkin_all'           => [
-                'button'            => 'Checkin All Seats',
-                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
-                'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
-                'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
-                'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
-                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
+                'button'            => 'Prevziať všetky sloty',
+                'modal'             => 'Táto akcia prevezme jeden slot. | Táto akcia prevezme všetkých :checkedout_seats_count slotov tejto licencie.',
+                'enabled_tooltip'   => 'Prevziať všetky sloty tejto licencie od používateľov aj majetkov',
+                'disabled_tooltip'  => 'Táto akcia je zakázaná, keďže nie je odovzdaná žiadna licencia',
+                'disabled_tooltip_reassignable'  => 'Táto akcia je zakázaná pretože licencia nie je znovu priraditeľná',
+                'success'           => 'Licencia úspešne prevzatá! | Všetky licencie boli úspešne prevzaté!',
+                'log_msg'           => 'Hromadne prevziať v rozhraní pre správu licencií',
             ],
 
             'checkout_all'              => [
-                'button'                => 'Checkout All Seats',
-                'modal'                 => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. A user is considered available for this seat if they do not already have this license checked out to them, and the Auto-Assign License property is enabled on their user account.',
-                'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
-                'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
-                'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',
-                'error_no_seats'    => 'There are no remaining seats left for this license.',
-                'warn_not_enough_seats'    => ':count users were assigned this license, but we ran out of available license seats.',
-                'warn_no_avail_users'    => 'Nothing to do. There are no users who do not already have this license assigned to them.',
-                'log_msg'           => 'Checked out via bulk license checkout in license GUI',
+                'button'                => 'Odovzdať všetky sloty',
+                '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!',
+                '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í',
 
 
             ],
     ],
 
-    'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
-    'below_threshold_short' => 'This item is below the minimum required quantity.',
+    'below_threshold' => 'Zostáva už iba :remaining_count voľných slotov pre túto licenciu s nastaveným minimálnym množstvom :min_amt. Mali by ste zvážiť dokúpenie ďalších slotov.',
+    'below_threshold_short' => 'Táto položka je pod hranicou minimálneho požadovaného množstva.',
 );
diff --git a/resources/lang/sk-SK/admin/settings/general.php b/resources/lang/sk-SK/admin/settings/general.php
index 08741473ee3a..351878f7e258 100644
--- a/resources/lang/sk-SK/admin/settings/general.php
+++ b/resources/lang/sk-SK/admin/settings/general.php
@@ -9,12 +9,12 @@
     'ad_append_domain_help'     => 'Od používateľa nie je vyžadované používaľ tvar "username@domain.local", stačí keď použije "username".',
     'admin_cc_email'            => 'Kópia e-mailu',
     'admin_cc_email_help'       => 'Ak chcete poslať kópiu potvrdzujúceho emailu o prevzatí / odovzdaní, ktorý sa posiela používateľom, aj na ďalšiu e-mailovú adresu, tu ju zadajte. V opačnom prípade nechajte políčko prázdne.',
-    'admin_settings'            => 'Admin Settings',
+    'admin_settings'            => 'Admin nastavenia',
     'is_ad'				        => 'Toto je server typu Active Directory',
     'alerts'                	=> 'Upozornenia',
-    'alert_title'               => 'Update Notification Settings',
+    'alert_title'               => 'Upraviť nastavenia notifikácií',
     'alert_email'				=> 'Poslať varovania na adresu',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'    => 'Mailové adresy alebo distribučné zoznamy, na ktorý majú byť zasielané upozornenia, oddelené čiarkou',
     'alerts_enabled'			=> 'Povoliť varovania mailom',
     'alert_interval'			=> 'Interval pre varovania o exspirácií (v dňoch)',
     'alert_inv_threshold'		=> 'Interval pre varovania o skladových zásobách',
@@ -22,22 +22,22 @@
     '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'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date will be updated.',
+    '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.',
     'audit_warning_days'        => 'Prah výstrahy auditu',
     'audit_warning_days_help'   => 'Koľko dní dopredu by sme vás mali upozorňovať, keď je majetok čakajúci na audit?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_assets'		=> 'Generovať automatické inkrementálne označenie majetku',
     'auto_increment_prefix'		=> 'Predpona (volitelna)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'auto_incrementing_help'    => 'Pre nastavenie musíte najprv povoliť automaticky generované označenie majetku',
     'backups'					=> 'Zálohy',
-    'backups_help'              => 'Create, download, and restore backups ',
+    'backups_help'              => 'Vytvoriť, stiahnuť a obnoviť zálohy ',
     'backups_restoring'         => 'Obnovenie zo zálohy',
-    'backups_clean' => 'Clean the backed-up database before restore',
-    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
-    'backups_upload'            => 'Upload Backup',
-    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
-    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
+    'backups_clean' => 'Vyčistiť zálohovanú databázu pred obnovou',
+    'backups_clean_helptext' => "Toto môže byť užitočne ak prepínate medzi dvoma databázovými verziami",
+    'backups_upload'            => 'Nahrať zálohu',
+    'backups_path'              => 'Zálohy na servery sú uložené v <code>:path</code>',
+    'backups_restore_warning'   => 'Použijte tlačítko obnoviť <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> pre obnovenie z predchádzajúcej zálohy. (Toto v súčasnosti dobre nefunguje s S3 úložiskom alebo Dockerom.).<br><br>Vaša <strong>celá databáza :app_name a všetky nahrané súbory budú kompletne nahradené</strong> tím, čo je v záložnom súbore.  ',
+    'backups_logged_out'         => 'Všetci existujúci používatelia vrátane Vás budú odhlásení, keď sa ukončí obnova.',
+    'backups_large'             => 'Veľmi veľké zálohy môžu naraziť na časový limit počas pokusu o obnovu a možno budú musieť byť spustené cez príkazový riadok. ',
     'barcode_settings'			=> 'Nastavnia čiarového kódu',
     'confirm_purge'			    => 'Potvrdiť čistenie',
     'confirm_purge_help'		=> 'Zadajte text "DELETE" do políčka nižšie k vyčisteniu odmazaných záznamov. Táto akcia je nenávratná, natrvalo odstrání všetky položky a užívateľov označených na odstránenie. (Mali by ste si pre istotu najprv spraviť zálohu.)',
@@ -51,92 +51,91 @@
     'default_eula_text'			=> 'Predvolená EULA',
     'default_language'			=> 'Predvolený jazyk',
     'default_eula_help_text'	=> 'Môžete tiež spojiť vlasnú EULA so špecifickými kategóriami majetku.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Pridajte poznámku pre Vaše rozhodnutie (voliteľné)',
     'display_asset_name'        => 'Zobraziť názov majetku',
     'display_checkout_date'     => 'Zobraziť dátum odovzdania',
     'display_eol'               => 'Zobraziť EOL v tabuľkovom zobrazení',
-    'display_qr'                => 'Display 2D barcode',
+    'display_qr'                => 'Zobraziť 2D čiarový kód',
     'display_alt_barcode'		=> 'Zobraziť 1D čiarový kód',
     'email_logo'                => 'E-mail logo',
     'barcode_type'				=> 'Typ 2D čiarového kódu',
     'alt_barcode_type'			=> 'Typ 1D čiarového kódu',
     'email_logo_size'       => 'Štvorcové logá vypadajú v mailoch najlepšie. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Povolené',
     'eula_settings'				=> 'EULA nastavenia',
     'eula_markdown'				=> 'Táto EULA umožňuje <a href="https://help.github.com/articles/github-flavored-markdown/">Github markdown</a>.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
-    'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
-    'footer_text'               => 'Additional Footer Text ',
-    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'favicon_format'            => 'Akceptované typy súborov sú ico, png a gif. Ostatné typy obrázkov nemusia správne fungovať vo všetkých prehliadačoch.',
+    'favicon_size'          => 'Favikony by mali byť štvorcové obrázky s rozmermi 16 x 16 pixelov.',
+    'footer_text'               => 'Dodatočný text do pätičky ',
+    'footer_text_help'          => 'Tento text sa zobrazí v pravej strane pätičky. Odkazy sú povolené pomocou <a href="https://help.github.com/articles/github-flavored-markdown/">Githubom podporovanou markdown syntaxou</a>. Zalamovanie riadkov, hlavičky, obrázky atď.môžu mať za následok nepredvídateľné výsledky.',
     'general_settings'			=> 'Všeobecné nastavenia',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
-    'generate_backup'			=> 'Generate Backup',
+    'general_settings_help'     => 'Predvolená EULA a ďalšie',
+    'generate_backup'			=> 'Vytvoriť zálohu',
     'google_workspaces'         => 'Google Workspaces',
-    'header_color'              => 'Header Color',
+    'header_color'              => 'Farba hlavičky',
     'info'                      => 'Tieto nastavenia umožňujú upraviť vybrané aspekty Vašej inštalácie.',
-    'label_logo'                => 'Label Logo',
-    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
-    'laravel'                   => 'Laravel Version',
+    'label_logo'                => 'Logo štítku',
+    'label_logo_size'           => 'Štvorcové logá vypadajú najlepšie - budú zobrazené hore vpravo v každom štítku majetku.',
+    'laravel'                   => 'Verzia Laravelu',
     'ldap'                      => 'LDAP',
-    'ldap_default_group'        => 'Default Permissions Group',
-    'ldap_default_group_info'   => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.',
-    'no_default_group'          => 'No Default Group',
+    'ldap_default_group'        => 'Predvolená skupina oprávnení',
+    'ldap_default_group_info'   => 'Vyberte skupinu, ktorú chcete priradiť novým používateľom. Nezabudnite, že používateľ preberá oprávnenia skupiny, ktorá je mu priradená.',
+    'no_default_group'          => 'Žiadna predvolená skupina',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'Kľúč TLS na strane klienta LDAP',
-    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
-    'ldap_enabled'              => 'LDAP enabled',
-    'ldap_integration'          => 'LDAP Integration',
-    'ldap_settings'             => 'LDAP Settings',
+    'ldap_client_tls_cert'      => 'LDAP klientský TLS certifikát',
+    'ldap_enabled'              => 'LDAP povolený',
+    'ldap_integration'          => 'LDAP integrácia',
+    'ldap_settings'             => 'LDAP nastavenia',
     'ldap_client_tls_cert_help' => 'Certifikát a kľúč TLS na strane klienta pre pripojenia LDAP sú zvyčajne užitočné iba v konfiguráciách služby Google Workspace so zabezpečeným protokolom LDAP. Obe sú povinné.',
-    'ldap_location'             => 'LDAP Location',
-'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
-    '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_server_cert'			=> 'LDAP SSL certificate validation',
-    'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
-    'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
-    'ldap_tls'                  => 'Use TLS',
-    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
-    'ldap_uname'                => 'LDAP Bind Username',
-    'ldap_dept'                 => 'LDAP Department',
-    'ldap_phone'                => 'LDAP Telephone Number',
-    'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
-    '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_username_field'       => 'Username Field',
+    'ldap_location'             => 'LDAP lokalita',
+'ldap_location_help'             => 'Pole Ldap lokalita by sa malo použiť, ak <strong>sa OU nepoužíva v základne väzbe DN.</strong> Nechajte toto prázdne, ak sa používa OU vyhľadávanie.',
+    'ldap_login_test_help'      => 'Zadajte platné LDAP používateľské meno a heslo zo základného DN, ktoré ste špecifikovali vyššie a vyskúšajte, či je LDAP prihlásenie správne nakonfigurované. NAJPRV JE POTREBNÉ ULOŽIŤ ZEMENY V LDAP NASTAVENIACH.',
+    'ldap_login_sync_help'      => 'Táto akcia iba testuje, či funguje LDAP synchronizácia. Ak overovací LDAP dotaz nie je správny, používatelia môžu mať naďalej problém s prihlásením. MUSÍTE NAJPRV ULOŽIŤ ZMENU V LDAP NASTAVENIACH.',
+    'ldap_manager'              => 'LDAP manažér',
+    'ldap_server'               => 'LDAP server',
+    'ldap_server_help'          => 'Musí začínať s ldap:// (pre nešifrované spojenie) alebo ldaps:// (pre TLS alebo SSL)',
+    'ldap_server_cert'			=> 'Validácia LDAP SSL certifikátu',
+    'ldap_server_cert_ignore'	=> 'Povoliť neplatný SSL certifikát',
+    'ldap_server_cert_help'		=> 'Zaškrtnite toto políčko, ak používate SSL certifikát s vlastným podpisom a chcete akceptovať neplatný certifikát SSL.',
+    'ldap_tls'                  => 'Použiť TLS',
+    'ldap_tls_help'             => 'Zaškrtnite toto políčko iba ak používate STARTTLS na Vašom LDAP servery. ',
+    'ldap_uname'                => 'LDAP používateľské meno spojenia',
+    'ldap_dept'                 => 'LDAP oddelenie',
+    'ldap_phone'                => 'LDAP telefónne číslo',
+    'ldap_jobtitle'             => 'LDAP názov pozície',
+    'ldap_country'              => 'LDAP krajina',
+    '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_username_field'       => 'Pole s používateľským menom',
     'ldap_lname_field'          => 'Priezvisko',
-    'ldap_fname_field'          => 'LDAP First Name',
-    'ldap_auth_filter_query'    => 'LDAP Authentication query',
-    'ldap_version'              => 'LDAP Version',
+    'ldap_fname_field'          => 'LDAP meno',
+    'ldap_auth_filter_query'    => 'LDAP overovací dotaz',
+    'ldap_version'              => 'LDAP verzia',
     'ldap_active_flag'          => 'LDAP Active Flag',
-    '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_emp_num'              => 'LDAP Employee Number',
-    'ldap_email'                => 'LDAP Email',
+    'ldap_activated_flag_help'  => 'Tato hodnota se používa k určeniu, či se synchronizovaný používateľ môze prihlásiť do Snipe-IT. <strong>To neovplyvňuje schopnosť prevziať alebo odovzdať položky</strong> a mal by to byť <strong>názov atribútu</strong> v rámci vášho AD/LDAP, <strong>nie hodnota</strong>. <br><br>Ak je v tomto poli zadaný názov poľa, ktoré neexistuje vo vašom AD/LDAP alebo je hodnota v poli AD/LDAP nastavená na <code>0</code> alebo <code>nepravda</code>, prihlasovanie používateľa <strong>bude zakázané</strong>. Ak je hodnota v poli AD/LDAP nastavená na <code>1</code> alebo <code>pravda</code> alebo <em>akýkoľvek iný text</em>, používateľ sa môže prihlásiť. Pokiaľ je pole prázdne vo vašom AD, rešpektujeme atribút <code>userAccountControl</code>, který obvykle umožňuje nepozastaveným používateľom sa prihlásiť.',
+    'ldap_emp_num'              => 'LDAP číslo zamestnanca',
+    'ldap_email'                => 'LDAP mail',
     'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_test_sync'            => 'Testovať LDAP synchronizáciu',
     'license'                   => 'Softvérová licencia',
-    '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'               => 'Načítať externých avatarov',
+    'load_remote_help_text'		=> 'Odkliknite toto pole ak vaša inštancia nemôže načítavať skripty z internetu. Toto znemožní Snipe-IT, aby sa pokúšal načítať avatary z Gravatar alebo externých zdrojov.',
     'login'                     => 'Pokusy o prihlásenie',
     'login_attempt'             => 'Pokus o prihlásenie',
     'login_ip'                  => 'IP adresa',
-    'login_success'             => 'Success?',
+    'login_success'             => 'Hotovo?',
     'login_user_agent'          => 'User Agent',
-    'login_help'                => 'List of attempted logins',
-    'login_note'                => 'Login Note',
-    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
-    'login_remote_user_text'    => 'Remote User login options',
-    'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
-    'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
+    'login_help'                => 'Zoznam pokusov o prihlásenie',
+    'login_note'                => 'Poznámka k prihláseniu',
+    'login_note_help'           => 'Volitelne môžete na zadať niekoľko viet, ktoré sa zobrazia na prihlasovacej obrazovke, napríklad pomôcť ľuďom, ktorí našli stratené nebo ukradnuté zariadenia. Toto pole akceptuje značku podporovanú <a href="https://help.github.com/articles/github-flavored-markdown/">Github štýlom markdownu</a>',
+    'login_remote_user_text'    => 'Nastavenia vzdialeného prihlásenia používateľa',
+    'login_remote_user_enabled_text' => 'Povoliť prihlásenie s hlavičkou vzdialený používateľ',
+    'login_remote_user_enabled_help' => 'Tato voľba zapne overovanie prostredníctvom hlavičky REMOTE_USER v súlade s „Common Gateway Interface (rfc3875)“',
     'login_common_disabled_text' => 'Zakázať ostatné spôsoby overovania',
     'login_common_disabled_help' => 'Táto možnosť zakáže ostatné metódy prihlasovania. Povoľte túto možnosť iba ak ste si istý, že Váše REMOTE_USER prihlasovanie už funguje',
     'login_remote_user_custom_logout_url_text' => 'Vlastná URL pre odhlásenie',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP verzia',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, systém, info',
     'php_overview_help'         => 'PHP systémové info',
     'php_gd_info'               => 'Musíte nainštalovať php-gd ak chcete zobrazovať QR kódu. Viac v inštalačnej príručke.',
     'php_gd_warning'            => 'PHP plugin pre spracovanie obrázkov a GD plugin nie sú nainštalované.',
@@ -204,23 +202,23 @@
     'show_images_in_email'     => 'Zobraziť obrázky v mailoch',
     'show_images_in_email_help'   => 'Odznačne toto políčko ak je Vaša Snipe-IT inštalácia za VPN alebo uzavretou sieťou a používatelia mimo siete nebudú mocť zobraziť obrázky z tejto inštancie v ich mailoch.',
     'site_name'                 => 'Názov stránky',
-    'integrations'               => 'Integrations',
+    'integrations'               => 'Integrácie',
     'slack'                     => 'Slack',
-    'general_webhook'           => 'General Webhook',
+    'general_webhook'           => 'Všeobecný Webhook',
     'ms_teams'                  => 'Microsoft Teams',
     'webhook'                   => ':app',
-    'webhook_presave'           => 'Test to Save',
-    'webhook_title'               => 'Update Webhook Settings',
-    'webhook_help'                => 'Integration settings',
+    'webhook_presave'           => 'Testovať pred uložením',
+    'webhook_title'               => 'Aktualizovať nastavenia Webhooku',
+    'webhook_help'                => 'Nastavenia integrácie',
     'webhook_botname'             => ':app Botname',
-    'webhook_channel'             => ':app Channel',
-    'webhook_endpoint'            => ':app Endpoint',
-    'webhook_integration'         => ':app Settings',
-    'webhook_test'                 =>'Test :app integration',
-    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
-    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
-    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
-    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'webhook_channel'             => ':app kanál',
+    'webhook_endpoint'            => ':app endpoint',
+    'webhook_integration'         => ':app nastavenia',
+    'webhook_test'                 =>'Otestovať integráciu :app',
+    'webhook_integration_help'    => '"app je voliteľná, avšak endpoint a kanál sú povinné ak ich chcete používať. K nastaveniu integrácie s :app musíte najprv <a href=":webhook_link" target="_new" rel="noopener">vytvoriť prichádzajúci webhook</a> vo vačom :app účte. Kliknite na tlačidlo <strong>Otestovať integráciu :app</strong> pre potvrdenie správnosti vašich nastavení pred uložením. ',
+    'webhook_integration_help_button'    => 'Po uložení nastavení :app sa zobrazí tlačidlo na ich otestovanie.',
+    'webhook_test_help'           => 'Otestuje či je vaša :app integrácia nastavená správne. MUSÍTE NAJPRV ULOŽIŤ AKTUALIZOVANÉ NASTAVENIA :app.',
+    'shortcuts_enabled'         => 'Povoliť skratky',
     'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT verzia',
     'support_footer'            => 'Odkaz v záhlaví na podporu ',
@@ -231,7 +229,6 @@
     'update'                    => 'Aktualizovať nastavenia',
     'value'                     => 'Hodnota',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'päta, logo, tlač, téma, skin, hlavička, farby, farba, css',
     'brand_help'                => 'Logo, Názov stránky',
     'web_brand'                 => 'Typ webového brandingu',
     'about_settings_title'      => 'O nastaveniach',
@@ -244,7 +241,7 @@
     'privacy_policy'            => 'Zásady ochrany osobných údajov',
     'privacy_policy_link_help'  => 'Ak je url adresa špecifikovaná, odkaz na zásady ochrany osobných údajov bude vložený do pätičky stránka a do každého odoslaného mailu, v súlade s GDPR. ',
     'purge'                     => 'Odstrániť odmazané záznamy',
-    'purge_deleted'             => 'Purge Deleted ',
+    'purge_deleted'             => 'Odstrániť zmazané ',
     'labels_display_bgutter'    => 'Spodný okraj štítkov',
     'labels_display_sgutter'    => 'Bočný okraj štítkov',
     'labels_fontsize'           => 'Veľkosť písma štítkov',
@@ -256,137 +253,148 @@
     'inches'        => 'palce',
     'width_w'        => 'š',
     'height_h'        => 'h',
-    'show_url_in_emails'                => 'Link to Snipe-IT in Emails',
-    'show_url_in_emails_help_text'      => 'Uncheck this box if you do not wish to link back to your Snipe-IT installation in your email footers. Useful if most of your users never login. ',
+    'show_url_in_emails'                => 'Odkaz na Snipe-IT v mailoch',
+    'show_url_in_emails_help_text'      => 'Zrušte zaškrtnutie tohoto políčka, ak nechcete odkazovať späť na inštaláciu Snipe-IT v pätičke vašich mailov. Užitočné, ak sa väčšina vašich používateľov nikdy neprihlasuje. ',
     'text_pt'        => 'pt',
-    'thumbnail_max_h'   => 'Max thumbnail height',
-    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
-    'two_factor'        => 'Two Factor Authentication',
-    'two_factor_secret'        => 'Two-Factor Code',
-    'two_factor_enrollment'        => 'Two-Factor Enrollment',
-    'two_factor_enabled_text'        => 'Enable Two Factor',
-    'two_factor_reset'        => 'Reset Two-Factor Secret',
-    'two_factor_reset_help'        => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
-    'two_factor_reset_success'          => 'Two factor device successfully reset',
-    'two_factor_reset_error'          => 'Two factor device reset failed',
-    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
-    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
-    'two_factor_optional'        => 'Selective (Users can enable or disable if permitted)',
-    'two_factor_required'        => 'Required for all users',
-    'two_factor_disabled'        => 'Disabled',
-    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
-    'two_factor_config_complete'	=> 'Submit Code',
-    'two_factor_enabled_edit_not_allowed' => 'Your administrator does not permit you to edit this setting.',
-    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
-    'require_accept_signature'      => 'Require Signature',
-    'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
-    '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.',
-    'left'        => 'left',
-    'right'        => 'right',
-    'top'        => 'top',
-    'bottom'        => 'bottom',
-    'vertical'        => 'vertical',
-    'horizontal'        => 'horizontal',
-    'unique_serial'                => 'Unique serial numbers',
-    'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
-    'zerofill_count'        => 'Length of asset tags, including zerofill',
-    'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
+    'thumbnail_max_h'   => 'Maximálna výška náhľadových obrázkov',
+    'thumbnail_max_h_help'   => 'Maximálna výška v pixeloch pre zobrazenie náhľadového obrázku v zozname položiek. Min 25, max 500.',
+    'two_factor'        => 'Dvojfaktorová autentifikácia',
+    'two_factor_secret'        => 'Kód dvojfaktorovej autentifikácie',
+    'two_factor_enrollment'        => 'Aktivácia dvojfaktorovej autentifikácie',
+    'two_factor_enabled_text'        => 'Povoliť druhý faktor',
+    'two_factor_reset'        => 'Resetnúť druhý faktor',
+    'two_factor_reset_help'        => 'To používateľa donúti znovu prejsť procesom aktivácie v autentifikačnej aplikácií. Môže byť užitočné, ak pôvodné zariadenie používateľa bolo stratené alebo ukradnuté. ',
+    'two_factor_reset_success'          => 'Resetovanie zariadenia pre druhý faktor bolo úspešné',
+    'two_factor_reset_error'          => 'Resetovanie zariadenia pre druhý faktor zlyhalo',
+    'two_factor_enabled_warning'        => 'Povolenie dvojfaktorového zabezpečenia, ak už nie je v súčasnej dobe povolené, vás okamžite donúti k overeniu pomocou zariadenia s aktivovaným Google Auth. Ak nie je v súčasnosti žiadne zariadenie aktivované, budete mať možnosť aktivovať svoje zariadenie.',
+    'two_factor_enabled_help'        => 'Toto zapne dvojfaktorovú autentifikáciu s využitím služby Google Authenticator.',
+    'two_factor_optional'        => 'Selektívne (Používatelia môžu povoliť alebo zakázať ak je povolené)',
+    'two_factor_required'        => 'Vyžadovať pre všetkých používateľov',
+    'two_factor_disabled'        => 'Zakázané',
+    'two_factor_enter_code'	=> 'Zadaje dvojfaktorový kód',
+    'two_factor_config_complete'	=> 'Odoslať kód',
+    'two_factor_enabled_edit_not_allowed' => 'Správca vám neumožňuje upraviť toto nastavenie.',
+    '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.',
+    'left'        => 'vľavo',
+    'right'        => 'vpravo',
+    'top'        => 'hore',
+    'bottom'        => 'dole',
+    'vertical'        => 'vertikálne',
+    'horizontal'        => 'horizontálne',
+    'unique_serial'                => 'Unikátne sériové čísla',
+    'unique_serial_help_text'                => 'Zaškrtnutím tohto políčka sa aktivuje overovanie unikátnosti sériového čísla majetku',
+    'zerofill_count'        => 'Dĺžka označenia majetku, vrátane doplnených núl',
+    'username_format_help'   => 'Toto nastavenie bude použité počas importu ak používateľ nie je zadaný alebo je potrebné generovať používateľské meno.',
     'oauth_title' => 'OAuth API nastavenia ',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Klienti OAuth',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Oauth Endpoint Settings',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_help' => 'Nastavení koncových bodov Oauth',
+    'oauth_no_clients' => 'Zatiaľ ste nevytvorili žiadneho Oauth klienta.',
     'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_authorized_apps' => 'Autorizované aplikácie',
+    'oauth_redirect_url' => 'URL presmerovania',
+    'oauth_name_help' => ' Niečo čo vaši používateliarozpoznajúú a budú považovať za dôveryhodné.',
     'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
-    'asset_tag_title' => 'Update Asset Tag Settings',
-    'barcode_title' => 'Update Barcode Settings',
+    'oauth_callback_url' => 'Adresa URL spätného volania autorizácie vašej aplikácie.',
+    'create_client' => 'Vytvoriť klienta',
+    'no_scopes' => 'Žiadne scopes',
+    'asset_tag_title' => 'Aktualizovať nastavenia označenia majetku',
+    'barcode_title' => 'Aktualizovať nastavenia čiarových kódov',
     'barcodes' => 'Čiarové kódy',
     'barcodes_help_overview' => 'Čiarový kód &amp; QR nastavenia',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
+    'barcodes_help' => 'Toto se pokúsi odstrániť čiarové kódy z medzipamäte. Obvykle se používa v prípade, keď došlo k zmene nastavení čiarového kódu alebo v prípade, že se zmenila URL adresa Snipe-IT. Kódy budú vygenerované znovu.',
     'barcodes_spinner' => 'Pokus o mazanie súborov...',
     'barcode_delete_cache' => 'Vymazať cache čiarových kódov',
     'branding_title' => 'Aktualizovať nastavenia značky',
     'general_title' => 'Aktualizovať všeobecné nastavenia',
     'mail_test' => 'Poslať Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
+    'mail_test_help' => 'Pokúsi sa odoslať testovací mail na adresu :replyto.',
+    'filter_by_keyword' => 'Filtrovať podľa kľúčového slova',
     'security' => 'Zabezpečenie',
     'security_title' => 'Aktualizovať nastavenia zabezpečenia',
-    'security_keywords' => 'heslo, heslá, požiadavky, dvoj faktorové, dvoj-faktorové, bežné heslá, vzdialené prihlásenie, odhlásenie, autentifikácia',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+    'security_help' => 'Dvojfaktor, obmedzenia hesiel',
+    'groups_help' => 'Skupiny oprávnení k účtu',
+    'localization' => 'Lokalizácia',
+    'localization_title' => 'Aktualizovať nastavenia lokalizácie',
     'localization_help' => 'Jazyk, zobrazenie dátumu',
     'notifications' => 'Notifikácie',
-    'notifications_help' => 'Email Alerts & Audit Settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
+    'notifications_help' => 'Mailové upozornenia a nastavenia intentúry',
+    'asset_tags_help' => 'Zvyšovanie a prefixy',
     'labels' => 'Štítky',
     'labels_title' => 'Aktualizovať nastavenia štítka',
-    'labels_help' => 'Veľkosti štítka &amp; nastavenia',
-    'purge_keywords' => 'natrvalo odstrániť',
+    'labels_help' => 'Čiarové kód &amp; nastavenie štítkov',
     'purge_help' => 'Odstrániť odmazané záznamy',
-    '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_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',
     'employee_number' => 'Číslo zamestnanca',
     'create_admin_user' => 'Vytvoriť Užívateľa ::',
     'create_admin_success' => 'Úspech! Váš admin užívateľ bol pridaný!',
-    'create_admin_redirect' => 'Click here to go to your app login!',
+    'create_admin_redirect' => 'Kliknite sem pre prihlásenie do aplikácie!',
     'setup_migrations' => 'Migrácie databázy ::',
-    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
-    'setup_successful_migrations' => 'Your database tables have been created',
-    'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
+    'setup_no_migrations' => 'Nenašlo sa nič na migráciu. Tabuľky vašej databázy už boli nastavené!',
+    'setup_successful_migrations' => 'Tabuľky vašej databázy už boli vytovrené',
+    'setup_migration_output' => 'Výstup z migrácie:',
+    'setup_migration_create_user' => 'Ďalej: Vytvoriť používateľa',
     'ldap_settings_link' => 'Stránka nastavenia LDAP',
-    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
-    'label2_enable'           => 'New Label Engine',
-    'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
-    'label2_template'         => 'Template',
-    'label2_template_help'    => 'Select which template to use for label generation',
+    'slack_test' => 'Otestovať <i class="fab fa-slack"></i> integráciu',
+    'label2_enable'           => 'Nový systém štítkovania',
+    'label2_enable_help'      => 'Prepnúť na nový systém štítkovania. <b>Poznámka: Musíte uložiť toto nastavenie pred zmenou ďalších nastavení.</b>',
+    'label2_template'         => 'Šablóna',
+    'label2_template_help'    => 'Vyberte šablónu, ktorú chcete použiť pre generovanie štítkov',
     'label2_title'            => 'Názov',
-    'label2_title_help'       => 'The title to show on labels that support it',
-    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
-    'label2_asset_logo'       => 'Use Asset Logo',
-    'label2_asset_logo_help'  => 'Use the logo of the asset&apos;s assigned company, rather than the value at <code>:setting_name</code>',
-    'label2_1d_type'          => '1D Barcode Type',
-    'label2_1d_type_help'     => 'Format for 1D barcodes',
+    'label2_title_help'       => 'Titulok pre zobrazenie na štítkoch, ktoré ho podporujú',
+    'label2_title_help_phold' => 'Zástupný symbol <code>{COMPANY}</code> bude nahradený názvom spoločnosti priradenej majetku',
+    'label2_asset_logo'       => 'Použiť logo majetku',
+    'label2_asset_logo_help'  => 'Použiť logo spoločnosti priradenej k majetku namiesto hodnoty <code>:setting_name</code>',
+    'label2_1d_type'          => 'Typ 1D čiarového kódu',
+    'label2_1d_type_help'     => 'Formát pre 1D čiarové kódy',
     'label2_2d_type'          => 'Typ 2D čiarového kódu',
-    'label2_2d_type_help'     => 'Format for 2D barcodes',
-    'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
-    'label2_fields'           => 'Field Definitions',
-    'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
-    'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
-    'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
-    'default'               => 'Default',
-    'none'                  => 'None',
-    'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
-    'google_login'      => 'Google Workspace Login Settings',
-    'enable_google_login'  => 'Enable users to login with Google Workspace',
-    'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
-    'mail_reply_to' => 'Mail Reply-To Address',
-    'mail_from' => 'Mail From Address',
-    'database_driver' => 'Database Driver',
-    'bs_table_storage' => 'Table Storage',
-    'timezone' => 'Timezone',
-    'profile_edit'          => 'Edit Profile',
-    '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>',
+    'label2_2d_type_help'     => 'Formát pre 2D čiarové kódy',
+    'label2_2d_target'        => 'Cieľ 2D čiarového kódu',
+    'label2_2d_target_help'   => 'Údaje, ktore budú zahrnuté do 2d čiarového kódu',
+    'label2_fields'           => 'Definícia polí',
+    'label2_fields_help'      => 'Polia môžu byť pridané, odstránené alebo usporiadané v ľavom stĺpci. Pre každé pole je možné pridať, odstrániť viacero možností pre popis a DataSource a zmeniť poradie v pravom stĺpci.',
+    'help_asterisk_bold'    => 'Text zadaný ako <code>**text**</code> bude zobrazený ako tučný',
+    'help_blank_to_use'     => 'Ponechajte prázdne pre použitie hodnoty z <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> použije hodnotu z <code>:setting_name</code>. <br>Upozorňujeme, že hodnota čiarových kódov musí byť v súlade s príslušnými špecifikáciami čiarových kódov, aby sa úspešne vygenerovali. Pozrite <a href="https://snipe-it.readme.io/docs/barcodes">dokumentáciu <i class="fa fa-external-link"></i></a> pre ďalšie podrobnosti. ',
+    'asset_id'              => 'ID majetku',
+    'data'               => 'Dáta',
+    'default'               => 'Predvolený',
+    'none'                  => 'Žiadny',
+    'google_callback_help' => 'Toto by malo byť zadané ako URL spätného volania v nastaveniach aplikácie Google OAuth vo <strong><a href="https://console.cloud.google.com/" target="_blank">vývojová konzole Google vašej organizácie <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_login'      => 'Nastavnia prihlasovania Google Workspace',
+    'enable_google_login'  => 'Povoliť používateľom prihlasovať sa s kontom Google Workspace',
+    'enable_google_login_help'  => 'Používatelia nebudú automaticky vytvorení. Musia mať už vytvorený účet tu a v Google Workspace a ich používateľské meno sa musí zhodovať s ich e-mailovou adresou Google. ',
+    'mail_reply_to' => 'Adresa pre odpoveď',
+    'mail_from' => 'Adresa odosielateľa',
+    'database_driver' => 'Ovládať databáze',
+    'bs_table_storage' => 'Úložisko tabuliek',
+    'timezone' => 'Časová zóna',
+    'profile_edit'          => 'Upraviť profil',
+    'profile_edit_help'          => 'Povoliť používateľom upravovať ich vlastný profil.',
+    'default_avatar' => 'Nahrať vlastný prevolený avatar',
+    'default_avatar_help' => 'Tento obrázok bude zobrazený ako profilový ak používateľ nemá profilovú fotku.',
+    'restore_default_avatar' => 'Obnoviť <a href=":default_avatar" data-toggle="lightbox" data-type="image">pôvodný predvolený avatar</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' => 'Varovanie pripravené k prevzatiu',
+    'due_checkin_days_help' => 'Koľko dní pred očakávaným prevzatím majetku má byť zaradený do zoznamu "Čaká na prevzatie"?',
+    'no_groups' => 'Žiadne skupiny ešte neboli vytvorené. Navštívte <code>Admin nastavenia > Skupiny oprávnení</code> pre pridanie.',
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'päta, logo, tlač, téma, skin, hlavička, farby, farba, css',
+        'general_settings'  => 'podpora spoločnosti, podpis, prijatie, mailový formát, formát užívateľského mena, obrázky, na stránku, náhľad, eula, gravatar, tos, prehľad, súkromie',
+        'groups'            => 'oprávnenia, skupiny oprávnení, autorizácia',
+        'labels'            => 'štítky, čiarové kódy, čiarový kód, záložky, tlačiť, ups, qr, 1d, 2d',
+        'localization'      => 'lokalizácia, mena, miestny, miestny, časové pásmo, časové pásmo, medzinárodný, internacionalizácia, jazyk, jazyky, preklad',
+        'php_overview'      => 'phpinfo, systém, info',
+        'purge'             => 'natrvalo odstrániť',
+        'security'          => 'heslo, heslá, požiadavky, dvoj faktorové, dvoj-faktorové, bežné heslá, vzdialené prihlásenie, odhlásenie, autentifikácia',
+    ],
 
 ];
diff --git a/resources/lang/sk-SK/admin/settings/message.php b/resources/lang/sk-SK/admin/settings/message.php
index 3b23569f8c09..c1ca1d0d6357 100644
--- a/resources/lang/sk-SK/admin/settings/message.php
+++ b/resources/lang/sk-SK/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Nastala chyba. :app odpovedala s: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/sk-SK/admin/users/general.php b/resources/lang/sk-SK/admin/users/general.php
index e70f35e64fec..1d6b914d83d0 100644
--- a/resources/lang/sk-SK/admin/users/general.php
+++ b/resources/lang/sk-SK/admin/users/general.php
@@ -17,10 +17,10 @@
     'last_login'        => 'Posledné prihlásenie',
     'ldap_config_text'  => 'Nastavenia LDAP-u sa nachádzajú v menu Administrácia => Nastavenia. Vybraná (voliteľná) lokalita bude nastavená pre všetkých importovaných používateľov.',
     'print_assigned'    => 'Vytlačiť všetky priradené',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
-    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
-    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
+    'email_assigned'    => 'Zaslať zoznam aktuálne priradeného majetku',
+    'user_notified'     => 'Používateľovi bol zaslaný email so zoznamom aktuálne priradených položiek.',
+    'auto_assign_label' => 'Zahrnúť tohto používateľa do automatického priraďovania licencií',
+    'auto_assign_help'  => 'Nezaradiť tohto používateľa do automatického priraďovania licencií',
     'software_user'     => 'Software priradený :name',
     'send_email_help'   => 'Pre zaslanie prístupových údajov musíte zadať e-mailovú adresu používateľa. Zaslanie prístupových údajov je možné iba v procese vytvárania nového používateľa. Heslá sú ukladané šifrované, nie je ich možné prečítať po uložení.',
     'view_user'         => 'Zobraziť používateľa :name',
@@ -30,25 +30,25 @@
     'two_factor_active'   => '2FA aktívne ',
     'user_deactivated'  => 'Užívateľ sa nemôže prihlásiť',
     'user_activated'  => 'Užívateľ sa môže prihlásiť',
-    'activation_status_warning' => 'Do not change activation status',
-    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
-    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
-    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
+    'activation_status_warning' => 'Nezmeniť stav aktivácie',
+    'group_memberships_helpblock' => 'Iba superadmini môžu upravovať členstvo v skupine.',
+    'superadmin_permission_warning' => 'Iba superadmini môžu garantovať superadmin prístup.',
+    'admin_permission_warning' => 'Iba používatelia s administrátorskými oprávneniami môžu garantovať administrátorsky prístup.',
     'remove_group_memberships' => 'Odstrániť členstvo v skupine',
-    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'Chystáte sa prevziať všetky položky od :count používateľov uvedených nižšie. Mena superadmin používateľov sú zobrazené červeným.',
     'update_user_assets_status' => 'Aktualizovať všetky asety pre týchto užívateľov na tento status',
-    'checkin_user_properties' => 'Check in all properties associated with these users',
-    'remote_label'   => 'This is a remote user',
-    'remote'   => 'Remote',
-    'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
-    'not_remote_label' => 'This is not a remote user',
-    'vip_label' => 'VIP user',
-    'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
-    'create_user' => 'Create a user',
-    'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
-    'email_credentials' => 'Email credentials',
-    'email_credentials_text' => 'Email my credentials to the email address above',
-    'next_save_user' => 'Next: Save User',
-    'all_assigned_list_generation' => 'Generated on:',
-    'email_user_creds_on_create' => 'Email this user their credentials?',
+    'checkin_user_properties' => 'Prevziať všetky vlastnosti spojené s týmito používateľmi',
+    'remote_label'   => 'Toto je vzdialený používateľ',
+    'remote'   => 'Vzdialený',
+    'remote_help' => 'Toto môže byť užitočne v prípade ak potrebujete odfiltrovať vzdialených používateľov, ktorí nikdy alebo zriedkavo navštevujú fyzické lokality.',
+    'not_remote_label' => 'Toto nie je vzdialený používateľ',
+    'vip_label' => 'VIP používateľ',
+    'vip_help' => 'Toto môže byť užitočné k označeniu dôležitých osôb vo Vašej organizácií, ku ktorým sa má aplikovať odlišný prístup.',
+    'create_user' => 'Pridať používateľa',
+    'create_user_page_explanation' => 'Tieto údaje použijete pre prvé prihlásenie na stránku.',
+    'email_credentials' => 'Poslať prihlasovacie údaje',
+    'email_credentials_text' => 'Odošle moje prihlasovacie údaje na emailovú adresu uvedenú vyššie',
+    'next_save_user' => 'Ďalej: Uložiť používateľa',
+    'all_assigned_list_generation' => 'Generované dňa:',
+    'email_user_creds_on_create' => 'Zaslať tomuto používateľovi prihlasovacie údaje mailom?',
 ];
diff --git a/resources/lang/sk-SK/admin/users/message.php b/resources/lang/sk-SK/admin/users/message.php
index 060cd75ece81..93d5b0aebfdc 100644
--- a/resources/lang/sk-SK/admin/users/message.php
+++ b/resources/lang/sk-SK/admin/users/message.php
@@ -6,17 +6,17 @@
     'declined'                  => 'Odmietnutie majetku bolo úspešné.',
     'bulk_manager_warn'	        => 'Používatelia boli úspešné aktualizovaný, avčak položka manažér nebola uložená, pretože zvolený manažér sa taktiež nachádzal v zoznam na úpravu a používatel nemôže byť sám sebe manazérom. Prosim zvoľte Vašich používateľov znovu s vynechaním manažéera.',
     'user_exists'               => 'Používateľ už existuje!',
-    'user_not_found'            => 'User does not exist or you do not have permission view them.',
+    'user_not_found'            => 'Používateľ neexistuje alebo nemáte oprávnenie na jeho zobrazenie.',
     'user_login_required'       => 'Prihlasovacie meno je povinné',
-    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
+    'user_has_no_assets_assigned' => 'Momentálne nie je priradený používateľovi žiaden majetok.',
     'user_password_required'    => 'Heslo je povinné.',
     'insufficient_permissions'  => 'Nedostatočné oprávnenia.',
     'user_deleted_warning'      => 'Tento používateľ bol odstránený. Používateľa musíte obnoviť, ak ho chcete upraviť alebo mu priradiť majetok.',
     'ldap_not_configured'        => 'LDAP prepojenie nebolo nastavené pre túto inštaláciu.',
     'password_resets_sent'      => 'Vybraní používatelia sú aktivovaný. Na ich adresu bola zaslaný okaz na resetovanie hesla.',
-    'password_reset_sent'       => 'A password reset link has been sent to :email!',
-    'user_has_no_email'         => 'This user does not have an email address in their profile.',
-    'log_record_not_found'        => 'A matching log record for this user could not be found.',
+    'password_reset_sent'       => 'Odkaz na obnovenie hesla bol zaslaný na emailovú adresu :email!',
+    'user_has_no_email'         => 'Tento používateľ nemá zadanú emailovú adresu v profile.',
+    'log_record_not_found'        => 'Pre tohto používateľa sa nepodarilo nájsť odpovedajúci záznam v logoch.',
 
 
     'success' => array(
@@ -37,23 +37,23 @@
         'update' => 'Pri aktualizácií používateľa sa vyskytla chyba. Prosím skúste znovu.',
         'delete' => 'Pri odstraňovaní používateľa sa vyskytla chyba. Skúste prosím neskôr.',
         'delete_has_assets' => 'Tento používateľ ma priradené položky a nemôže byť odstránený.',
-        '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' => 'Tento používateľ má stále priradený majetok. Prosím prevezmite najprv majetok.|Tento používateľ má stále priradených :count majetkov. Prosím prevezmite najprv všetok majetok.',
+        'delete_has_licenses_var' => 'Tento používateľ má stále priradené licenčné sloty. Prosím prevezmite ich najprv.|Tento používateľ má stále priradených :count licenčných slotov. Prosím prevezmite ich najprv.',
+        'delete_has_accessories_var' => 'Tento používateľ ma priradené príslušenstvo. Prosím prevezmite ho najprv.|Tento používateľ má stále priradených :count príslušenstiev. Prosím prevezmite ich najprv.',
+        'delete_has_locations_var' => 'Tento používateľ je správcom lokalite. Prosím zvoľte najprv iného správcu.|Tento používateľ stále manažuje :count lokalít. Prosím zvoľte najprv iných správcov.',
+        'delete_has_users_var' => 'Tento používateľ stále manažuje iného používateľa. Prosím nastavte najprv iného manažéra pre daného používateľa.|Tento používateľ stále manažuje :count používateľov. Prosím nastavte im najprv iného manažéra.',
         'unsuspend' => 'Pri pokuse o zrušenie pozastavenia používateľa nastala chyba. Skúste prosím znovu.',
         'import'    => 'Pri importovaní používateľov nastala chyba. Prosím skúste znovu.',
         'asset_already_accepted' => 'Tento majetok bol už prijatý.',
         'accept_or_decline' => 'Musíte prijať alebo odmietnuť tento majetok.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Budeme veľmi smutní, ak zmažete samého seba. Prosím zvážte to.',
         'incorrect_user_accepted' => 'Majetok, ktorý sa pokúšate prijať, Vám nebol priradený.',
         'ldap_could_not_connect' => 'Nepodarilo sa pripojiť k LDAP serveru. Prosím skontrolujte nastavenia LDAP serveru v Admin nastavenia > LDAP/AD <br>Chyba LDAP serveru:',
         'ldap_could_not_bind' => 'Nepodarilo sa napojiť na LDAP server. Prosím skontrolujte nastavenia LDAP serveru v Admin nastavenia > LDAP/AD <br>Chyba LDAP serveru: ',
         'ldap_could_not_search' => 'Nepodarilo sa vyhladať v rámci LDAP serveru. Prosím skontrolujte nastavenia LDAP serveru v Admin nastavenia > LDAP/AD a všetky lokality ktoré môžu mať nastavené OU. <br>Chyba LDAP serveru:',
         'ldap_could_not_get_entries' => 'Nepodarilo sa získať záznamy z LDAP servera. Prosím skontrolujte nastavenia LDAP serveru v Admin nastavenia > LDAP/AD a všetky lokality ktoré môžu mať nastavené OU. <br>Chyba LDAP serveru:',
         'password_ldap' => 'Heslo pre tento účet je spravované cez LDAP/Active Directory. Pre zmneu hesla prosím kontaktujte Vaše IT oddelenie. ',
-        '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' => 'Tento používateľ má priradené položky vo vlastníctve inej spoločnosti. Prosím prevezmite ich alebo upravte spoločnosť.'
     ),
 
     'deletefile' => array(
@@ -69,7 +69,7 @@
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Tento používateľ nemá nastavenú emailovú adresu.',
+        'success' => 'Používateľ bol notifikovaný o aktuálne priradenom majetku.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/sk-SK/button.php b/resources/lang/sk-SK/button.php
index f03143219df5..b8860b7fd203 100644
--- a/resources/lang/sk-SK/button.php
+++ b/resources/lang/sk-SK/button.php
@@ -5,7 +5,7 @@
     'add'    	                => 'Pridať nové',
     'cancel'                    => 'Zrušiť',
     'checkin_and_delete'  	    => 'Prijať všetko / Zmazať používateľa',
-    'delete'  	                => 'Odstrániť',
+    'delete'  	                => 'Vymazať',
     'edit'    	                => 'Upraviť',
     'clone'    	                => 'Duplikovať',
     'restore' 	                => 'Obnoviť',
diff --git a/resources/lang/sk-SK/general.php b/resources/lang/sk-SK/general.php
index da2e788c761c..035115034944 100644
--- a/resources/lang/sk-SK/general.php
+++ b/resources/lang/sk-SK/general.php
@@ -39,7 +39,7 @@
     'assigned_date'         => 'Dátum pridelenia',
     'assigned_to'           => 'Pridelené k :name',
     'assignee'              => 'Pridelené',
-    'avatar_delete'         => 'Odstrániť avatara',
+    'avatar_delete'         => 'Vymazať avatara',
     'avatar_upload'         => 'Nahrať avatara',
     'back'      			=> 'Späť',
     'bad_data'      		=> 'Nič nebolo nájdené. Možno zadávate zlé dáta?',
@@ -64,7 +64,7 @@
     'checkout'  			=> 'Priradiť',
     'checkouts_count'       => 'Odovzdané',
     'checkins_count'        => 'Vrátené',
-    'checkin_and_delete'  	=> 'Vrátiť a odstrániť',
+    'checkin_and_delete'  	=> 'Vrátiť a vymazať',
     'user_requests_count'   => 'Požidavky',
     'city'  				=> 'Mesto',
     'click_here'			=> 'Klikni sem',
@@ -216,6 +216,12 @@
     'no_results'			=> 'Žiadne výsledky.',
     'no'  					=> 'Nie',
     'notes'  				=> 'Poznámky',
+    'note_added'            => 'Poznámka pridaná',
+    'add_note'              => 'Pridať poznámku',
+    'note_edited'            => 'Poznámka upravená',
+    'edit_note'              => 'Upraviť poznámku',
+    'note_deleted'            => 'Poznámka zmazaná',
+    'delete_note'              => 'Zmazať poznámku',
     'order_number'          => 'Číslo objednávky',
     'only_deleted'          => 'Iba odstránený majetok',
     'page_menu'				=> 'Zobrazené _MENU_ položky',
@@ -567,5 +573,8 @@
     'import_asset_tag_exists' => 'Majetok so značkou majetku :asset_tag už existuje a nebol aktualizovaný. Žiadna zmena sa neudiala.',
     'countries_manually_entered_help' => 'Hodnoty s hviezdičkou (*) boli manuálne zadané a nezhodujú sa s existujúcim hodnotami výberu podľa ISO 3166',
     'accessories_assigned' => 'Priradené príslušenstvo',
+    'user_managed_passwords' => 'Správca hesiel',
+    '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á',
 
 ];
diff --git a/resources/lang/sk-SK/help.php b/resources/lang/sk-SK/help.php
index 87bebbee3ab3..9aca58b44e1b 100644
--- a/resources/lang/sk-SK/help.php
+++ b/resources/lang/sk-SK/help.php
@@ -15,21 +15,21 @@
 
     'more_info_title' => 'Viac info',
 
-    'audit_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.<br><br>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.',
+    'audit_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.<br><br>Majte na pamäti, že pri priradení majetku nedochádza k zmene lokality používateľa, majetku alebo lokality, do ktorej na priradený.',
 
     'assets' => '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.',
 
-    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+    'categories' => 'Kategórie pomáhajú organizovať Vaše položky. Príkladom kategórií sú &quot;PC&quot;, &quot;Notebooky&quot;, &quot;Mobilné telefóny&quot;, &quot;Tablety&quot;, atď., ale môžete si kategórie vytvoriť ľubovoľne tak, ako Vám to vyhovuje.',
 
-    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+    'accessories' => 'Príslušenstvom je všetko čo je odovzdávané používateľom a nedisponuje sériovým číslom (alebo nezáleží na sledovaní každého kusu individuálne). Príkladom je počítačová myš alebo klávesnica.',
 
-    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+    'companies'     => 'Spoločnosti môžu byť použité ako jednoduchý identifikátor alebo môžu byť využité na obmedzenie viditeľnosti majetku, používateľov, atď. ak je zapnutý mód plnej podpory spoločností v Admin nastaveniach.',
 
-    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+    'components'    => 'Komponenty sú položky ktoré sú súčasťou majetku, napríklad HDD, RAM, atď.',
 
-    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+    'consumables'   => 'Spotrebný materiál je čokoľvek zakúpené čo sa spotrebuje v čase. Napríklad tonery alebo papiere.',
 
     'depreciations' => 'Môžete nastaviť odpisovanie majetku, aby dochádzalo k rovnomernému odpisovaniu.',
     
-    'empty_file'    => 'The importer detects that this file is empty.'
+    'empty_file'    => 'Importovací nástroj zistil, že tento súbor je prázdny.'
 ];
diff --git a/resources/lang/sk-SK/localizations.php b/resources/lang/sk-SK/localizations.php
index 55bd0edad3f2..d2ab7e6c83a1 100644
--- a/resources/lang/sk-SK/localizations.php
+++ b/resources/lang/sk-SK/localizations.php
@@ -68,58 +68,58 @@
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a Country',
+    'select_country' => 'Vybrať krajinu',
     
     'countries' => [
-        'AC'=>'Ascension Island',
-        'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AC'=>'Ostrov Ascension',
+        'AD'=>'Andora',
+        'AE'=>'Spojené arabské emiráty',
+        'AF'=>'Afganistan',
+        'AG'=>'Antigua a Barbuda',
         'AI'=>'Anguilla',
-        'AL'=>'Albania',
-        'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AL'=>'Albánsko',
+        'AM'=>'Arménsko',
+        'AN'=>'Holandské Antily',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
-        'AR'=>'Argentina',
-        'AS'=>'American Samoa',
-        'AT'=>'Austria',
-        'AU'=>'Australia',
+        'AQ'=>'Antarktída',
+        'AR'=>'Argentína',
+        'AS'=>'Americká Samoa',
+        'AT'=>'Rakúsko',
+        'AU'=>'Austrália',
         'AW'=>'Aruba',
-        'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AX'=>'Åland',
+        'AZ'=>'Azerbajdžan',
+        'BA'=>'Bosna a Hercegovina',
         'BB'=>'Barbados',
-        'BE'=>'Belgium',
-        'BD'=>'Bangladesh',
+        'BE'=>'Belgicko',
+        'BD'=>'Bangladéš',
         'BF'=>'Burkina Faso',
         'BG'=>'Bulharsko',
         'BH'=>'Bahrajn',
         'BI'=>'Burundi',
         'BJ'=>'Benin',
         'BM'=>'Bermudy',
-        'BN'=>'Brunei Darussalam',
+        'BN'=>'Brunejsko-darussalamský štát',
         'BO'=>'Bolívia',
         'BR'=>'Brazília',
         'BS'=>'Bahamy',
         'BT'=>'Bhután',
-        'BV'=>'Bouvet Island',
+        'BV'=>'Ostrov Bouvet',
         'BW'=>'Botswana',
         'BY'=>'Bielorusko',
         'BZ'=>'Belize',
         'CA'=>'Kanada',
-        'CC'=>'Cocos (Keeling) Islands',
-        'CD'=>'Congo (Democratic Republic)',
-        'CF'=>'Central African Republic',
-        'CG'=>'Congo (Republic)',
+        'CC'=>'Kokosové ostrovy (Keeling)',
+        'CD'=>'Konžská demokratická republika',
+        'CF'=>'Stredoafrická republika',
+        'CG'=>'Kongo (republika)',
         'CH'=>'Švajčiarsko',
-        'CI'=>'Côte d\'Ivoire',
-        'CK'=>'Cook Islands',
-        'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
-        'CO'=>'Colombia',
+        'CI'=>'Pobrežie Slonoviny',
+        'CK'=>'Cookove ostrovy',
+        'CL'=>'Čile',
+        'CM'=>'Kamerun',
+        'CN'=>'Čínská ľudová republika',
+        'CO'=>'Kolumbia',
         'CR'=>'Kostarika',
         'CU'=>'Kuba',
         'CV'=>'Kapverdy',
@@ -127,29 +127,29 @@
         'CY'=>'Cyprus',
         'CZ'=>'Česká republika',
         'DE'=>'Nemecko',
-        'DJ'=>'Djibouti',
+        'DJ'=>'Džibutsko',
         'DK'=>'Dánsko',
-        'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
+        'DM'=>'Dominika',
+        'DO'=>'Dominikánska republika',
         'DZ'=>'Alžírsko',
-        'EC'=>'Ecuador',
+        'EC'=>'Ekvádor',
         'EE'=>'Estónsko',
         'EG'=>'Egypt',
         'GB-ENG'=>'Anglicko',
         'ER'=>'Eritrea',
         'ES'=>'Španielsko',
-        'ET'=>'Ethiopia',
+        'ET'=>'Etiópia',
         'EU'=>'Európska únia',
         'FI'=>'Fínsko',
         'FJ'=>'Fidži',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
+        'FK'=>'Falklandské ostrovy (Malvíny)',
+        'FM'=>'Mikronézia, federatívne štáty',
+        'FO'=>'Faerské ostrovy',
         'FR'=>'Francúzsko',
         'GA'=>'Gabon',
         'GD'=>'Grenada',
-        'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GE'=>'Gruzínsko',
+        'GF'=>'Francúzska Guyana',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
         'GI'=>'Gibraltár',
@@ -157,102 +157,102 @@
         'GM'=>'Gambia',
         'GN'=>'Guinea',
         'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
+        'GQ'=>'Rovníková Guinea',
         'GR'=>'Grécko',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GS'=>'Južná Georgia a Južné Sandwichove ostrovy',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
         'GY'=>'Guyana',
         'HK'=>'Hongkong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HM'=>'Heardov ostrov a MacDonaldovy ostrovy',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
+        'HR'=>'Chorvátsko (miestny názov: Hrvatska)',
         'HT'=>'Haiti',
         'HU'=>'Maďarsko',
         'ID'=>'Indonézia',
         'IE'=>'Írsko',
         'IL'=>'Izrael',
-        'IM'=>'Isle of Man',
+        'IM'=>'Ostrov Man',
         'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
+        'IO'=>'Britské indickooceánske územie',
         'IQ'=>'Irak',
-        'IR'=>'Iran, Islamic Republic Of',
+        'IR'=>'Irán, Islamská republika',
         'IS'=>'Island',
         'IT'=>'Taliansko',
         'JE'=>'Jersey',
         'JM'=>'Jamajka',
         'JO'=>'Jordánsko',
         'JP'=>'Japonsko',
-        'KE'=>'Kenya',
-        'KG'=>'Kyrgyzstan',
+        'KE'=>'Keňa',
+        'KG'=>'Kirgizsko',
         'KH'=>'Kambodža',
         'KI'=>'Kiribati',
-        'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
+        'KM'=>'Komory',
+        'KN'=>'Svätý Krištof a Nevis',
+        'KR'=>'Kórejská republika',
         'KW'=>'Kuvajt',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
+        'KY'=>'Kajmanské ostrovy',
+        'KZ'=>'Kazachstan',
+        'LA'=>'Laoská ľudová demokratická republika',
         'LB'=>'Libanon',
         'LC'=>'Svätá Lucia',
-        'LI'=>'Liechtenstein',
+        'LI'=>'Lichtenštajnsko',
         'LK'=>'Srí Lanka',
         'LR'=>'Libéria',
         'LS'=>'Lesotho',
-        'LT'=>'Lithuania',
+        'LT'=>'Litva',
         'LU'=>'Luxembursko',
         'LV'=>'Lotyšsko',
-        'LY'=>'Libyan Arab Jamahiriya',
+        'LY'=>'Líbyjská Arabská Jamahiriya',
         'MA'=>'Maroko',
         'MC'=>'Monako',
-        'MD'=>'Moldova, Republic Of',
-        'ME'=>'Montenegro',
+        'MD'=>'Moldavská republika',
+        'ME'=>'Čierna Hora',
         'MG'=>'Madagaskar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
+        'MH'=>'Marshallove ostrovy',
+        'MK'=>'Macedónsko, Bývalá juhoslovanská republika',
         'ML'=>'Mali',
-        'MM'=>'Myanmar',
+        'MM'=>'Mjanmarsko',
         'MN'=>'Mongolsko',
         'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
+        'MP'=>'Severné Mariánske ostrovy',
         'MQ'=>'Martinik',
-        'MR'=>'Mauritania',
+        'MR'=>'Mauritánia',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
-        'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MU'=>'Maurícius',
+        'MV'=>'Maledivy',
         'MW'=>'Malawi',
-        'MX'=>'Mexico',
+        'MX'=>'Mexiko',
         'MY'=>'Malajzia',
-        'MZ'=>'Mozambique',
-        'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
+        'MZ'=>'Mozambik',
+        'NA'=>'Namíbia',
+        'NC'=>'Nová Kaledónia',
         'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
+        'NF'=>'Ostrov Norfolk',
         'NG'=>'Nigéria',
-        'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'GB-NIR' => 'Northern Ireland',
+        'NI'=>'Nikaragua',
+        'NL'=>'Holandsko',
+        'GB-NIR' => 'Severné Írsko',
         'NO'=>'Nórsko',
-        'NP'=>'Nepal',
+        'NP'=>'Nepál',
         'NR'=>'Nauru',
         'NU'=>'Niue',
-        'NZ'=>'New Zealand',
-        'OM'=>'Oman',
+        'NZ'=>'Nový Zéland',
+        'OM'=>'Omán',
         'PA'=>'Panama',
         'PE'=>'Peru',
         'PF'=>'Francúzska Polynézia',
         'PG'=>'Papua Nová Guinea',
-        'PH'=>'Philippines, Republic of the',
+        'PH'=>'Filipíny, Republika',
         'PK'=>'Pakistan',
         'PL'=>'Poľsko',
-        'PM'=>'St. Pierre And Miquelon',
-        'PN'=>'Pitcairn',
-        'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
-        'PT'=>'Portugal',
+        'PM'=>'Saint-Pierre a Miquelon',
+        'PN'=>'Pitcairnove ostrovy',
+        'PR'=>'Portoriko',
+        'PS'=>'Palestína',
+        'PT'=>'Portugalsko',
         'PW'=>'Palau',
         'PY'=>'Paraguaj',
         'QA'=>'Katar',
@@ -278,44 +278,44 @@
         'SN'=>'Senegal',
         'SO'=>'Somálsko',
         'SR'=>'Surinam',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
-        'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
+        'ST'=>'Svätý Tomáš a Princov ostrov',
+        'SU'=>'Sovietsky zväz',
+        'SV'=>'Salvádor',
+        'SY'=>'Sýrska arabská republika',
         'SZ'=>'Svazijsko',
-        'TC'=>'Turks And Caicos Islands',
-        'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'TC'=>'Ostrovy Turks a Caicos',
+        'TD'=>'Čad',
+        'TF'=>'Francúzske južné územia',
         'TG'=>'Togo',
         'TH'=>'Thajsko',
         'TJ'=>'Tadžikistan',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
+        'TI'=>'Východný Timor',
         'TM'=>'Turkménsko',
         'TN'=>'Tunisko',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
+        'TP'=>'Východný Timor (starý kód)',
         'TR'=>'Turecko',
-        'TT'=>'Trinidad And Tobago',
+        'TT'=>'Trinidad a Tobago',
         'TV'=>'Tuvalu',
         'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
+        'TZ'=>'Tanzánia',
         'UA'=>'Ukrajina',
         'UG'=>'Uganda',
         'UK'=>'Spojené kráľovstvo',
         'US'=>'Spojené štáty',
-        'UM'=>'United States Minor Outlying Islands',
+        'UM'=>'Menšie odľahlé ostrovy USA',
         'UY'=>'Uruguaj',
         'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'VA'=>'Vatikánsky mestský štát (Holy See)',
+        'VC'=>'Svätý Vincent a Grenadíny',
         'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
+        'VG'=>'Britské Panenské ostrovy',
+        'VI'=>'Americké Panenské ostrovy',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
         'GB-WLS' =>'Wales',
-        'WF'=>'Wallis And Futuna Islands',
+        'WF'=>'Ostrovy Wallis a Futuna',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
         'YT'=>'Mayotte',
diff --git a/resources/lang/sk-SK/validation.php b/resources/lang/sk-SK/validation.php
index 964bf7989ba5..9a6db3dcdd26 100644
--- a/resources/lang/sk-SK/validation.php
+++ b/resources/lang/sk-SK/validation.php
@@ -13,165 +13,165 @@
     |
     */
 
-    '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' => 'Potrebné potvrdiť :attribute.',
+    'accepted_if' => 'Položka :attribute musí vyť potvrdená ak :other je :value.',
+    'active_url' => 'Pole :attribute musí obsahovať správnu URL adresu.',
+    'after' => 'Pole :attribute musí obsahovať dátum po :date.',
+    'after_or_equal' => 'Pole :attribute musí obsahovať dátum rovnaký alebo nasledujúci po :date.',
+    'alpha' => 'Pole :attribute musí obsahovať iba písmená.',
+    'alpha_dash' => 'Pole :attribute musí obsahovať iba písmená, čísla, pomlčky a podčiarkovníky.',
+    'alpha_num' => 'Pole :attribute músí obsahovať iba písmená a čisla.',
+    'array' => 'Pole :attribute musí obsahovať pole hodnôt.',
+    'ascii' => 'Pole :attribute musí obsahovať iba jednoznakové alfanumerické znaky a symboly.',
+    'before' => 'Pole :attribute musí obsahovať dátum pred :date.',
+    'before_or_equal' => 'Pole :attribute musí obsahovať dátum rovnaký alebo predchádzajúci dátumu :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' => 'Pole :attribute musí obsahovať hodnotu medzi :min a :max položkami.',
+        'file' => 'Pole :attribute musí obsahovať hodnotu medzi :min a :max kilobajtami.',
+        'numeric' => 'Pole :attribute musí obsahovať hodnotu medzi :min a :max.',
+        'string' => 'Pole :attribute musí obsahovať hodnotu medzi :min a :max znamkmi.',
     ],
-    'boolean' => 'The :attribute field must be true or false.',
-    '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.',
-    'distinct' => 'The :attribute field has a duplicate value.',
-    '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.',
-    'enum' => 'The selected :attribute is invalid.',
-    'exists' => 'The selected :attribute is invalid.',
-    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
-    'file' => 'The :attribute field must be a file.',
-    'filled' => 'The :attribute field must have a value.',
+    'boolean' => 'Pole :attribút musí obsahovať hodnoty pravda alebo nepravda.',
+    'can' => 'Pole :attribute obsahuje nepovolenú hodnotu.',
+    'confirmed' => 'Pole :attribute nesedí s overením.',
+    'contains' => 'Pole :attribute neobsahuje požadovanú hodnotu.',
+    'current_password' => 'Heslo je nesprávne.',
+    'date' => 'Pole :attribute musí obsahovať platný dátum.',
+    'date_equals' => 'Pole :attribute musí obsahovať dátum rovnaký ako :date.',
+    'date_format' => 'Pole :attribute musí obashovať hodnotnu zhodnú s formátom :format.',
+    'decimal' => 'Pole :attribute musí obsahovať :decimal desatinných miest.',
+    'declined' => 'Pole :attribute musí byť zakázané.',
+    'declined_if' => 'Pole :attribute musí byť zakázané keď :other má hodnotu :value.',
+    'different' => 'Polia :attribute a :other sa nemôžu zhodovať.',
+    'digits' => 'Pole :attribute musí obsahovať :digits číslic.',
+    'digits_between' => 'Pole :attribute musí obsahovať od :min do :max číslic.',
+    'dimensions' => 'Pole :attribute má nesprávne rozmery obrázku.',
+    'distinct' => 'Pole :attribute obsahoje duplicitnú hodnotu.',
+    'doesnt_end_with' => 'Pole :attribute nemôže končiť jednou z nasledujúcich hodnôt: :values.',
+    'doesnt_start_with' => 'Pole :attribute nemôže začínať s jednou z nasledujúcich hodnôt: :values.',
+    'email' => 'Pole :attribute musí obsahovať platnú emailovú adresu.',
+    'ends_with' => 'Pole :attribute musí končiť jednou z nasledujúcich hodnôt: :values.',
+    'enum' => 'Označený :attribute je neplatný.',
+    'exists' => 'Označený :attribute je neplatný.',
+    'extensions' => 'Pole :attribute musí mať jednu z nasledujúcich prípon: :values.',
+    'file' => 'Pole :attribute musí obsahovať súbor.',
+    'filled' => 'Pole :attribute musí obsahovať hodnotu.',
     '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' => 'Pole :attribute musí obsahovať viac ako :value položiek.',
+        'file' => 'Pole :attribute musí byť väčšie ako :value kilobytov.',
+        'numeric' => 'Pole :attribute musí byť vačie ako :value.',
+        'string' => 'Pole :attribute musí byť vačšie ako :value znakov.',
     ],
     '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' => 'Pole :attribute musí mať :value alebo viac položiek.',
+        'file' => 'Pole :attribute musí byť väčšie alebo rovné ako :value kilobytov.',
+        'numeric' => 'Pole :attribute musí byť väčšie alebo rovnaké ako :value.',
+        'string' => 'Hodnota poľa :attribute musí byť väčia alebo rovná :value znakov.',
     ],
-    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
-    'image' => 'The :attribute field must be an image.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in' => 'The selected :attribute is invalid.',
-    '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.',
-    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
-    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
-    'json' => 'The :attribute field must be a valid JSON string.',
-    'list' => 'The :attribute field must be a list.',
-    'lowercase' => 'The :attribute field must be lowercase.',
+    'hex_color' => 'Hodnota poľa :attribute musí byť platným zápisom farby v hexadecimálnom formáte.',
+    'image' => 'Pole :attribute musí obsahovať obrázok.',
+    'import_field_empty'    => 'Hodnote pre :fieldname nemôže byť nulová.',
+    'in' => 'Označený :attribute je neplatný.',
+    'in_array' => 'Pole :attribute musí existovať v :other.',
+    'integer' => 'Pole :attribute musí byť číslom.',
+    'ip' => 'Pole :attribute musí byť platnou IP adresou.',
+    'ipv4' => 'Pole :attribute musí byť platnou IPv4 adresou.',
+    'ipv6' => 'Pole :attribute musí byť platnou IPv6 adresou.',
+    'json' => 'Pole :attribute musí byť platným JSON-om.',
+    'list' => 'Pole :attribute musí byť zoznamom.',
+    'lowercase' => 'Pole :attribute musí obsahovať malé písmenka.',
     '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' => 'Pole :attribute musí obsahovať menej ako :value položiek.',
+        'file' => 'Pole :attribute musí byť menšie ako :value kilobajtov.',
+        'numeric' => 'Pole :attribute musí byť menšie ako :value.',
+        'string' => 'Pole :attribute musí byť menšie ako :value znakov.',
     ],
     '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' => 'Pole :attribute nemôže obsahovať viac ako :value položiek.',
+        'file' => 'Pole :attribute musí byť menšie alebo rovné ako :value kilobajtov.',
+        'numeric' => 'Pole :attribute musí byť menšie alebo rovné :value.',
+        'string' => 'Pole :attribute musí byť menšie alebo rovné ako :value znakov.',
     ],
-    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'mac_address' => 'Pole :attribute musí obsahovať platnú MAC adresu.',
     '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' => 'Pole :attribute nemôže obsahovať viac ako :max položiek.',
+        'file' => 'Pole :attribute nemôže byť väčšie ako :max kilobajtov.',
+        'numeric' => 'Pole :attribute nemôže byť väčšie ako :max.',
+        'string' => 'Pole :attribute nemôže byť väčšie ako :max znakov.',
     ],
-    '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 nemôže obsahovať viac ako :max čislic.',
+    'mimes' => 'Pole :attribute musí obsahovať súbory typu: :values.',
+    'mimetypes' => 'Pole :attribute musí obsahovať súborytypu: :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 musí obsahovať minimálne :min položiek.',
+        'file' => 'Pole :attribute musí byť minimálne :min kilobajtov.',
+        'numeric' => 'Pole :attribute musí byť minimálne :min.',
+        'string' => 'Pole :attribute musí obsahovať minimálne :min znakov.',
     ],
-    '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.',
-    'not_in' => 'The selected :attribute is invalid.',
-    'not_regex' => 'The :attribute field format is invalid.',
-    'numeric' => 'The :attribute field must be a number.',
+    'min_digits' => 'Pole :attribute musí máť minimálne :min čislic.',
+    'missing' => 'Pole :attribute musí chýbať.',
+    'missing_if' => 'Pole :attribute musí chýbať keď :other je :value.',
+    'missing_unless' => 'Pole :attribute musí chýbať pokým :other je :value.',
+    'missing_with' => 'Pole :attribute musí chýbať keď :values sú prítomné.',
+    'missing_with_all' => 'Pole :attribute musí chýbať keď :values sú prítomné.',
+    'multiple_of' => 'Pole :attribute musí byť násobkom hodnoty :value.',
+    'not_in' => 'Označený :attribute je neplatný.',
+    'not_regex' => 'Pole :attribute má nesprávny formát.',
+    'numeric' => 'Pole :attribute musí obsahovať čislo.',
     '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 musí obsahovať aspoň jeden znak.',
+        'mixed' => 'Pole :attribute musí obsahovať aspoň jedno veľke a jedno mále písmeno.',
+        'numbers' => 'Pole :attribute musí obsahovať aspoň jedno čislo.',
+        'symbols' => 'Pole :attribute musí obsahovať aspoň jeden symbol.',
+        'uncompromised' => 'Zadaný :attribute sa nachádza na zozname dátových únikov. Prosím zvoľte iný :attribute.',
     ],
-    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+    'percent'       => 'Minimálne odpisy musia byť medzi 0 a 100, keď je typ odpisu percentuálny.',
 
-    'present' => 'The :attribute field must be present.',
-    '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.',
-    'required' => 'The :attribute field is required.',
-    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
-    'required_if' => 'The :attribute field is required when :other is :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_unless' => 'The :attribute field is required unless :other is in :values.',
-    'required_with' => 'The :attribute field is required when :values is present.',
-    'required_with_all' => 'The :attribute field is required when :values are present.',
-    'required_without' => 'The :attribute field is required when :values is not present.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same' => 'The :attribute field must match :other.',
+    'present' => 'Pole :attribute musí byť prítomné.',
+    'present_if' => 'Pole :attribute musí byť prítomné keď :other je :value.',
+    'present_unless' => 'Pole :attribute musí byť prítomné pokým :other je :value.',
+    'present_with' => 'Pole :attribute musí byť prítomné keď :values je prítomné.',
+    'present_with_all' => 'Pole :attribute musí byť prítomné keď :values sú prítomné.',
+    'prohibited' => 'Pole :attribute musí byť zakázané.',
+    'prohibited_if' => 'Pole :attribute je zakázané keď :other je :value.',
+    'prohibited_unless' => 'Pole :attribute je zakázané pokým :other je medzi :values.',
+    'prohibits' => 'Pole :attribute je zakáže zobrazovať :other.',
+    'regex' => 'Pole :attribute má nesprávny formát.',
+    'required' => 'Pole :attribute je povinné.',
+    'required_array_keys' => 'Pole :attribute musí obsahovať položky z :values.',
+    'required_if' => 'Pole :attribute je povinné keď :other je :value.',
+    'required_if_accepted' => 'Pole :attribute je povinné keď :other je akceptované.',
+    'required_if_declined' => 'Pole :attribute je povinné keď :other je odmietnuté.',
+    'required_unless' => 'Pole :attribute je povinné pokým :other je z :values.',
+    'required_with' => 'Pole :attribute je povinné keď :values sú prítomné.',
+    'required_with_all' => 'Pole :attribute je povinné keď :value sú prítomné.',
+    'required_without' => 'Pole :attribute je povinné keď :values nie sú prítomné.',
+    'required_without_all' => 'Pole :attribute je povinné keď žiadna z hodnôt :values nie je použitá.',
+    'same' => 'Pole :attribute sa musí zhodovať s :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' => 'Pole :attribute musí obsahovať :size položiek.',
+        'file' => 'Pole :attribute musí byť :size kilobajtov.',
+        'numeric' => 'Pole :attribute musí byť :size.',
+        'string' => 'Pole :attribute musí obsahovať :size znakov.',
     ],
-    'starts_with' => 'The :attribute field must start with one of the following: :values.',
-    'string'               => 'The :attribute must be a string.',
-    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique_undeleted'     => 'The :attribute must be unique.',
-    'non_circular'         => 'The :attribute must not create a circular reference.',
-    'not_array'            => ':attribute cannot be an array.',
+    'starts_with' => 'Pole :attribute musí začínať s jedným z nasledovných hodnôt: values.',
+    'string'               => 'Pole :attribute musí obsahovať text.',
+    'two_column_unique_undeleted' => 'Pole :attribute musí byť unikátne naprieč :table1 a :table2. ',
+    'unique_undeleted'     => 'Pole :attribute musí byť unikátne.',
+    'non_circular'         => 'Pole :attribute nemôže vytvárať kruhovú referenciu.',
+    'not_array'            => ':attribute nemôže byť poľom.',
     'disallow_same_pwd_as_user_fields' => 'Heslo nemôže byť rovnaké ako užívateľské meno.',
     'letters'              => 'Heslo musí obsahovať najmenej jedno písmeno.',
     'numbers'              => 'Heslo musí obsahovať najmenej jednu číslicu.',
     'case_diff'            => 'Heslo musí obsahovať veľké aj malé písmena.',
     'symbols'              => 'Heslo musí obsahovať symboly.',
-    'timezone' => 'The :attribute field must be a valid timezone.',
-    'unique' => 'The :attribute has already been taken.',
-    'uploaded' => 'The :attribute failed to upload.',
-    '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.',
+    'timezone' => 'Pole :attribute musí obsahovať platnú časovú zónu.',
+    'unique' => 'Pole :attribute už bolo vybrané.',
+    'uploaded' => 'Pole :attribute sa nepodarilo nahrať.',
+    'uppercase' => 'Pole :attribute musí obsahovať veľké písmená.',
+    'url' => 'Pole :attribute musí obsahovať správnu URL adresu.',
+    'ulid' => 'Pole :attribute musí obsahovať platný ULID.',
+    'uuid' => 'Pole :attribute musí obsahovať platný ULID.',
 
 
     /*
@@ -186,33 +186,33 @@
     */
 
     'custom' => [
-        'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
-        'hashed_pass'      => 'Your current password is incorrect',
-        'dumbpwd'          => 'That password is too common.',
-        'statuslabel_type' => 'You must select a valid status label type',
-        '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.',
+        'alpha_space' => 'Pole :attribute obsahuje nepovolený znak.',
+        'email_array'      => 'Neplatná jedna alebo viacero emailových adries.',
+        'hashed_pass'      => 'Vaše aktuálne heslo je nesprávne',
+        'dumbpwd'          => 'Heslo je príliš bežné.',
+        'statuslabel_type' => 'Musíte zvoliť platný typ stavového štítku',
+        'custom_field_not_found'          => 'Pole podľa všetkého neexistuje, prosím overte názvy vlastných polí.',
+        'custom_field_not_found_on_model' => 'Pole podľa všetkého existuje, avšak nie je dostupné pre sadu polí tohto modelu majetku.',
 
         // 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
         // people won't know how to format.
-        'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
-        'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
-        'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'termination_date.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'checkboxes'           => ':attribute contains invalid options.',
-        'radio_buttons'        => ':attribute is invalid.',
-        'invalid_value_in_field' => 'Invalid value included in this field',
+        'purchase_date.date_format'     => 'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'last_audit_date.date_format'   =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD hh:mm:ss',
+        'expiration_date.date_format'   =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'termination_date.date_format'  =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'expected_checkin.date_format'  =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'start_date.date_format'        =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'end_date.date_format'          =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'checkboxes'           => ':attribute obsahuje neplatné možnosti.',
+        'radio_buttons'        => ':attribute je neplatný.',
+        'invalid_value_in_field' => 'Neplatná hodnota zahrnutá v tomto poli',
 
         '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> (malé aj veľké znaky) pravdepodobne nebude fungovať. Mali by ste použiť <code>samaccountname</code> (malé znaky) namiesto neho.'
         ],
-        '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> nie je pravdepodobné platné pole pre filter autentifikácie. Pravdepodobne ste chceli <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Táto hodnota by nemala byť obalená v zátvorkách.'],
 
         ],
     /*
@@ -236,9 +236,9 @@
     */
 
     'generic' => [
-        'invalid_value_in_field' => 'Invalid value included in this field',
-        'required' => 'This field is required',
-        'email' => 'Please enter a valid email address',
+        'invalid_value_in_field' => 'Neplatná hodnota zahrnutá v tomto poli',
+        'required' => 'Toto pole je povinné',
+        'email' => 'Zadajte platnú e-mailovú adresu',
     ],
 
 
diff --git a/resources/lang/sl-SI/admin/settings/general.php b/resources/lang/sl-SI/admin/settings/general.php
index debba7567dde..42f3d6e605f2 100644
--- a/resources/lang/sl-SI/admin/settings/general.php
+++ b/resources/lang/sl-SI/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Dodatno besedilo noge ',
     'footer_text_help'          => 'To besedilo bo prikazano v desnem delu noge. Povezave so dovoljene z uporabo <a href="https://help.github.com/articles/github-flavored-markdown/">Gothub okusno markdown</a>. Prelomi vrstic, glave, slike itd. Lahko povzročijo nepredvidljive rezultate.',
     'general_settings'			=> 'Splošne nastavitve',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Privzeta EULA in več',
     'generate_backup'			=> 'Ustvari varnostno kopiranje',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP različica',
     'php_info'                  => 'PHP informacije',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinformacije, sistem, informacije',
     'php_overview_help'         => 'Php sistemske informacije',
     'php_gd_info'               => 'Za prikaz QR kod morate namestiti php-gd, glejte navodila za namestitev.',
     'php_gd_warning'            => 'PHP Obdelava slik in vtičnik GD nista nameščena.',
@@ -231,7 +229,6 @@
     'update'                    => 'Posodobi nastavitve',
     'value'                     => 'Vrednost',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logotip, ime strani',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'O nastavitvah',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Varnost',
     'security_title' => 'Posodobi varnostne nastavitve',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Lokalizacija',
     'localization_title' => 'Posodobi nastavitve lokalizacije',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Obvestila',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Oznake',
     'labels_title' => 'Posodobi nastavitve oznak',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'izbriši za vedno',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Tip 2D črtne kode',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Privzeto',
     'none'                  => 'Nobena',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinformacije, sistem, informacije',
+        'purge'             => 'izbriši za vedno',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/sl-SI/admin/settings/message.php b/resources/lang/sl-SI/admin/settings/message.php
index a0cbab22c25e..cf0a3b10f018 100644
--- a/resources/lang/sl-SI/admin/settings/message.php
+++ b/resources/lang/sl-SI/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/sl-SI/general.php b/resources/lang/sl-SI/general.php
index e1aae6e4f1b9..73cbb9e97938 100644
--- a/resources/lang/sl-SI/general.php
+++ b/resources/lang/sl-SI/general.php
@@ -217,6 +217,12 @@
     'no_results'			=> 'Ni rezultatov.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Opombe',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Številka naročila',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Prikazuj elemente _MENU_',
@@ -568,5 +574,8 @@
     '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',
 
 ];
diff --git a/resources/lang/so-SO/admin/settings/general.php b/resources/lang/so-SO/admin/settings/general.php
index 167fc30b6f9c..7cce7cb27f7a 100644
--- a/resources/lang/so-SO/admin/settings/general.php
+++ b/resources/lang/so-SO/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Qoraal Footer Dheeraad ah ',
     'footer_text_help'          => 'Qoraalkani waxa uu ka soo bixi doona cagtiisa midig. Isku xirka waa la ogol yahay isticmaalka <href="https://help.github.com/articles/github-flavored-markdown/">Github calaamadaynta dhadhanka</a>. Xadhka goosashada, madaxa, sawirada, iwm waxay keeni karaan natiijooyin aan la saadaalin karin.',
     'general_settings'			=> 'Goobaha Guud',
-    'general_settings_keywords' => 'taageerada shirkadda, saxeexa, aqbalaadda, qaabka iimaylka, qaabka adeegsadaha, sawirada, bog kasta, thumbnail, eula, gravatar, tos, dashboard, sir',
     'general_settings_help'     => 'EULA asalka ah iyo qaar kaloo badan',
     'generate_backup'			=> 'Samee kaabta',
     'google_workspaces'         => 'Goobaha shaqada Google',
@@ -154,7 +153,6 @@
     'php'                       => 'Nooca PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, nidaamka, macluumaadka',
     'php_overview_help'         => 'Macluumaadka Nidaamka PHP',
     'php_gd_info'               => 'Waa inaad ku rakibtaa php-gd si aad u muujiso koodka QR, eeg habka rakibaadda.',
     'php_gd_warning'            => 'Habaynta Sawirka PHP iyo GD plugin lama rakibin.',
@@ -231,7 +229,6 @@
     'update'                    => 'Cusbooneysii Settings',
     'value'                     => 'Qiimaha',
     'brand'                     => 'Calaamadaynta',
-    'brand_keywords'            => 'cagta, astaanta, daabacaadda, mawduuca, maqaarka, madaxa, midabada, midabka, css',
     'brand_help'                => 'Logo, Magaca Goobta',
     'web_brand'                 => 'Nooca calaamadda ganacsi ee webka',
     'about_settings_title'      => 'Ku saabsan Dejinta',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Ku shaandhee adigoo dejinaya erayga muhiimka ah',
     'security' => 'Amaan',
     'security_title' => 'Cusbooneysii Settings-ka amaanka',
-    'security_keywords' => 'password, passwords, baahiyaha, labo factor, labo-factor, passwords guud, fogaan kasoo gelid, kabixid, ogolaansho',
     'security_help' => 'Laba arrimood, Xakamaynta erayga sirta ah',
-    'groups_keywords' => 'ogolaansho, kooxda ogolaanshah, wakiilasho',
     'groups_help' => 'Kooxaha ogolaanshaha xisaabta',
     'localization' => 'Meeleyn',
     'localization_title' => 'Cusbooneysii Settings-ka meeleynta',
-    'localization_keywords' => 'meeleyn, lacag, gudaha, goob, goobta waqtiga, waqtiga goobta, caalami, wareejin, luuqad, luuqado, tarjamo',
     'localization_help' => 'Luqadda, soo bandhigida taariikhda',
     'notifications' => 'Baraarujin',
     'notifications_help' => 'Digniinaha Emailka & Sugidda Settings',
     'asset_tags_help' => 'Kordhinta iyo horgalayaasha',
     'labels' => 'Calaamadaha',
     'labels_title' => 'Cusbooneysii Settings Label',
-    'labels_help' => 'Cabbirrada summada &amp; goobaha',
-    'purge_keywords' => 'si joogto ah u tirtir',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Nooca Barcode 2D',
     'label2_2d_type_help'     => 'Qaabka barcode 2D',
     'label2_2d_target'        => 'Barcode Barcode 2D',
-    'label2_2d_target_help'   => 'URL-ka 2D barcode wuxuu tilmaamayaa marka la sawiro',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Qeexitaannada goobta',
     'label2_fields_help'      => 'Goobaha waa lagu dari karaa, laga saari karaa, oo dib loo habayn karaa tiirka bidix. Goob kasta, xulashooyin badan oo ah Label iyo DataSource ayaa lagu dari karaa, laga saari karaa, oo dib loo dalbi karaa tiirka saxda ah.',
     'help_asterisk_bold'    => 'Qoraalka loo galiyay sida <kood>**qoraal**</code> ayaa loo soo bandhigi doonaa si geesinimo leh',
     'help_blank_to_use'     => 'Banaan ku dhaaf si aad u isticmaasho qiimaha <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Asal ahaan',
     'none'                  => 'Midna',
     'google_callback_help' => 'Waa in halkan la geliyo ciwaank URL si loola xiriir appka Google OAuth&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">waaxda maamulka horumariyaasha Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'cagta, astaanta, daabacaadda, mawduuca, maqaarka, madaxa, midabada, midabka, css',
+        'general_settings'  => 'taageerada shirkadda, saxeexa, aqbalaadda, qaabka iimaylka, qaabka adeegsadaha, sawirada, bog kasta, thumbnail, eula, gravatar, tos, dashboard, sir',
+        'groups'            => 'ogolaansho, kooxda ogolaanshah, wakiilasho',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'meeleyn, lacag, gudaha, goob, goobta waqtiga, waqtiga goobta, caalami, wareejin, luuqad, luuqado, tarjamo',
+        'php_overview'      => 'phpinfo, nidaamka, macluumaadka',
+        'purge'             => 'si joogto ah u tirtir',
+        'security'          => 'password, passwords, baahiyaha, labo factor, labo-factor, passwords guud, fogaan kasoo gelid, kabixid, ogolaansho',
+    ],
+
 ];
diff --git a/resources/lang/so-SO/admin/settings/message.php b/resources/lang/so-SO/admin/settings/message.php
index f7ec78c52600..c518883c327b 100644
--- a/resources/lang/so-SO/admin/settings/message.php
+++ b/resources/lang/so-SO/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Waxbaa qaldamay. :app waxa uu kaga jawaabay: : error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/so-SO/general.php b/resources/lang/so-SO/general.php
index 8b5054831df0..803b6133bf8d 100644
--- a/resources/lang/so-SO/general.php
+++ b/resources/lang/so-SO/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Wax natiijo ah lama hayo.',
     'no'  					=> 'Maya',
     'notes'  				=> 'Xusuusin',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Nambarka dalbashada',
     'only_deleted'          => 'Kaliya Hantida La Tiray',
     'page_menu'				=> 'Muujinaya _MENU_ walxo',
@@ -566,5 +572,8 @@
     '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',
 
 ];
diff --git a/resources/lang/sq-AL/admin/settings/general.php b/resources/lang/sq-AL/admin/settings/general.php
index 6dcfee66be14..97567df8dfd4 100644
--- a/resources/lang/sq-AL/admin/settings/general.php
+++ b/resources/lang/sq-AL/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/sq-AL/admin/settings/message.php b/resources/lang/sq-AL/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/sq-AL/admin/settings/message.php
+++ b/resources/lang/sq-AL/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/sq-AL/general.php b/resources/lang/sq-AL/general.php
index 20c1cf8aeaae..77670b5a7e47 100644
--- a/resources/lang/sq-AL/general.php
+++ b/resources/lang/sq-AL/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     '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',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/sr-CS/admin/settings/general.php b/resources/lang/sr-CS/admin/settings/general.php
index d415b0d060a5..50226237bbb2 100644
--- a/resources/lang/sr-CS/admin/settings/general.php
+++ b/resources/lang/sr-CS/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Dodatni tekst u futeru ',
     'footer_text_help'          => 'Ovaj tekst će se pojaviti u desnom podnožju. Veze su dozvoljene korišćenjem <a href="https://help.github.com/articles/github-flavored-markdovn/">Github flavored markdovn</a>. Prelomi redova, zaglavlja, slike itd. mogu dovesti do nepredvidivih rezultata.',
     'general_settings'			=> 'Osnovna podešavanja',
-    'general_settings_keywords' => 'podrška kompanije, potpis, prihvatanje, format e-poruke, format korisničkog imena, slike, po stranici, sličica, ugovor o korišćenju, gravatar, uslovi usluga, komandna tabla, privatnost',
     'general_settings_help'     => 'Podrazumevani EULA i još mnogo toga',
     'generate_backup'			=> 'Generiši rezervnu kopiju',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP verzija',
     'php_info'                  => 'PHP informacije',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP sistem info',
     'php_gd_info'               => 'Morate da instalirate php-gd da biste prikazali QR kodove, pogledajte uputstva za instalaciju.',
     'php_gd_warning'            => 'PHP Image Processing i GD dodatak NIJE instaliran.',
@@ -231,7 +229,6 @@
     'update'                    => 'Obnovite podešavanja',
     'value'                     => 'Vrednost',
     'brand'                     => 'Brendiranje',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, naziv sajta',
     'web_brand'                 => 'Tip veb brendiranja',
     'about_settings_title'      => 'O podešavanjima',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrirajte po podešavanju ključne reči',
     'security' => 'Bezbednost',
     'security_title' => 'Obnovite bezbednosna podešavanja',
-    'security_keywords' => 'lozinka, lozinke, zahtevi, dva faktora, dva faktora, uobičajene lozinke, daljinsko prijavljivanje, odjava, autentifikacija',
     'security_help' => 'Dvofaktorska autentifikacija, ograničenja lozinkom',
-    'groups_keywords' => 'dozvole, grupe dozvola, ovlašćenje',
     'groups_help' => 'Grupe dozvola naloga',
     'localization' => 'Lokalizacija',
     'localization_title' => 'Obnovi podešavanja lokalizacije',
-    'localization_keywords' => 'okalizacija, valuta, lokalni, lokal, vremenska zona, vremenska zona, međunarodna, internacionalizacija, jezik, jezici, prevod',
     'localization_help' => 'Jezik, prikaz datuma',
     'notifications' => 'Obaveštenja',
     'notifications_help' => 'Obaveštenja e-poštom i podešavanja popisa',
     'asset_tags_help' => 'Povećavanje i prefiksi',
     'labels' => 'Oznake',
     'labels_title' => 'Obnovite podešavanja oznaka',
-    'labels_help' => 'Veličina oznake &amp; podešavanja',
-    'purge_keywords' => 'trajno brisanje',
+    'labels_help' => 'Podešavanja barkodova i nalepnica',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Vrsta 2D barkoda',
     'label2_2d_type_help'     => 'Format za 2D barkodove',
     'label2_2d_target'        => '2D barkod meta',
-    'label2_2d_target_help'   => 'URL adresa gde cilja 2D barkod kada se skenira',
+    'label2_2d_target_help'   => 'Podatak koji će biti sadržan u 2D barkodu',
     'label2_fields'           => 'Definicija polja',
     'label2_fields_help'      => 'Polja mogi biti dodata, uklonjena i presložena u levoj koloni. Za svako polje, višestruko opcija za Naziv i IzvorPodataka mogu biti dodato, uklonjeno i presloženo u desnoj koloni.',
     'help_asterisk_bold'    => 'Tekst unet kao <code>**tekst**</code> biće prikazan podebljan',
     'help_blank_to_use'     => 'Ostavite prazno da bi se koristila vrednost iz <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    'help_default_will_use' => '<code>:default</code> će koristiti vrednost iz <code>:setting_name</code>. <br>Upamtite da vrednost barkoda mora da se usaglasi sa specifikacijom odgovarajućeg barkoda da bi bio uspešno generisan. Molim vas pogledajte <a href="https://snipe-it.readme.io/docs/barcodes">dokumentaciju <i class="fa fa-external-link"></i></a> za više detalja. ',
+    'asset_id'              => 'ID imovine',
+    'data'               => 'Podatak',
     'default'               => 'Podrazumevano',
     'none'                  => 'Ništa',
     'google_callback_help' => 'Ovo treba uneti kao pozivna URL adresa u vašim Google OAuth podešavanjima aplikacije u vašoj organizaciji <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer konzole <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Koliko dana ranije pre očekivanog razduženja imovine bi trebalo biti navedena u stranici "Vreme je za razduživanje"?',
     'no_groups' => 'Još uvak nisu kreirane nikakve grupe. Poseti <code>Administrativna podešavanja > Grupe dozvola</code> da bi dodao neku.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'podrška kompanije, potpis, prihvatanje, format e-poruke, format korisničkog imena, slike, po stranici, sličica, ugovor o korišćenju, gravatar, uslovi usluga, komandna tabla, privatnost',
+        'groups'            => 'dozvole, grupe dozvola, ovlašćenje',
+        'labels'            => 'nalepvnice, barkodovi, barkod, listovi papira, štampa, upc, qr, 1d, 2d',
+        'localization'      => 'okalizacija, valuta, lokalni, lokal, vremenska zona, vremenska zona, međunarodna, internacionalizacija, jezik, jezici, prevod',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'trajno brisanje',
+        'security'          => 'lozinka, lozinke, zahtevi, dva faktora, dva faktora, uobičajene lozinke, daljinsko prijavljivanje, odjava, autentifikacija',
+    ],
+
 ];
diff --git a/resources/lang/sr-CS/admin/settings/message.php b/resources/lang/sr-CS/admin/settings/message.php
index 634bcfd96b99..2c45f063431f 100644
--- a/resources/lang/sr-CS/admin/settings/message.php
+++ b/resources/lang/sr-CS/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Nešto nije u redu. :app je adgovorila sa: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/sr-CS/general.php b/resources/lang/sr-CS/general.php
index fc8ba67e55ae..07d6d8dc31dc 100644
--- a/resources/lang/sr-CS/general.php
+++ b/resources/lang/sr-CS/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Nema rezultata.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Zabeleške',
+    'note_added'            => 'Napomena je dodata',
+    'add_note'              => 'Dodaj napomenu',
+    'note_edited'            => 'Napomena je izmenjena',
+    'edit_note'              => 'Izmeni napomenu',
+    'note_deleted'            => 'Napomena je obrisana',
+    'delete_note'              => 'Obriši napomenu',
     'order_number'          => 'Broj narudžbe',
     'only_deleted'          => 'Samo izbrisana sredstva',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     'import_asset_tag_exists' => 'Imovina sa oznakom imovine :asset_tag već postoji i izmena nije zatražena. Nijedna izmena nije izvršena.',
     'countries_manually_entered_help' => 'Vrednosti sa zvezdicom (*) su ručno upisane i ne poklapaju se sa postojećim ISO 3166 vrednostima iz padajućeg menija',
     'accessories_assigned' => 'Dodeljen dodatni pribor',
+    'user_managed_passwords' => 'Upravljanje lozinkama',
+    'user_managed_passwords_disallow' => 'Onemogući korisnicima da upravljaju svojim lozinkama',
+    'user_managed_passwords_allow' => 'Omogući korisnicima da upravljaju svojim lozinkama',
 
 ];
diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php
index 5f5eed587923..03c030ee2704 100644
--- a/resources/lang/sv-SE/admin/settings/general.php
+++ b/resources/lang/sv-SE/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Ytterligare sidfotstext ',
     'footer_text_help'          => 'Denna text kommer visas i höger sidfot. Länkar ska anges enligt <a href="https://help.github.com/articles/github-flavored-markdown/">Github-genererad markdown</a>. Radbrytningar, rubriker, bilder etc kan ge oförutsägbara resultat.',
     'general_settings'			=> 'Allmänna inställningar',
-    'general_settings_keywords' => 'företagets support, signatur, acceptans, e-postformat, användarnamnsformat, bilder, per sida, miniatyr, eula, gravatar, tos, instrumentpanel, integritet',
     'general_settings_help'     => 'Standard EULA och mer',
     'generate_backup'			=> 'Skapa säkerhetskopia',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP-version',
     'php_info'                  => 'PHP-information',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP-systeminformation',
     'php_gd_info'               => 'Du måste installera php-gd för att visa QR-koder. Se installationsanvisningarna.',
     'php_gd_warning'            => 'PHP Image Processing och GD plugin är INTE installerat.',
@@ -231,7 +229,6 @@
     'update'                    => 'Uppdatera inställningarna',
     'value'                     => 'Värde',
     'brand'                     => 'Varumärke',
-    'brand_keywords'            => 'sidfot, logotyp, tryck, tema, hud, rubrik, färger, färg, css',
     'brand_help'                => 'Logo, webbplatsens namn',
     'web_brand'                 => 'Webbprofilering',
     'about_settings_title'      => 'Om inställningar',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filtrera efter nyckelord',
     'security' => 'Säkerhet',
     'security_title' => 'Uppdatera säkerhetsinställningar',
-    'security_keywords' => 'lösenord, lösenord, krav, tvåfaktor, tvåfaktor, vanliga lösenord, distansinloggning, utloggning, autentisering',
     'security_help' => 'Tvåfaktor, lösenordsbegränsningar',
-    'groups_keywords' => 'behörigheter, behörighetsgrupper, auktorisation',
     'groups_help' => 'Behörighetsgrupper för konto',
     'localization' => 'Lokalisering',
     'localization_title' => 'Uppdatera lokaliseringsinställningar',
-    'localization_keywords' => 'lokalisering, valuta, lokal, lokal, tidszon, tidszon, internationell, internatinalisering, språk, språk, översättning',
     'localization_help' => 'Språk, datumvisning',
     'notifications' => 'Aviseringar',
     'notifications_help' => 'E-postnotiser och inventeringsinställningar',
     'asset_tags_help' => 'Inkrementering och prefix',
     'labels' => 'Etiketter',
     'labels_title' => 'Uppdatera etikettinställningar',
-    'labels_help' => 'Etikettstorlekar &amp; inställningar',
-    'purge_keywords' => 'radera permanent',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D streckkodstyp',
     'label2_2d_type_help'     => 'Format för 2D-streckkoder',
     'label2_2d_target'        => '2D streckkodslänkning',
-    'label2_2d_target_help'   => 'URL som 2D-streckkoden pekar mot när den skannas',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Fältdefiniering',
     'label2_fields_help'      => 'Fält kan läggas till, tas bort och ordnas om i den vänstra kolumnen. För varje fält kan flera alternativ för etikett- och datakällan läggas till, tas bort och ordnas om i högerspalten.',
     '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' => '<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. ',
+    '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',
     'default'               => 'Standard',
     'none'                  => 'Inga',
     'google_callback_help' => 'Detta bör anges som callback-URL inom dina Google OAuth-appinställningar i din organisation&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'Hur många dagar innan den förväntade incheckningen av en tillgång ska den anges på sidan "Förfaller för incheckning"?',
     'no_groups' => 'Inga grupper har skapats än. Besök <code>Administratörsinställningar > Grupper</code> för att lägga till en.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        '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',
+        'localization'      => 'lokalisering, valuta, lokal, lokal, tidszon, tidszon, internationell, internatinalisering, språk, språk, översättning',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'radera permanent',
+        'security'          => 'lösenord, lösenord, krav, tvåfaktor, tvåfaktor, vanliga lösenord, distansinloggning, utloggning, autentisering',
+    ],
+
 ];
diff --git a/resources/lang/sv-SE/admin/settings/message.php b/resources/lang/sv-SE/admin/settings/message.php
index 293b33917bf4..b924cbace172 100644
--- a/resources/lang/sv-SE/admin/settings/message.php
+++ b/resources/lang/sv-SE/admin/settings/message.php
@@ -45,5 +45,6 @@
         '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.',
     ]
 ];
diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php
index 8d050013e43a..cb52ec78f46a 100644
--- a/resources/lang/sv-SE/general.php
+++ b/resources/lang/sv-SE/general.php
@@ -216,6 +216,12 @@
     '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',
     'order_number'          => 'Ordernummer',
     'only_deleted'          => 'Endast borttagna tillgångar',
     'page_menu'				=> 'Visar _MENU_ objekt',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/ta-IN/admin/settings/general.php b/resources/lang/ta-IN/admin/settings/general.php
index eb640d0c9a12..a09a11da9a9c 100644
--- a/resources/lang/ta-IN/admin/settings/general.php
+++ b/resources/lang/ta-IN/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'பொது அமைப்புகள்',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'காப்பு உருவாக்குதல்',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP பதிப்பு',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'நீங்கள் QR குறியீடுகள் காட்ட PHP- ஜிடி நிறுவ வேண்டும், நிறுவல் வழிமுறைகளை பார்க்கவும்.',
     'php_gd_warning'            => 'PHP பட செயலாக்கம் மற்றும் GD சொருகி நிறுவப்படவில்லை.',
@@ -231,7 +229,6 @@
     'update'                    => 'அமைப்புகள் புதுப்பிக்கவும்',
     'value'                     => 'மதிப்பு',
     'brand'                     => 'பிராண்டிங்',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'அமைப்புகள் பற்றி',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2 டி பார்கோடு வகை',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/ta-IN/admin/settings/message.php b/resources/lang/ta-IN/admin/settings/message.php
index ea947b7e6bf8..3ac95cdd73cb 100644
--- a/resources/lang/ta-IN/admin/settings/message.php
+++ b/resources/lang/ta-IN/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/ta-IN/general.php b/resources/lang/ta-IN/general.php
index 5ea4a48d467c..2af760dcab8c 100644
--- a/resources/lang/ta-IN/general.php
+++ b/resources/lang/ta-IN/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'முடிவுகள் இல்லை.',
     'no'  					=> 'இல்லை',
     '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',
     'order_number'          => 'ஆர்டர் எண்',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> '_MENU_ உருப்படிகளைக் காண்பிக்கிறது',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/th-TH/admin/settings/general.php b/resources/lang/th-TH/admin/settings/general.php
index c84c12692d7b..b115cf7a1a78 100644
--- a/resources/lang/th-TH/admin/settings/general.php
+++ b/resources/lang/th-TH/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'ข้อความส่วนท้ายเพิ่มเติม ',
     'footer_text_help'          => 'ข้อความนี้จะปรากฏในส่วนท้ายด้านขวา ลิงค์ได้รับอนุญาตให้ใช้เครื่องหมาย <a href="https://help.github.com/articles/github-flavored-markdown/">Github รส</a>การแบ่งบรรทัดส่วนหัวภาพ ฯลฯ อาจส่งผลให้ไม่อาจคาดเดาได้',
     'general_settings'			=> 'การตั้งค่าทั่วไป',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'สร้างการสำรองข้อมูล',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'เวอร์ชัน PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'คุณต้องติดตั้ง php-gd เพื่อแสดง QR codes, ดูในคู่มือการติดตั้ง',
     'php_gd_warning'            => 'ยังไม่ได้ติดตั้ง PHP imgae processing และ GD plugin',
@@ -231,7 +229,6 @@
     'update'                    => 'แก้ไขการตั้งค่า',
     'value'                     => 'มูลค่า',
     'brand'                     => 'การสร้างแบรนด์',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'เกี่ยวกับการตั้งค่า',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'ประเภทบาร์โค้ด 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/th-TH/admin/settings/message.php b/resources/lang/th-TH/admin/settings/message.php
index 6f393e61b1d5..2a80b84653ed 100644
--- a/resources/lang/th-TH/admin/settings/message.php
+++ b/resources/lang/th-TH/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/th-TH/general.php b/resources/lang/th-TH/general.php
index be5e959e2848..20b7047f4c51 100644
--- a/resources/lang/th-TH/general.php
+++ b/resources/lang/th-TH/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'ไม่มีผลการค้นหา',
     'no'  					=> 'ไม่',
     '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',
     'order_number'          => 'เลขที่ใบสั่งซื้อ',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'กำลังแสดง_MENU_รายการ',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/tl-PH/admin/settings/general.php b/resources/lang/tl-PH/admin/settings/general.php
index df9b2c1e0586..704e31a68c20 100644
--- a/resources/lang/tl-PH/admin/settings/general.php
+++ b/resources/lang/tl-PH/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/tl-PH/admin/settings/message.php b/resources/lang/tl-PH/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/tl-PH/admin/settings/message.php
+++ b/resources/lang/tl-PH/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/tl-PH/general.php b/resources/lang/tl-PH/general.php
index 8884a5734d4d..5053efe3b942 100644
--- a/resources/lang/tl-PH/general.php
+++ b/resources/lang/tl-PH/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Ang mga Palatandaan',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/tr-TR/admin/settings/general.php b/resources/lang/tr-TR/admin/settings/general.php
index 324cf2d52b26..857be102951c 100644
--- a/resources/lang/tr-TR/admin/settings/general.php
+++ b/resources/lang/tr-TR/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Ek Altbilgi Metni ',
     'footer_text_help'          => 'Bu metin altbilginin sağ köşesinde görünür. Linklerde <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a> şeklinde kullanıma izin verilir. Satır sonu, satır başı, resimler vb. gibi içerikler beklenmeyen sonuçlara sebep olabilir.',
     'general_settings'			=> 'Genel Ayarlar',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Varsayılan EULA ve fazlası',
     'generate_backup'			=> 'Yedek Oluştur',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Versiyonu',
     'php_info'                  => 'PHP bilgisi',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'QR Kodlarını görüntülemek için php-gd yüklemelisiniz, kurulum talimatlarına bakınız.',
     'php_gd_warning'            => 'PHP Image Processing ve GD eklentileri yüklü değil.',
@@ -232,7 +230,6 @@
     'update'                    => 'Ayarları Güncelle',
     'value'                     => 'Değer',
     'brand'                     => 'Marka',
-    'brand_keywords'            => 'alt bilgi, logo, baskı, tema, cilt, üst bilgi, renkler, renk ve css ayarları',
     'brand_help'                => 'Logo, Site Adı',
     'web_brand'                 => 'Web Markalama Türü',
     'about_settings_title'      => 'Ayarlar Hakkında',
@@ -320,21 +317,17 @@
     'filter_by_keyword' => 'Anahtar kelime ile filtreleyin',
     'security' => 'Güvenlik',
     'security_title' => 'Güvenlik ayarlarını güncelle',
-    'security_keywords' => 'parolalar, gereksinimler, iki faktörlü, iki faktörlü, ortak parolalar, uzaktan oturum açma, oturum kapatma ve kimlik doğrulama',
     'security_help' => 'İki adımlı kimlik doğrulama',
-    'groups_keywords' => 'izinler, izin grupları, yetkilendirme',
     'groups_help' => 'Hesap izin grupları',
     'localization' => 'Yerelleştirme',
     'localization_title' => 'Yerelleştirme ayarlarını güncelle',
-    'localization_keywords' => 'yerelleştirme, para birimi, yerel, yerel ayar, saat dilimi, saat dilimi, uluslararası, uluslararasılaştırma, dil, diller, çeviri',
     'localization_help' => 'Dil, Tarih biçimi',
     'notifications' => 'Bilfirimler',
     'notifications_help' => 'E-posta Uyarıları ve Denetim Ayarları',
     'asset_tags_help' => 'Artış ve örnekler',
     'labels' => 'Etiket',
     'labels_title' => 'Etiket ayarlarını güncelle',
-    'labels_help' => 'Etiket tasarımı &amp;',
-    'purge_keywords' => 'kalıcı olarak sil',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -363,12 +356,14 @@
     'label2_2d_type'          => '2D Barkod Türü',
     'label2_2d_type_help'     => '2D barkodlar için format',
     'label2_2d_target'        => '2D Barkod Hedefi',
-    'label2_2d_target_help'   => '2D barkodun tarandığında işaret ettiği URL',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Alan Tanımları',
     'label2_fields_help'      => 'Alanlar sol sütuna eklenebilir, kaldırılabilir ve yeniden sıralanabilir. Her alan için sağ sütunda Etiket ve Veri Kaynağı için birden fazla seçenek eklenebilir, kaldırılabilir ve yeniden sıralanabilir.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => '<code>:setting_name</code> değerini kullanmak için boş bırakın',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Varsayılan',
     'none'                  => 'Hiçbiri',
     'google_callback_help' => 'Bu, kuruluşunuzun <strong><a href="https://console.cloud.google.com/" target="_blank">Google geliştirici konsolundaki < Google OAuth uygulama ayarlarınıza geri arama URL\'si olarak girilmelidir. i class = "fa fa-external-link" aria-hidden = "true"></i></a></strong>.',
@@ -390,4 +385,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'alt bilgi, logo, baskı, tema, cilt, üst bilgi, renkler, renk ve css ayarları',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'izinler, izin grupları, yetkilendirme',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'yerelleştirme, para birimi, yerel, yerel ayar, saat dilimi, saat dilimi, uluslararası, uluslararasılaştırma, dil, diller, çeviri',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'kalıcı olarak sil',
+        'security'          => 'parolalar, gereksinimler, iki faktörlü, iki faktörlü, ortak parolalar, uzaktan oturum açma, oturum kapatma ve kimlik doğrulama',
+    ],
+
 ];
diff --git a/resources/lang/tr-TR/admin/settings/message.php b/resources/lang/tr-TR/admin/settings/message.php
index b818a0dbdcd9..a70c25df0c97 100644
--- a/resources/lang/tr-TR/admin/settings/message.php
+++ b/resources/lang/tr-TR/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Bir şeyler yanlış gitti. :app bu şekilde yanıt verdi: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/tr-TR/general.php b/resources/lang/tr-TR/general.php
index cff0eb61ea1b..040ed1b31a90 100644
--- a/resources/lang/tr-TR/general.php
+++ b/resources/lang/tr-TR/general.php
@@ -219,6 +219,12 @@
     'no_results'			=> 'Sonuç Bulunamadı.',
     'no'  					=> 'Hayır',
     'notes'  				=> 'Notlar',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Sipariş Numarası',
     'only_deleted'          => 'Yalnızca Silinen Varlıklar',
     'page_menu'				=> '_MENU_ Öğe gösteriliyor',
@@ -570,5 +576,8 @@
     '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',
 
 ];
diff --git a/resources/lang/uk-UA/admin/consumables/message.php b/resources/lang/uk-UA/admin/consumables/message.php
index 6d4bbf236e76..929ce0e1c84b 100644
--- a/resources/lang/uk-UA/admin/consumables/message.php
+++ b/resources/lang/uk-UA/admin/consumables/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'invalid_category_type' => 'The category must be a consumable category.',
+    'invalid_category_type' => 'Категорія має бути категорією витратних матеріалів.',
     'does_not_exist' => 'Витратний матеріал не існує.',
 
     'create' => array(
diff --git a/resources/lang/uk-UA/admin/custom_fields/message.php b/resources/lang/uk-UA/admin/custom_fields/message.php
index c7e6e7dd443d..0df559dba958 100644
--- a/resources/lang/uk-UA/admin/custom_fields/message.php
+++ b/resources/lang/uk-UA/admin/custom_fields/message.php
@@ -5,7 +5,7 @@
     'field' => array(
         'invalid'   => 'Це поле не існує.',
         'already_added'   => 'Поле вже додане',
-        'none_selected'   => 'No field selected',
+        'none_selected'   => 'Не вибрано поле',
 
         'create' => array(
             'error'   => 'Поле не створено, будь ласка, спробуйте ще раз.',
diff --git a/resources/lang/uk-UA/admin/kits/general.php b/resources/lang/uk-UA/admin/kits/general.php
index 04cba1685bd8..495912607739 100644
--- a/resources/lang/uk-UA/admin/kits/general.php
+++ b/resources/lang/uk-UA/admin/kits/general.php
@@ -47,5 +47,5 @@
     'kit_deleted'                       => 'Набір було успішно видалено',
     'kit_model_updated'                 => 'Модель успішно оновлено',
     'kit_model_detached'                => 'Модель успішно від’єднано',
-    'model_already_attached'            => 'Model already attached to kit',
+    'model_already_attached'            => 'Модель вже прикріплена до комплекту',
 ];
diff --git a/resources/lang/uk-UA/admin/licenses/general.php b/resources/lang/uk-UA/admin/licenses/general.php
index 8bfe1112c95e..a5fed931c796 100644
--- a/resources/lang/uk-UA/admin/licenses/general.php
+++ b/resources/lang/uk-UA/admin/licenses/general.php
@@ -14,7 +14,7 @@
     'info'  					=> 'Інформація про ліцензію',
     'license_seats'  			=> 'Місця ліцензії',
     'seat'  					=> 'Місце',
-    'seat_count'  				=> 'Seat :count',
+    'seat_count'  				=> 'Місце :count',
     'seats'  					=> 'Кількість місць',
     'software_licenses'  		=> 'Ліцензії на програмне забезпечення',
     'user'  					=> 'Користувач',
@@ -24,12 +24,12 @@
         [
             'checkin_all'           => [
                 'button'            => 'Прийняти всі місця',
-                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'Ця дія перевірятиме всі місця в одному місці. | Ця дія буде перевіряти всі :checkedout_seats_count місць для цієї ліцензії.',
                 'enabled_tooltip'   => 'Прийняти ВСІ місця для цієї ліцензії від користувачів і активів',
                 'disabled_tooltip'  => 'Це вимкнено, тому що наразі немає місць',
                 'disabled_tooltip_reassignable'  => 'Це вимкнено, оскільки ліцензія не є розумною',
                 'success'           => 'Ліцензія успішно перевірена! | Всі ліцензії успішно перевірені!',
-                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
+                'log_msg'           => 'Зареєстровано через масове повернення ліцензій у графічному інтерфейсі ліцензій',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/uk-UA/admin/licenses/message.php b/resources/lang/uk-UA/admin/licenses/message.php
index d04ab6bf4cc6..7beee110a76d 100644
--- a/resources/lang/uk-UA/admin/licenses/message.php
+++ b/resources/lang/uk-UA/admin/licenses/message.php
@@ -44,13 +44,13 @@
         'error'   => 'Виникла проблема з перевіркою ліцензії. Спробуйте ще раз.',
         'success' => 'Ліцензію успішно перевірено',
         'not_enough_seats' => 'Недостатньо вільних ліцензійних місць для оформлення замовлення',
-        'mismatch' => 'The license seat provided does not match the license',
-        'unavailable' => 'This seat is not available for checkout.',
+        'mismatch' => 'Надане місце ліцензії не відповідає ліцензії',
+        'unavailable' => 'Це місце недоступне для видачі.',
     ),
 
     'checkin' => array(
         'error'   => 'Виникла помилка перевірки ліцензії. Будь ласка, спробуйте ще раз.',
-        'not_reassignable' => 'License not reassignable',
+        'not_reassignable' => 'Ліцензія не є допустимою',
         'success' => 'Ліцензія успішно перевірена'
     ),
 
diff --git a/resources/lang/uk-UA/admin/locations/message.php b/resources/lang/uk-UA/admin/locations/message.php
index bc53b6ff246c..b51b579702a1 100644
--- a/resources/lang/uk-UA/admin/locations/message.php
+++ b/resources/lang/uk-UA/admin/locations/message.php
@@ -8,7 +8,7 @@
     'assoc_child_loc'	 => 'Це місцезнаходження наразі батько принаймні одного дочірнього місця і не може бути видалений. Будь ласка, оновіть ваше місцеположення, щоб більше не посилатися на це місце і повторіть спробу. ',
     'assigned_assets' => 'Призначені активи',
     'current_location' => 'Поточне місцезнаходження',
-    'open_map' => 'Open in :map_provider_icon Maps',
+    'open_map' => 'Відкрити в картах :map_provider_icon',
 
 
     'create' => array(
diff --git a/resources/lang/uk-UA/admin/models/message.php b/resources/lang/uk-UA/admin/models/message.php
index cfb2e074d597..1b85c8f93a10 100644
--- a/resources/lang/uk-UA/admin/models/message.php
+++ b/resources/lang/uk-UA/admin/models/message.php
@@ -7,7 +7,7 @@
     '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/uk-UA/admin/reports/general.php b/resources/lang/uk-UA/admin/reports/general.php
index 911fd02ce3d0..e9930fd97e6d 100644
--- a/resources/lang/uk-UA/admin/reports/general.php
+++ b/resources/lang/uk-UA/admin/reports/general.php
@@ -14,9 +14,9 @@
         'user_country' => 'Країна',
         'user_zip' => 'Поштовий індекс користувача'
     ],
-    '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' => 'Відкрити збережений шаблон',
+    'save_template' =>  'Зберегти шаблон',
+    'select_a_template' => 'Виберіть шаблон',
+    'template_name' => 'Ім\'я шаблону',
+    'update_template' => 'Оновити шаблон',
 ];
diff --git a/resources/lang/uk-UA/admin/reports/message.php b/resources/lang/uk-UA/admin/reports/message.php
index 2800bbdf0bc5..fef10a344799 100644
--- a/resources/lang/uk-UA/admin/reports/message.php
+++ b/resources/lang/uk-UA/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' => 'Про Збережені шаблони',
+    'saving_templates_description' => 'Виберіть ваші опції, потім введіть назву вашого шаблону в поле вище та натисніть кнопку «Зберегти шаблон». Використовуйте спадне меню для вибору раніше збереженого шаблону.',
     'create'  => [
-        'success' => 'Template saved successfully',
+        'success' => 'Шаблон успішно збережено',
     ],
     'update' => [
-        'success' => 'Template updated successfully',
+        'success' => 'Шаблон успішно оновлено',
     ],
     'delete' => [
-        'success' => 'Template deleted',
-        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+        'success' => 'Шаблон видалено',
+        'no_delete_permission' => 'Шаблону не існує або ви не маєте дозволу на видалення.',
     ],
 ];
diff --git a/resources/lang/uk-UA/admin/settings/general.php b/resources/lang/uk-UA/admin/settings/general.php
index ccbe15db7c96..a3d6704e413e 100644
--- a/resources/lang/uk-UA/admin/settings/general.php
+++ b/resources/lang/uk-UA/admin/settings/general.php
@@ -31,8 +31,8 @@
     'backups'					=> 'Резервні копії',
     'backups_help'              => 'Створення, завантаження і відновлення резервних копій ',
     'backups_restoring'         => 'Відновлення з резервної копії',
-    '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' => 'Очистити резервну копію бази даних перед відновленням',
+    'backups_clean_helptext' => "Це може бути корисно, якщо ви змінюєте версії бази даних",
     'backups_upload'            => 'Завантажити резервну копію',
     'backups_path'              => 'Резервні копії на сервері зберігаються в <code>:path</code>',
     'backups_restore_warning'   => 'Скористайтеся кнопкою відновлення <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span> </small> для відновлення з попередньої резервної копії. (Наразі це не працює зі сховищем файлів S3 або Docker.)<br><br>Ваша <strong>вся база даних :app_name і всі завантажені файли будуть повністю замінені</strong> файлом резервної копії.  ',
@@ -51,11 +51,11 @@
     'default_eula_text'			=> 'EULA за замовчуванням',
     'default_language'			=> 'Мова за замовчуванням',
     'default_eula_help_text'	=> 'Ви також можете пов\'язати користувальницькі EULA з конкретними категоріями активів.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Додати примітку для вашого рішення (необов\'язково)',
     'display_asset_name'        => 'Відображення назви активу',
     'display_checkout_date'     => 'Показувати дату оформлення замовлення',
     'display_eol'               => 'Відображати EOL у вигляді таблиці',
-    'display_qr'                => 'Display 2D barcode',
+    'display_qr'                => 'Показати 2D штрих-код',
     'display_alt_barcode'		=> 'Відображати 1D штрих-код',
     'email_logo'                => 'Логотип електронної пошти',
     'barcode_type'				=> '2D тип коду',
@@ -70,7 +70,6 @@
     'footer_text'               => 'Додатковий текст у футері ',
     'footer_text_help'          => 'Цей текст з\'явиться у правому нижньому колонтитулі. Посилання дозволені використовувати <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Розриви ліній, заголовки, зображення і т. д. можуть призвести до непередбачуваних результатів.',
     'general_settings'			=> 'Загальні налаштування',
-    'general_settings_keywords' => 'компанія підтримує, підпис, прийнятання, формат електронної пошти, формату, картинки, на одну сторінку, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'EULA за замовчуванням',
     'generate_backup'			=> 'Створити резервну копію',
     'google_workspaces'         => 'Робочі області Google',
@@ -96,7 +95,7 @@
     'ldap_login_sync_help'      => 'Це тільки тести, що LDAP може синхронізувати правильно. Якщо ваша запит автентифікації LDAP не правильна, користувачі все одно можуть увійти в систему. Ви ПОВИННІ ЗБЕРЕГТИ ВАШ ВИДАЛЕНО ДОДАТНО ДОСТУПНІ ПЕРШЕНЬ.',
     'ldap_manager'              => 'Менеджер LDAP',
     'ldap_server'               => 'Сервер LDAP',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+    'ldap_server_help'          => 'Це має починатися з ldap:// (для незахищених) або ldaps:// (для TLS або SSL)',
     'ldap_server_cert'			=> 'Перевірка SSL сертифікату LDAP',
     'ldap_server_cert_ignore'	=> 'Дозволити недійсний SSL сертифікат',
     'ldap_server_cert_help'		=> 'Виберіть цей прапорець, якщо ви використовуєте самостійно підписаний SSL сертифікат і хотіли б прийняти неприпустимий SSL сертифікат.',
@@ -124,8 +123,8 @@
     'ldap_test'                 => 'Тестувати LDAP',
     'ldap_test_sync'            => 'Тестувати синхронізацію LDAP',
     'license'                   => 'Ліцензія програмного забезпечення',
-    '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'               => 'Завантажити віддалені аватари',
+    'load_remote_help_text'		=> 'Зніміть цей прапорець, якщо інсталяція не може завантажити скрипти з зовнішнього Інтернету. Це не дозволить Snipe-IT спробувати завантажити аватари з Gravatar або інших зовнішні джерела.',
     'login'                     => 'Спроби входу в систему',
     'login_attempt'             => 'Спроби входу в систему',
     'login_ip'                  => 'IP-адреса',
@@ -152,9 +151,8 @@
     'optional'					=> 'необов\'язково',
     'per_page'                  => 'Результатів на стор',
     'php'                       => 'Версія PHP',
-    'php_info'                  => 'PHP info',
+    'php_info'                  => 'PHP інформація',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, система, інформація',
     'php_overview_help'         => 'Інформація про систему PHP',
     'php_gd_info'               => 'Ви повинні встановити php-gd, щоб відобразити QR-коди, дивіться інструкції встановлення.',
     'php_gd_warning'            => 'Обробка PHP зображень та GD плагін НЕ встановлені.',
@@ -220,8 +218,8 @@
     'webhook_integration_help'    => 'Інтеграція :app необов’язкова, однак Endpoint та канал потрібні, якщо ви бажаєте її використовувати. Щоб налаштувати інтеграцію :app, потрібно спочатку <a href=":webhook_link" target="_new" rel="noopener">створити вхідний вебхук</a> у своєму обліковому записі :app. Натисніть кнопку <strong>Тест Інтеграції :app</strong>, щоб підтвердити правильність налаштувань перед збереженням. ',
     'webhook_integration_help_button'    => 'Як тільки ви зберегли свою інформацію :app , з\'явиться тестова кнопка.',
     'webhook_test_help'           => 'Перевірте, чи налаштована інтеграція :app коректно. ВИ ПОВИННІ ЗБЕРЕЖЕТЕ ВАШЕ ОНОВАНО :app SETTINGS FIRST.',
-    'shortcuts_enabled'         => 'Enable Shortcuts',
-    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
+    'shortcuts_enabled'         => 'Увімкнути ярлики',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + клавіша доступу, <strong>Mac</strong>: Control + Option + клавіша доступу',
     'snipe_version'  			=> 'Версія Snipe-IT',
     'support_footer'            => 'Підтримка посилань в футері ',
     'support_footer_help'       => 'Вкажіть, хто бачить посилання на інформацію підтримки Snipe-IT та посібник користувача',
@@ -231,7 +229,6 @@
     'update'                    => 'Оновити налаштування',
     'value'                     => 'Цінність',
     'brand'                     => 'Фірмове оформлення',
-    'brand_keywords'            => 'нижній, логотип, принтер, тема, шкіра, кольори, колір, css',
     'brand_help'                => 'Лого - Назва сайту',
     'web_brand'                 => 'Тип Веб-брендінгу',
     'about_settings_title'      => 'Про налаштування',
@@ -280,8 +277,8 @@
     'two_factor_enrollment_text'	=> "Для двофакторної автентифікації необхідно, однак ваш пристрій ще не було встановлено. Відкрийте додаток Google Authenticator і відскануйте QR-код нижче, щоб закріпити ваш пристрій. Після того, як ви увійдете на своєму пристрої, введіть код нижче",
     'require_accept_signature'      => 'Вимагати підпис',
     'require_accept_signature_help_text'      => 'Увімкнення цієї функції для фізичного підписання активів потребує від користувачів.',
-    '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'  => 'Вимагати примітки при поверненні/видачі',
+    'require_checkinout_notes_help_text'    => 'Увімкнення цієї функції вимагатиме заповнення полів приміток при поверненні або видачі активу.',
     'left'        => 'ліворуч',
     'right'        => 'правий',
     'top'        => 'згори',
@@ -293,18 +290,18 @@
     'zerofill_count'        => 'Довжина тегів медіафайлів, включаючи нульовий рівень',
     'username_format_help'   => 'Цей параметр буде використовуватися лише процесом імпорту, якщо ім\'я користувача не надано, а ми повинні згенерувати ім\'я користувача.',
     'oauth_title' => 'Налаштування OAuth API',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Клієнти OAuth',
     'oauth' => 'OAuth',
     'oauth_help' => 'Параметри кінцевої точки Oauth',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    '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_no_clients' => 'Ви ще не створили жодних клієнтів OAuth.',
+    'oauth_secret' => 'Секрет',
+    'oauth_authorized_apps' => 'Авторизовані додатки',
+    'oauth_redirect_url' => 'Переадресація URL',
+    'oauth_name_help' => ' Щось, що ваші користувачі будуть впізнавати та довіряти.',
+    'oauth_scopes' => 'Області використання',
+    'oauth_callback_url' => 'URL зворотного виклику авторизації вашого застосунку.',
+    'create_client' => 'Створити клієнта',
+    'no_scopes' => 'Немає областей',
     'asset_tag_title' => 'Оновити налаштування тегу активу',
     'barcode_title' => 'Оновити налаштування штрих-коду',
     'barcodes' => 'Barcodes',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Фільтрувати за налаштуванням ключового слова',
     'security' => 'Безпека',
     'security_title' => 'Оновити налаштування безпеки',
-    'security_keywords' => 'пароль, паролі, вимоги, два фактори, двофакторна аутентифікація, загальні паролі, авторизація, вхід, вхід, авторизація',
     'security_help' => 'Двофакторний, Обмеження паролю',
-    'groups_keywords' => 'дозволи, групи дозволів, авторизація',
     'groups_help' => 'Групи дозволів облікового запису',
     'localization' => 'Локалізація',
     'localization_title' => 'Оновити параметри локалізації',
-    'localization_keywords' => 'локалізація, валюта, локальна, локальна, часова зона, інтернатізація, мова, мова, переклад',
     'localization_help' => 'Мова, відображення',
     'notifications' => 'Сповіщення',
     'notifications_help' => 'Налаштування e-mail оповіщення та аудиту',
     'asset_tags_help' => 'Збільшення і префіксів',
     'labels' => 'Мітки',
     'labels_title' => 'Оновити налаштування Міток',
-    'labels_help' => 'Розміри етикеток і налаштування',
-    'purge_keywords' => 'остаточно видалити',
+    'labels_help' => 'Налаштування штрих-кодів та етикеток.',
     'purge_help' => 'Знищити вилучені записи',
     'ldap_extension_warning' => 'Схоже, що розширення LDAP встановлено або увімкнено на цьому сервері. Ви все ще можете зберігати ваші налаштування, але вам потрібно буде увімкнути розширення LDAP для PHP перед синхронізацією LDAP або можливістю входу в систему.',
     'ldap_ad' => 'LDAP/реклама',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D тип коду',
     'label2_2d_type_help'     => 'Формат для 2D кодів',
     'label2_2d_target'        => '2D код штрих-коду ціль',
-    'label2_2d_target_help'   => 'URL точки 2D штрихування при скануванні',
+    'label2_2d_target_help'   => 'Дані, що будуть містяться у 2D штрих-коді',
     'label2_fields'           => 'Визначення полів',
     'label2_fields_help'      => 'Поля можна додавати, видаляти та впорядкувати у лівому стовпчику. Для кожного поля декілька варіантів для Мітки і DataSource можна додати, видалити і змінити порядок у правій колонці.',
     'help_asterisk_bold'    => 'Введений <code>**текст**</code> буде відображатися як жирний',
     'help_blank_to_use'     => 'Залиште порожнім, щоб використовувати значення від <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    'help_default_will_use' => '<code>:default</code> використовуватиме значення з <code>:setting_name</code>. <br>Зверніть увагу, що значення штрих-кодів повинні відповідати відповідним стандартам штрих-кодів, щоб вони могли бути успішно згенеровані. Для отримання додаткової інформації перегляньте <a href="https://snipe-it.readme.io/docs/barcodes">документацію <i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'ID Активу',
+    'data'               => 'Дані',
     'default'               => 'Типово',
     'none'                  => 'Без ефекту',
     'google_callback_help' => 'Це потрібно ввести як URL-адресу зворотного виклику в налаштуваннях програми Google OAuth вашої організації на <strong><a href="https://console.cloud.google.com/" target="_blank">консолі розробника Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -379,14 +374,27 @@
     'database_driver' => 'Драйвер баз даних',
     'bs_table_storage' => 'Складський стіл',
     'timezone' => 'Timezone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
-    'default_avatar' => 'Upload custom default avatar',
+    'profile_edit'          => 'Редагувати профіль',
+    'profile_edit_help'          => 'Дозволити користувачам редагувати свої профілі.',
+    'default_avatar' => 'Завантажити стандартний аватар',
     'default_avatar_help' => 'Це зображення буде показано в профіль, якщо у користувача немає профілю.',
-    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar' => 'Відновити <a href=":default_avatar" data-toggle="lightbox" data-type="image">стандартний системний аватар</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' => 'Попередження про повернення',
+    'due_checkin_days_help' => 'Скільки днів до очікуваного повернення активу він має з\'являтися на сторінці "Повинен бути повернутий"?',
+    'no_groups' => 'Групи ще не були створені. Перейдіть до <code>Налаштування адміністратора > Групи доступу</code>, щоб додати одну.',
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'нижній, логотип, принтер, тема, шкіра, кольори, колір, css',
+        'general_settings'  => 'компанія підтримує, підпис, прийнятання, формат електронної пошти, формату, картинки, на одну сторінку, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'дозволи, групи дозволів, авторизація',
+        'labels'            => 'етикетки, штрих-коди, листи, друк, верхні, qr, 1d, 2d',
+        'localization'      => 'локалізація, валюта, локальна, локальна, часова зона, інтернатізація, мова, мова, переклад',
+        'php_overview'      => 'phpinfo, система, інформація',
+        'purge'             => 'остаточно видалити',
+        'security'          => 'пароль, паролі, вимоги, два фактори, двофакторна аутентифікація, загальні паролі, авторизація, вхід, вхід, авторизація',
+    ],
 
 ];
diff --git a/resources/lang/uk-UA/admin/settings/message.php b/resources/lang/uk-UA/admin/settings/message.php
index 119e7b1287a7..c4afe0fec32c 100644
--- a/resources/lang/uk-UA/admin/settings/message.php
+++ b/resources/lang/uk-UA/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Щось пішло не так. :app відповів(-ла) з: :error_message',
         'error_redirect' => 'ПОМИЛКА: 301/302 :endpoint повертає редиректор. З міркувань безпеки ми не слідуємо перенаправленням. Будь ласка, використовуйте фактичну кінцеву точку.',
         'error_misc' => 'Щось пішло не так. :( ',
+        'webhook_fail' => 'не вдалося надіслати повідомлення webhook для перевірки: Переконайтесь, що посилання ще дійсне.',
     ]
 ];
diff --git a/resources/lang/uk-UA/auth/message.php b/resources/lang/uk-UA/auth/message.php
index e6145e7e98fa..ed3560009364 100644
--- a/resources/lang/uk-UA/auth/message.php
+++ b/resources/lang/uk-UA/auth/message.php
@@ -14,8 +14,8 @@
         'success'               => 'Ви успішно увійшли в систему.',
         'code_required'         => 'Необхідно вказати двофакторний код.',
         'invalid_code'          => 'Двофакторний код невірний.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Будь ласка, введіть свій код двофакторної аутентифікації.',
+        'please_enroll'         => 'Будь ласка, зареєструйте пристрій для двофакторної автентифікації.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/uk-UA/general.php b/resources/lang/uk-UA/general.php
index e91de667c406..367fa8ab3895 100644
--- a/resources/lang/uk-UA/general.php
+++ b/resources/lang/uk-UA/general.php
@@ -78,7 +78,7 @@
     'consumables'			=> 'Витратні матеріали',
     'country'  				=> 'Країна',
     'could_not_restore'     => 'Помилка відновлення :item_type: :error',
-    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
+    'not_deleted'           => ':item_type не був видалений і тому не може бути відновлений',
     'create'				=> 'Створити новий',
     'created'               => 'Елемент створено',
     'created_asset'			=> 'створений актив',
@@ -99,7 +99,7 @@
     'debug_warning_text'    => 'Ця програма працює в робочому режимі з увімкненим відлагодженням. Це може призвести до розкриття конфіденційних даних, якщо ваша програма доступна зовнішньому світу. Вимкніть режим налагодження, установивши для значення <code>APP_DEBUG</code> у вашому файлі <code>.env</code> значення <code>false</code>.',
     'delete'  				=> 'Видалити',
     'delete_confirm'  		=> 'Ви впевнені, що бажаєте видалити :item?',
-    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+    'delete_confirm_no_undo' => 'Ви впевнені, що бажаєте видалити :item? Це незворотня дія.',
     'deleted'  				=> 'Видалено',
     'delete_seats'  		=> 'Видалені місця',
     'deletion_failed'       => 'Помилка видалення',
@@ -135,7 +135,7 @@
     'lastname_firstinitial' => 'Прізвище Першою початковою (smith_j@example.com)',
     'firstinitial.lastname' => 'Перше початкове ім\'я (j.smith@example.com)',
     'firstnamelastinitial'  => 'Останнє ім\'я (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    'lastnamefirstname'      => 'Прізвище. Ім\'я (smith.jane@example.com)',
     'first_name'			=> 'Ім\'я',
     'first_name_format'		=> 'Ім\'я (jane@example.com)',
     'files'                 => 'Файли',
@@ -157,9 +157,9 @@
     'image_delete'         	=> 'Видалити зображення',
     'include_deleted'       => 'Включати видалені активи',
     'image_upload'         	=> 'Завантажити зображення',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
-    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Прийнятий тип файлу - :types. Максимально дозволений розмір - :siz.|Прийнятні типи файлів :types. Максимальний розмір завантаження - :size.',
+    'filetypes_size_help'   => 'Максимальний розмір завантажуваного файлу - :size.',
+    'image_filetypes_help'  => 'Допустимі типи файлів - jpg, webp, png, gif і svg. Максимальний дозволений розмір файлу :size.',
     'unaccepted_image_type'  => 'Цей файл зображення не був прочитаний. Допустимі типи файлів - jpg, webp, png, gif та svg. Mimetype цього файлу: :mimetype.',
     'import'         	    => 'Імпорт',
     'import_this_file'      => 'Поля карти і обробка цього файлу',
@@ -184,7 +184,7 @@
     'licenses_available'	=> 'Можливі ліцензії',
     'licenses'				=> 'Ліцензії',
     'list_all'				=> 'Список всіх',
-    'loading'				=> 'Loading... please wait...',
+    'loading'				=> 'Завантаження... Будь ласка, зачекайте...',
     'lock_passwords'        => 'Це значення поля не буде збережено в демо версії.',
     'feature_disabled'      => 'Ця функція може бути відключена в демо версіїї.',
     'location'              => 'Місцезнаходження',
@@ -194,7 +194,7 @@
     'logout'				=> 'Вийти',
     'lookup_by_tag'     => 'Пошук за тегом актива',
     'maintenances'          => 'Обслуговування',
-    'manage_api_keys'       => 'Manage API keys',
+    'manage_api_keys'       => 'Керувати API ключами',
     'manufacturer'			=> 'Виробник',
     'manufacturers'			=> 'Виробники',
     'markdown'				=> 'Це поле дозволяє використовувати <a href="https://help.github.com/articles/github-flavored-markdown/"> Github markdown</a>.',
@@ -207,8 +207,8 @@
     'new_password'          => 'Новий пароль',
     'next'					=> 'Далі',
     'next_audit_date'		=> 'Дата наступного аудиту',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'next_audit_date_help'  => 'Якщо у вашій організації використовується аудит, ця дата зазвичай розраховується автоматично на основі останньої дати аудиту активу та частоти аудиту (в розділі <code>Налаштування адміністратора &gt; Сповіщення</code>), і ви можете залишити це поле порожнім. Якщо потрібно, ви можете вручну встановити цю дату тут, але вона має бути пізнішою за останню дату аудиту. ',
+    'audit_images_help'     => 'Ви можете знайти зображення аудиту в історії активів.',
     'no_email'              => 'Немає адреси електронної пошти, пов\'язаної з цим користувачем',
     'last_audit'		    => 'Останній аудит',
     'new'					=> 'нове!',
@@ -216,6 +216,12 @@
     'no_results'			=> 'Нічого не знайдено.',
     'no'  					=> 'Ні',
     'notes'  				=> 'Примітки.',
+    'note_added'            => 'Примітку додано',
+    'add_note'              => 'Додати примітку',
+    'note_edited'            => 'Нотатку відредаговано',
+    'edit_note'              => 'Редагувати примітку',
+    'note_deleted'            => 'Нотатку видалено',
+    'delete_note'              => 'Видалити примітку',
     'order_number'          => 'Номер замовлення',
     'only_deleted'          => 'Тільки видалені активи',
     'page_menu'				=> 'Показати _елементи MENU_',
@@ -230,7 +236,7 @@
     'purchase_date'         => 'Дата покупки',
     'qty'		            => 'К-КСТЬ',
     'quantity'		        => 'Кількість',
-    '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'      => 'У вас є один пункт нижче або близько мінімальної кількості елементів|У вас є :count елементів нижче або близько мінімального рівня кількості',
     'quickscan_checkin'  	=> 'Швидке сканування входу',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Готовий до видачі',
@@ -241,21 +247,21 @@
     'restored'				=> 'відновлено',
     'restore'				=> 'Відновити',
     'requestable_models'    => 'Необхідно ввести моделі',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Запитувані речі',
     'requested'				=> 'Запрошено користувачем',
     'requested_date'        => 'Дата запиту',
     'requested_assets'      => 'Запитані активи',
     'requested_assets_menu' => 'Запитані активи',
     'request_canceled'      => 'Запит скасовано',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_item'          => 'Запросити цю річ',
+    'external_link_tooltip' => 'Зовнішнє посилання на',
     'save'  				=> 'Зберегти',
     'select_var'            => 'Оберіть :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Обрати',
     'select_all'            => 'Виділити все',
     'search'				=> 'Пошук',
     'select_category'       => 'Оберіть категорію',
-    'select_datasource' => 'Select a data source',
+    'select_datasource' => 'Виберіть джерело даних',
     'select_department'     => 'Оберіть відділ',
     'select_depreciation'	=> 'Оберіть тип амортизації',
     'select_location'		=> 'Оберіть розташування',
@@ -275,15 +281,15 @@
     'signed_off_by'         => 'Підписано за',
     'skin'       			=> 'Шкіра',
     'webhook_msg_note'        => 'Повідомлення буде надіслано через webhook',
-    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'О, клас! Здається, що ваша інтеграція з Snipe-IT працює!',
     'some_features_disabled' => 'РЕЖИМ ДЕМО: Деякі функції відключені.',
     'site_name'				=> 'Назва сайту',
     'state'  				=> 'Статус',
     'status_labels'			=> 'Статуси активів',
-    'status_label'			=> 'Status Label',
+    'status_label'			=> 'Позначка статусу',
     'status'    			=> 'Статус',
     'accept_eula'           => 'Угода про погодження',
-    'show_or_hide_eulas' => 'Show/Hide EULAs',
+    'show_or_hide_eulas' => 'Показати/приховати EULA',
     'supplier'              => 'Постачальник',
     'suppliers'  			=> 'Постачальники',
     'sure_to_delete'        => 'Ви впевнені, що бажаєте видалити',
@@ -302,13 +308,13 @@
     'username_format'		=> 'Формат імені користувача',
     'username'              => 'Ім\'я кристувача',
     'update'                => 'Оновлення',
-    'updating_item' => 'Updating :item',
+    'updating_item' => 'Оновлення :item',
     'upload_filetypes_help'      => 'Дозволені типи файлів - png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, xml, zip, rtf і rar. Максимальний розмір завантаження - :size.',
     'uploaded'              => 'Завантажено',
     'user'					=> 'Користувач',
     'accepted'			    => 'прийнято',
     'declined'			    => 'відхилено',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Відхилені примітки',
     'unassigned'            => 'Непризначений',
     'unaccepted_asset_report' => 'Неприйняті активи',
     'users'                 => 'Користувачі',
@@ -343,16 +349,16 @@
     'view_all'              => 'переглянути все',
     'hide_deleted'          => 'Приховати видалені',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do not change',
-    'bug_report'            => 'Report a bug',
+    'do_not_change'         => 'Не змінюйте',
+    'bug_report'            => 'Повідомити про помилку',
     'user_manual'           => 'Керівництво користувача',
     'setup_step_1'          => 'Крок 1',
     'setup_step_2'          => 'Крок 2',
     'setup_step_3'          => 'Крок 3',
     'setup_step_4'          => 'Крок 4',
     'setup_config_check'    => 'Перевірка конфігурації',
-    'setup_create_database' => 'Create database tables',
-    'setup_create_admin'    => 'Create an admin user',
+    'setup_create_database' => 'Створити таблиці бази даних',
+    'setup_create_admin'    => 'Створити Адміністратора',
     'setup_done'            => 'Завершено!',
     'bulk_edit_about_to'    => 'Ви збираєтеся редагувати наступне: ',
     'checked_out'           => 'Видано',
@@ -409,9 +415,9 @@
     'accessory_name'       => 'Назва аксесуара:',
     'clone_item'            => 'Клонувати предмет',
     'checkout_tooltip' => 'Перевірте цей елемент',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkin_tooltip' => 'Позначте цей пункт, щоб він був доступний для повторного зчитування, та інших операцій',
     'checkout_user_tooltip' => 'Відмітити цей елемент користувачу',
-    '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' => 'Ви можете перевірити цей медіафайл в іншому місці, відмінному від розташування цього медіафайла за замовчуванням :default_location якщо він встановлений',
     'maintenance_mode'      => 'Сервіс тимчасово недоступний для оновлення системи. Будь ласка, перевірте пізніше.',
     'maintenance_mode_title' => 'Системний тимчасово недоступний',
     'ldap_import'           => 'Не має керуватися LDAP. (Це дозволяє надіслати забуті запити на пароль.)',
@@ -422,20 +428,20 @@
     'bulk_soft_delete'      =>'Також видалити цих користувачів. Їхня історія активів залишиться недоторканою/доки ви не очистите вилучені записи в Налаштуваннях адміністратора.',
     'bulk_checkin_delete_success' => 'Ваші обрані користувачі були видалені та їх елементи були відмічені.',
     'bulk_checkin_success' => 'Елементи для обраних користувачів були перевірені.',
-    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
+    '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'        => 'Тип діаграми в меню налаштувань',
     'hello_name'            => 'Привіт, :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'   => 'У вас є один предмет, який потребує прийняття. Натисніть тут, щоб прийняти або відхилити його | У вас є :count товару, що вимагає прийняття. Натисніть тут, щоб прийняти або відхилити їх',
     'start_date'            => 'Дата початку',
     'end_date'            => 'Дата закінчення',
     'alt_uploaded_image_thumbnail' => 'Завантажений ескіз',
     'placeholder_kit'       => 'Оберіть комплект',
     'file_not_found'        => 'Файл не знайдено',
-    'log_record_not_found'  => 'No record for that log entry was found.',
+    'log_record_not_found'  => 'Не знайдено запису для цього логу.',
     'preview_not_available' => '(без попереднього перегляду)',
     'setup'                 => 'Установка',
     'pre_flight'            => 'Польоти',
@@ -513,8 +519,8 @@
         'address2' => 'Адресний рядок 2',
         'import_note' => 'Імпортовано за допомогою 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' => 'Видалити це поле з поля. Це не призведе до видалення користувальницького поля, тільки асоціації цього поля з цим набором полів.',
+    'checked_out_to_fields' => 'Визначено полями',
     'percent_complete' => '% завершити',
     'uploading' => 'Відвантаження... ',
     'upload_error' => 'Помилка завантаження файлу. Будь ласка, перевірте, чи немає порожніх рядків і що не дубльовані назви стовпців.',
@@ -533,7 +539,7 @@
     'permission_denied_superuser_demo' => 'У доступі відмовлено. Ви не можете оновити інформацію про користувача для суперадміністраторів на демо.',
     'pwd_reset_not_sent' => 'Користувач не активований, він синхронізується або не має електронної адреси',
     'error_sending_email' => 'Помилка при відправці електронної пошти',
-    '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' => 'О ні. Ви не маєте дозволу виконати цю дію. Можливо, <a href=":link">поверніться на панель керування</a> або зверніться до адміністратора.',
     'bulk' => [
             'delete' =>
                 [
@@ -556,16 +562,19 @@
         '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!',
-    'something_went_wrong' => 'Something went wrong with your request.',
-    'close' => 'Close',
+    'quickscan_bulk_help' => 'Поставивши цю позначку, ви зміните запис активу, щоб він відображав нове розташування. Якщо залишити поле без позначки, розташування буде лише зафіксовано в журналі аудиту. Зверніть увагу, що якщо актив перебуває в статусі "видано", це не змінить місцеперебування особи, активу чи місця, куди його видано.',
+    'whoops' => 'Упс!',
+    'something_went_wrong' => 'Щось пішло не так з вашим запитом.',
+    'close' => 'Закрити',
     'expires' => 'Термін закінчується',
-    'map_fields'=> 'Map :item_type Fields',
-    'remaining_var' => ':count Remaining',
+    'map_fields'=> 'Карта полів типу :item_type',
+    'remaining_var' => 'Залишилося: :count',
     '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',
+    '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',
 
 ];
diff --git a/resources/lang/uk-UA/localizations.php b/resources/lang/uk-UA/localizations.php
index d34b7cb2cab1..e687e150995c 100644
--- a/resources/lang/uk-UA/localizations.php
+++ b/resources/lang/uk-UA/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a Language',
+    'select_language' => 'Виберіть мову',
     'languages' => [
         'en-US'=> 'Англійська, США',
         'en-GB'=> 'Англійська, Великобританія',
@@ -68,7 +68,7 @@
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a Country',
+    'select_country' => 'Виберіть країну',
     
     'countries' => [
         'AC'=>'Острів Вознесіння',
@@ -135,7 +135,7 @@
         'EC'=>'Ecuador',
         'EE'=>'Естонія',
         'EG'=>'Египет',
-        'GB-ENG'=>'England',
+        'GB-ENG'=>'Англія',
         'ER'=>'Еритрея',
         'ES'=>'Іспанія',
         'ET'=>'Ethiopia',
@@ -234,7 +234,7 @@
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Нідерланди',
-        'GB-NIR' => 'Northern Ireland',
+        'GB-NIR' => 'Північна Ірландія',
         'NO'=>'Норвегія',
         'NP'=>'Непал',
         'NR'=>'Nauru',
@@ -314,7 +314,7 @@
         'VI'=>'Віргінські острови (США)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
-        'GB-WLS' =>'Wales',
+        'GB-WLS' =>'Уельс',
         'WF'=>'Уолліс і Футуна',
         'WS'=>'Samoa',
         'YE'=>'Ємен',
diff --git a/resources/lang/ur-PK/admin/settings/general.php b/resources/lang/ur-PK/admin/settings/general.php
index 6dcfee66be14..97567df8dfd4 100644
--- a/resources/lang/ur-PK/admin/settings/general.php
+++ b/resources/lang/ur-PK/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/ur-PK/admin/settings/message.php b/resources/lang/ur-PK/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/ur-PK/admin/settings/message.php
+++ b/resources/lang/ur-PK/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/ur-PK/general.php b/resources/lang/ur-PK/general.php
index 20c1cf8aeaae..77670b5a7e47 100644
--- a/resources/lang/ur-PK/general.php
+++ b/resources/lang/ur-PK/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     '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',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/vi-VN/admin/settings/general.php b/resources/lang/vi-VN/admin/settings/general.php
index 5d6927229eef..f25a2a17a35c 100644
--- a/resources/lang/vi-VN/admin/settings/general.php
+++ b/resources/lang/vi-VN/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Văn bản thêm chân ',
     'footer_text_help'          => 'Văn bản này sẽ xuất hiện trong chân trang bên phải. Liên kết được phép sử dụng <a href="https://help.github.com/articles/github-flavored-markdown/">Github mùi markdown</a>. Ngắt dòng, tiêu đề, hình ảnh, vv có thể dẫn đến kết quả không thể đoán trước.',
     'general_settings'			=> 'Cài đặt thường',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Tạo Sao lưu',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'Phiên bản PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'Thông tin Hệ thống PHP',
     'php_gd_info'               => 'Bạn phải cài đặt php-gd để hiển thị QR codes, xem cấu trúc cài đặt.',
     'php_gd_warning'            => 'PHP Image Processing và GD plugin thì CHƯA cài đặt.',
@@ -231,7 +229,6 @@
     'update'                    => 'Cập nhật cài đặt',
     'value'                     => 'Giá trị',
     'brand'                     => 'Xây dựng thương hiệu',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Tên Website',
     'web_brand'                 => 'Loại Thương Hiệu Web',
     'about_settings_title'      => 'Giới thiệu Cài đặt',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Quốc gia',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Nhãn',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'xóa vĩnh viễn',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Loại mã vạch 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'xóa vĩnh viễn',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/vi-VN/admin/settings/message.php b/resources/lang/vi-VN/admin/settings/message.php
index c923afc1a8ae..740dc70808ce 100644
--- a/resources/lang/vi-VN/admin/settings/message.php
+++ b/resources/lang/vi-VN/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/vi-VN/general.php b/resources/lang/vi-VN/general.php
index 35421ebbaba5..ad868c615156 100644
--- a/resources/lang/vi-VN/general.php
+++ b/resources/lang/vi-VN/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Không có kết quả.',
     'no'  					=> 'No',
     'notes'  				=> 'Ghi chú',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Số đơn đặt hàng',
     'only_deleted'          => 'Chỉ những tài sản đã xóa',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php
index 6a2cf7ddb95a..bc02101ccd39 100644
--- a/resources/lang/zh-CN/admin/settings/general.php
+++ b/resources/lang/zh-CN/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => '附加页脚文本 ',
     'footer_text_help'          => '此文本将显示在右侧页脚中。链接允许使用 <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>。换行符、页眉、图像等可能会导致不可预知的结果。',
     'general_settings'			=> '一般设置',
-    'general_settings_keywords' => '公司支持、 签名、 接受、 电子邮件格式、 用户名格式、 图片、每页、 缩略图、 eula、 gravatar、 tos、 仪表盘、 隐私保护',
     'general_settings_help'     => '默认的 EULA和更多',
     'generate_backup'			=> '生成备份',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP版本',
     'php_info'                  => 'PHP 信息',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP 系统信息',
     'php_gd_info'               => '您必须安装php-gd显示二维码，请参阅安装说明。',
     'php_gd_warning'            => 'PHP图像处理的GD[php-gd]插件没有安装',
@@ -231,7 +229,6 @@
     'update'                    => '更新设置',
     'value'                     => '价值',
     'brand'                     => '品牌',
-    'brand_keywords'            => '页脚、 Logo、 打印、 主题、 皮肤、 页眉、 颜色、 颜色、 css',
     'brand_help'                => 'Logo，站点名称',
     'web_brand'                 => '网页品牌类型',
     'about_settings_title'      => '设置',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => '通过设置关键字过滤',
     'security' => '安全',
     'security_title' => '更新安全设置',
-    'security_keywords' => '密码、密码、要求、两个因素、两个因素、常用密码、远程登录、注销、验证',
     'security_help' => '双重认证，密码限制',
-    'groups_keywords' => '权限、权限组、授权',
     'groups_help' => '帐户权限组',
     'localization' => '本地化',
     'localization_title' => '更新本地化设置',
-    'localization_keywords' => '本地化、货币、本地、本地、时区、时区、国际、内部、语言、语言、翻译',
     'localization_help' => '语言，日期显示',
     'notifications' => '通知',
     'notifications_help' => '电子邮件警报和盘点设置',
     'asset_tags_help' => '递增和前缀',
     'labels' => '标签',
     'labels_title' => '更新标签设置',
-    'labels_help' => '标签大小 &amp; 设置',
-    'purge_keywords' => '永久删除',
+    'labels_help' => '条码 &amp; 标签设置',
     'purge_help' => '清除已删除的记录',
     'ldap_extension_warning' => '它看起来不像在这个服务器上安装或启用LDAP扩展。 您仍然可以保存您的设置，但您需要启用 PHP 的 LDAP 扩展，然后LDAP 同步或登录才能正常工作。',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '二维码类型',
     'label2_2d_type_help'     => '二维码格式',
     'label2_2d_target'        => '二维码目标',
-    'label2_2d_target_help'   => '扫描时二维码指向的 URL',
+    'label2_2d_target_help'   => '数据将被二维码所包含',
     'label2_fields'           => '字段定义',
     'label2_fields_help'      => '字段可以在左列中添加、删除和重新排序。对于每个字段，可以在右列中添加、删除和重新排序包括标签、数据源等多个选项。',
     'help_asterisk_bold'    => '输入为 <code>**text**</code> 的文本将显示为粗体。',
     'help_blank_to_use'     => '留空以使用 <code>:setting_name</code> 的值',
-    'help_default_will_use' => '<br>请注意，条形码的值必须符合各自的条形码规范才能成功生成。 欲了解更多详情，请参阅<a href="https://snipe-it.readme.io/docs/barcodes">文档 <i class="fa fa-external-link"></i></a> ',
+    'help_default_will_use' => '<code>:default</code> 将使用来自 <code>:setting_name</code>的值。 <br>请注意，条码的值必须符合各自的条码规范才能成功生成。详情请见 <a href="https://snipe-it.readme.io/docs/barcodes">文档 <i class="fa fa-external-link"></i></a> 了解更多细节。 ',
+    'asset_id'              => '资产ID',
+    'data'               => '数据',
     'default'               => '默认',
     'none'                  => '无',
     'google_callback_help' => '这应该作为回调URL输入在您的组织内的 Google OAuth 应用程序设置。&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google 开发者控制台 <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => '资产应在预计归还多少天前列入“到期归还”页面中？',
     'no_groups' => '尚未创建任何群组。请访问<code>Admin Settings > Permission Groups</code>添加权限群组。',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => '页脚、 Logo、 打印、 主题、 皮肤、 页眉、 颜色、 颜色、 css',
+        'general_settings'  => '公司支持、 签名、 接受、 电子邮件格式、 用户名格式、 图片、每页、 缩略图、 eula、 gravatar、 tos、 仪表盘、 隐私保护',
+        'groups'            => '权限、权限组、授权',
+        'labels'            => '标签、 条形码、 条形码、 表格、 印章、 通用产品代码UPC、 Qr码 、 一维码、 二维码',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => '永久删除',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/zh-CN/admin/settings/message.php b/resources/lang/zh-CN/admin/settings/message.php
index d64c142267fd..c07939c88681 100644
--- a/resources/lang/zh-CN/admin/settings/message.php
+++ b/resources/lang/zh-CN/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => '出错了。:app响应：:error_message',
         'error_redirect' => '错误：301/302 :endpoint 返回重定向。出于安全原因，我们不跟随重定向。请使用实际端点。',
         'error_misc' => '出错了:( ',
+        'webhook_fail' => ' webhook 通知失败：请检查以确保URL仍然有效。',
     ]
 ];
diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php
index faf001f8da92..cb3ab0a6e5e7 100644
--- a/resources/lang/zh-CN/general.php
+++ b/resources/lang/zh-CN/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> '没有结果',
     'no'  					=> '否',
     'notes'  				=> '备注',
+    'note_added'            => '备注已添加',
+    'add_note'              => '添加备注',
+    'note_edited'            => '备注已编辑',
+    'edit_note'              => '编辑备注',
+    'note_deleted'            => '备注已删除',
+    'delete_note'              => '删除备注',
     'order_number'          => '订单号',
     'only_deleted'          => '仅删除的资产',
     'page_menu'				=> '显示菜单项',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/zh-HK/admin/settings/general.php b/resources/lang/zh-HK/admin/settings/general.php
index 6dcfee66be14..97567df8dfd4 100644
--- a/resources/lang/zh-HK/admin/settings/general.php
+++ b/resources/lang/zh-HK/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/zh-HK/admin/settings/message.php b/resources/lang/zh-HK/admin/settings/message.php
index c91575144e5d..98a8893937a9 100644
--- a/resources/lang/zh-HK/admin/settings/message.php
+++ b/resources/lang/zh-HK/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/zh-HK/general.php b/resources/lang/zh-HK/general.php
index be31bdbf56ee..5eeed4447c81 100644
--- a/resources/lang/zh-HK/general.php
+++ b/resources/lang/zh-HK/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     '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',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php
index 02b4b03e9bc1..4efa16fda930 100644
--- a/resources/lang/zh-TW/admin/settings/general.php
+++ b/resources/lang/zh-TW/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => '附加頁尾文字',
     'footer_text_help'          => '此段文字將出現在右側頁尾中。鏈接允許使用 <a href="https://help.github.com/articles/github-flavored-markdown/">Github風格Markdown</a>。換行符、標題、圖像等可能會導致不可預知的結果。',
     'general_settings'			=> '一般設定',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => '預設 EULA 等',
     'generate_backup'			=> '產生備份',
     'google_workspaces'         => 'Google Workspaces',
@@ -155,7 +154,6 @@
     'php'                       => 'PHP 版本',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP 系統資訊',
     'php_gd_info'               => '您必須安裝 php-gd 顯示二維條碼，請參閱安裝說明。',
     'php_gd_warning'            => 'PHP 圖形處理及 php-gd 套件沒有安裝',
@@ -232,7 +230,6 @@
     'update'                    => '更新設定',
     'value'                     => '價值',
     'brand'                     => '企業識別',
-    'brand_keywords'            => '頁尾、標誌、列印、主題、面板、標頭、顏色、顏色、css',
     'brand_help'                => '標誌、網站名稱',
     'web_brand'                 => 'Web 品牌識別類型',
     'about_settings_title'      => '關於設定',
@@ -320,21 +317,17 @@
     'filter_by_keyword' => '按設定關鍵字篩選',
     'security' => '安全性',
     'security_title' => '更新安全性設定',
-    'security_keywords' => '密碼、密碼、要求、雙因素、雙因素、常見密碼、遠端登入、登出、身份驗證',
     'security_help' => '雙因素、密碼限制',
-    'groups_keywords' => '權限、權限群組、授權',
     'groups_help' => '帳戶權限群組',
     'localization' => '本地化',
     'localization_title' => '更新本地化設定',
-    'localization_keywords' => '本地化、貨幣、本地、地區設定、時區、時區、國際、國際化、語言、語言、翻譯',
     'localization_help' => '語言, 日期顯示',
     'notifications' => '通知',
     'notifications_help' => '電子郵件通知與稽核設定',
     'asset_tags_help' => '遞增和前綴',
     'labels' => '標籤',
     'labels_title' => '更新標籤設定',
-    'labels_help' => '標籤大小和設定',
-    'purge_keywords' => '永久刪除',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => '清除已刪除的記錄',
     'ldap_extension_warning' => '似乎此伺服器上未安裝或啟用 LDAP 擴充套件。您仍然可以儲存您的設定，但在 LDAP 同步或登入將正常工作之前，您需要啟用 LDAP 擴充套件。',
     'ldap_ad' => 'LDAP/AD',
@@ -363,12 +356,14 @@
     'label2_2d_type'          => '二維條碼類型',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => '開發人員選項',
     'none'                  => '無',
     'google_callback_help' => '這應該輸入為您的 Google OAuth 應用程式設定中的回呼網址，位於您組織的 <strong><a href="https://console.cloud.google.com/" target="_blank">Google 開發者控制台 <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>。',
@@ -390,4 +385,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => '頁尾、標誌、列印、主題、面板、標頭、顏色、顏色、css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => '權限、權限群組、授權',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => '本地化、貨幣、本地、地區設定、時區、時區、國際、國際化、語言、語言、翻譯',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => '永久刪除',
+        'security'          => '密碼、密碼、要求、雙因素、雙因素、常見密碼、遠端登入、登出、身份驗證',
+    ],
+
 ];
diff --git a/resources/lang/zh-TW/admin/settings/message.php b/resources/lang/zh-TW/admin/settings/message.php
index e187e4d903c5..33ef18aa33bc 100644
--- a/resources/lang/zh-TW/admin/settings/message.php
+++ b/resources/lang/zh-TW/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => '發生了一些錯誤。:app 回應：:error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php
index b448ad34ee16..1eaa5fb03866 100644
--- a/resources/lang/zh-TW/general.php
+++ b/resources/lang/zh-TW/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> '沒有結果',
     'no'  					=> '否',
     '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',
     'order_number'          => '採購單號',
     'only_deleted'          => '只有已刪除的資產',
     'page_menu'				=> '顯示選項',
@@ -567,5 +573,8 @@
     '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',
 
 ];
diff --git a/resources/lang/zu-ZA/admin/settings/general.php b/resources/lang/zu-ZA/admin/settings/general.php
index 8122b870e2fc..380c6c3e4030 100644
--- a/resources/lang/zu-ZA/admin/settings/general.php
+++ b/resources/lang/zu-ZA/admin/settings/general.php
@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'Izilungiselelo Ezijwayelekile',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Yenza isipele',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'I-PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Kumele ufake i-php-gd ukubonisa amakhodi we-QR, bona imiyalo yokufaka.',
     'php_gd_warning'            => 'I-PHP Image Processing ne-GD plugin ayifakiwe.',
@@ -231,7 +229,6 @@
     'update'                    => 'Buyekeza izilungiselelo',
     'value'                     => 'Inani',
     'brand'                     => 'Ukushayela',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Mayelana nezilungiselelo',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     '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',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'Uhlobo lwe-Barcode ye-2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<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. ',
+    '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',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     '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.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];
diff --git a/resources/lang/zu-ZA/admin/settings/message.php b/resources/lang/zu-ZA/admin/settings/message.php
index 6749a54f12b7..f18bfb63f510 100644
--- a/resources/lang/zu-ZA/admin/settings/message.php
+++ b/resources/lang/zu-ZA/admin/settings/message.php
@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         '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.',
     ]
 ];
diff --git a/resources/lang/zu-ZA/general.php b/resources/lang/zu-ZA/general.php
index 15a48f3c910b..1fa19640f756 100644
--- a/resources/lang/zu-ZA/general.php
+++ b/resources/lang/zu-ZA/general.php
@@ -216,6 +216,12 @@
     'no_results'			=> 'Ayikho imiphumela.',
     'no'  					=> 'Cha',
     'notes'  				=> 'Amanothi',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Inombolo Ye-oda',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Ibonisa izinto ezingu-_MENU_',
@@ -567,5 +573,8 @@
     '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',
 
 ];

From c3d17c572705b02eb499828c8c6594c94d44a1ca Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 22 Jan 2025 09:27:40 -0800
Subject: [PATCH 5/6] Remove value for readonly

---
 resources/views/settings/ldap.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index f625b60d92e0..86a091252f23 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -324,7 +324,7 @@
                                 {{ Form::label('ldap_pword', trans('admin/settings/general.ldap_pword')) }}
                             </div>
                             <div class="col-md-8">
-                                <input class="form-control" type="password" name="ldap_pword" id="ldap_pword" value="" autocomplete="off" onfocus="this.removeAttribute('readonly');" readonly="">
+                                <input class="form-control" type="password" name="ldap_pword" id="ldap_pword" value="" autocomplete="off" onfocus="this.removeAttribute('readonly');" readonly>
                                 @error('ldap_pword')
                                     <span class="alert-msg">
                                          <x-icon type="x" />

From 1212267da3742cbed9eebb9978bb8da8d12215cc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 22 Jan 2025 17:30:41 +0000
Subject: [PATCH 6/6] Bumped version

Signed-off-by: snipe <snipe@snipe.net>
---
 config/version.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/version.php b/config/version.php
index db1255bb7a68..d0f4c480e6cd 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v7.1.15',
-  'full_app_version' => 'v7.1.15 - build 16526-g5e465fa41',
-  'build_version' => '16526',
+  'app_version' => 'v7.1.16',
+  'full_app_version' => 'v7.1.16 - build 16564-gfb857ccf5',
+  'build_version' => '16564',
   'prerelease_version' => '',
-  'hash_version' => 'g5e465fa41',
-  'full_hash' => 'v7.1.15-472-g5e465fa41',
+  'hash_version' => 'gfb857ccf5',
+  'full_hash' => 'v7.1.16-510-gfb857ccf5',
   'branch' => 'develop',
 );
\ No newline at end of file